diff options
author | Oyvind Repvik <nail@nslu2-linux.org> | 2005-08-03 21:07:05 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-03 21:07:05 +0000 |
commit | faa3ea865bbec5433bcc950fae04d7554de7ba33 (patch) | |
tree | 1e4d49090768b7729ae1344453efe96623f63c24 /packages/meta | |
parent | 92917970baea2b818611e3a7e8fffc9d27acb2b1 (diff) | |
parent | 61c8ed82a9e81ffc00074bc374d4c0a8de76174e (diff) |
explicit_merge of f4993582a6bc13487c991548a98342ea6d084c2a
and 7dcc40f11838a5d4253110fb45d10c0cd109a0ff
using ancestor 6c249e86f20cab16da75a620e43f22520d6b1f7b
to branch 'org.openembedded.nslu2-linux'
Diffstat (limited to 'packages/meta')
-rw-r--r-- | packages/meta/openslug-native-packages.bb | 5 | ||||
-rw-r--r-- | packages/meta/openslug-native.bb | 3 | ||||
-rw-r--r-- | packages/meta/openslug-packages.bb | 6 |
3 files changed, 12 insertions, 2 deletions
diff --git a/packages/meta/openslug-native-packages.bb b/packages/meta/openslug-native-packages.bb index d856bbfe87..8a32b9cb70 100644 --- a/packages/meta/openslug-native-packages.bb +++ b/packages/meta/openslug-native-packages.bb @@ -1,12 +1,15 @@ DESCRIPTION = "Packages that are to be compiled nativly for the OpenSlug firmware" LICENSE = MIT -PR = "r1" +PR = "r2" INHIBIT_DEFAULT_DEPS = "1" ALLOW_EMPTY = 1 PACKAGES = "${PN}" +# Just something the test with OPENSLUG_NATIVE_PACKAGES = "\ + gzip \ + vlan \ " BROKEN_PACKAGES = "\ diff --git a/packages/meta/openslug-native.bb b/packages/meta/openslug-native.bb index 8530111b0f..b52d2ef6eb 100644 --- a/packages/meta/openslug-native.bb +++ b/packages/meta/openslug-native.bb @@ -1,12 +1,13 @@ DESCRIPTION = "Packages that are required for the OpenSlug native build environment" LICENSE = MIT -PR = "r9" +PR = "r10" INHIBIT_DEFAULT_DEPS = "1" ALLOW_EMPTY = 1 PACKAGES = "${PN}" OPENSLUG_NATIVE = "\ + autoconf \ automake \ bash \ binutils binutils-dev binutils-symlinks \ diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index 1e53d342d2..a78f71002c 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -63,8 +63,11 @@ OPENSLUG_PACKAGES = "\ glib-2.0 \ gphoto2 \ gtk-doc \ + iperf \ + jpeg \ less \ libpam \ + libpng \ libusb \ libxml2 \ man man-pages \ @@ -78,6 +81,7 @@ OPENSLUG_PACKAGES = "\ nail \ nano \ ncftp \ + netpbm \ nfs-utils \ ntp \ obexftp openobex openobex-apps ircp \ @@ -106,12 +110,14 @@ OPENSLUG_PACKAGES = "\ sysfsutils \ thttpd \ thttpd \ + tiff \ timezones \ unionfs-modules unionfs-utils \ vlan \ wget \ xinetd \ yp-tools ypbind ypserv \ + zlib \ " BROKEN_PACKAGES = "\ |