diff options
Diffstat (limited to 'packages/meta')
| -rw-r--r-- | packages/meta/meta-maemo.bb | 5 | ||||
| -rw-r--r-- | packages/meta/openslug-image.bb | 3 | ||||
| -rw-r--r-- | packages/meta/openslug-native.bb | 4 | ||||
| -rw-r--r-- | packages/meta/openslug-packages.bb | 20 |
4 files changed, 21 insertions, 11 deletions
diff --git a/packages/meta/meta-maemo.bb b/packages/meta/meta-maemo.bb index 17b9c66653..fc0e9854ed 100644 --- a/packages/meta/meta-maemo.bb +++ b/packages/meta/meta-maemo.bb @@ -1,5 +1,5 @@ -PR = "r6" +PR = "r7" PACKAGES = maemo-task-base maemo-task-apps maemo-task-libs-install maemo-task-theme DESCRIPTION = "Meta-package for maemo environment" MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" @@ -84,7 +84,8 @@ maemo-task-apps = "\ osso-app-killer \ osso-screenshot-tool \ gpe-todo-hildon \ - gpe-contacts-hildon" + gpe-contacts-hildon \ + gpe-mini-browser-hildon" RDEPENDS_maemo-task-apps := "${maemo-task-apps}" DEPENDS += " ${maemo-task-apps}" diff --git a/packages/meta/openslug-image.bb b/packages/meta/openslug-image.bb index 6ab8bc73b5..c8c231d302 100644 --- a/packages/meta/openslug-image.bb +++ b/packages/meta/openslug-image.bb @@ -36,8 +36,7 @@ inherit image_ipk python () { # Don't build openslug images unless we're targeting an nslu2 mach = bb.data.getVar("MACHINE", d, 1) - dist = bb.data.getVar("DISTRO", d, 1) - if mach != 'nslu2' or dist != 'openslug': + if mach != 'nslu2': raise bb.parse.SkipPackage("OpenSlug only builds for the Linksys NSLU2") } LICENSE = MIT diff --git a/packages/meta/openslug-native.bb b/packages/meta/openslug-native.bb index a3bd0a830a..bb5a68d01e 100644 --- a/packages/meta/openslug-native.bb +++ b/packages/meta/openslug-native.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Packages that are required for the OpenSlug native build environment" LICENSE = MIT -PR = "r5" +PR = "r7" INHIBIT_DEFAULT_DEPS = "1" ALLOW_EMPTY = 1 @@ -21,6 +21,7 @@ OPENSLUG_NATIVE = "\ gcc gcc-symlinks \ glibc-extra-nss glibc-utils \ gnu-config \ + gzip \ libc6 libc6-dev \ libg2c-dev \ libgdbm3 \ @@ -34,6 +35,7 @@ OPENSLUG_NATIVE = "\ monotone-5 \ ncurses ncurses-dev ncurses-terminfo \ patch \ + perl perl-modules \ python-core python-io python-lang python-pickle python-shell python-textutils \ sed \ tar \ diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index 96d81e1d31..7e248bc60e 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -24,6 +24,8 @@ OPENSLUG_DEVELOPMENT = "\ gnu-config \ grep \ gzip \ + ipkg-utils \ + libtool \ lsof \ m4 \ make \ @@ -32,8 +34,10 @@ OPENSLUG_DEVELOPMENT = "\ openssh \ patch \ pciutils \ + pkgconfig \ quilt \ sed \ + strace \ util-linux \ " @@ -50,9 +54,12 @@ OPENSLUG_PACKAGES = "\ bash \ bluez-utils-nodbus \ bridge-utils \ + bwmon \ + ccxstream \ coreutils \ cron \ cvs\ + cyrus-imapd \ dnsmasq \ expat \ ftpd-topfield \ @@ -62,14 +69,13 @@ OPENSLUG_PACKAGES = "\ less \ libusb \ libxml2 \ - man \ - man-pages \ miau \ microcom \ mt-daapd \ mutt \ mysql \ nail \ + nano \ ncftp \ obexftp openobex openobex-apps ircp \ openssh \ @@ -77,13 +83,10 @@ OPENSLUG_PACKAGES = "\ pcre \ ppp \ procps \ - psmisc \ puppy \ pwc \ rsync \ - screen \ setpwc \ - streamripper \ sudo \ sysfsutils \ thttpd \ @@ -95,6 +98,7 @@ OPENSLUG_PACKAGES = "\ python \ samba \ sane-backends \ + strace \ thttpd \ vlan \ wget \ @@ -107,18 +111,22 @@ OPENSLUG_PACKAGES = "\ # such as sinf.) OPENSLUG_PACKAGES_append_linux = "\ bind \ + man man-pages \ mgetty \ mpd \ nfs-utils \ libpam \ php \ postfix \ + psmisc \ + screen \ + streamripper \ + timezones \ xinetd \ yp-tools ypbind ypserv \ " BROKEN_PACKAGES = "\ - strace \ " DEPENDS = 'openslug-image \ |