diff options
| author | ccsmart <ccsmart@smartpal.de> | 2005-08-01 09:05:42 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-01 09:05:42 +0000 |
| commit | 706225e0cfdbffd3bb4a096f16b1d60aca80a94a (patch) | |
| tree | ada0d7cf7998337f01f3f2dba0dc82ccee2f9ffd /packages/meta | |
| parent | 3959df9cd8b3e894f8fe3e026a480f2e6f8a6ae4 (diff) | |
| parent | 80fa2f11e9c1921e6f78eda539bb24e13b3df05f (diff) | |
merge of 32a8152d0bee4b649384f3a9e102a4676de42023
and b1c87d8b200c1c4fd98633961388fdd092b8e00a
Diffstat (limited to 'packages/meta')
| -rw-r--r-- | packages/meta/openslug-image.bb | 3 | ||||
| -rw-r--r-- | packages/meta/openslug-packages.bb | 12 |
2 files changed, 7 insertions, 8 deletions
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-packages.bb b/packages/meta/openslug-packages.bb index 2c2b17e717..07dc1d0080 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -34,6 +34,7 @@ OPENSLUG_DEVELOPMENT = "\ pciutils \ quilt \ sed \ + strace \ util-linux \ " @@ -63,8 +64,6 @@ OPENSLUG_PACKAGES = "\ less \ libusb \ libxml2 \ - man \ - man-pages \ miau \ microcom \ mt-daapd \ @@ -79,13 +78,10 @@ OPENSLUG_PACKAGES = "\ pcre \ ppp \ procps \ - psmisc \ puppy \ pwc \ rsync \ - screen \ setpwc \ - streamripper \ sudo \ sysfsutils \ thttpd \ @@ -97,6 +93,7 @@ OPENSLUG_PACKAGES = "\ python \ samba \ sane-backends \ + strace \ thttpd \ vlan \ wget \ @@ -109,19 +106,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 \ |