diff options
author | Oyvind Repvik <nail@nslu2-linux.org> | 2005-08-19 18:19:35 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-19 18:19:35 +0000 |
commit | 1c3a6fbc2a5259dae51a6d0001051a9f0f2db9e0 (patch) | |
tree | 31c164412ba5bed1b1467924a262f33c19e156a7 /packages/meta | |
parent | 5bc0fa0024337ba8bec582084cabf6b8171e1aaf (diff) | |
parent | e785b600f4ecf99625c5f0fe480a8873a0990a46 (diff) |
propagate from branch 'org.openembedded.dev' (head f00fce6edbd12298c684d7d9dd99f46ce1614f1e)
to branch 'org.openembedded.nslu2-linux' (head 89864685adbed4d02c9aec37913e1eb64427a6de)
Diffstat (limited to 'packages/meta')
-rw-r--r-- | packages/meta/openslug-native-packages.bb | 6 | ||||
-rw-r--r-- | packages/meta/openslug-packages.bb | 1 | ||||
-rw-r--r-- | packages/meta/ucslugc-packages.bb | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/packages/meta/openslug-native-packages.bb b/packages/meta/openslug-native-packages.bb index 8a32b9cb70..262db42a9f 100644 --- a/packages/meta/openslug-native-packages.bb +++ b/packages/meta/openslug-native-packages.bb @@ -1,15 +1,13 @@ DESCRIPTION = "Packages that are to be compiled nativly for the OpenSlug firmware" LICENSE = MIT -PR = "r2" +PR = "r3" INHIBIT_DEFAULT_DEPS = "1" ALLOW_EMPTY = 1 PACKAGES = "${PN}" -# Just something the test with OPENSLUG_NATIVE_PACKAGES = "\ - gzip \ - vlan \ + apache \ " BROKEN_PACKAGES = "\ diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index d8526fb64b..cdd10e7646 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -45,6 +45,7 @@ OPENSLUG_PACKAGES = "\ iperf \ ipkg-utils \ iptables \ + irssi \ joe \ jpeg \ less \ diff --git a/packages/meta/ucslugc-packages.bb b/packages/meta/ucslugc-packages.bb index 44eb82cf58..733063a1fc 100644 --- a/packages/meta/ucslugc-packages.bb +++ b/packages/meta/ucslugc-packages.bb @@ -44,7 +44,6 @@ UCSLUGC_PACKAGES = "\ gcc \ gdb \ gdbm \ - glib-2.0 \ gnu-config \ gphoto2 \ grep \ @@ -123,6 +122,7 @@ UCSLUGC_PACKAGES = "\ # These packages only build on TARGET_OS=linux, but not TARGET_OS=linux-uclibc. # KEEP IN ALPHABETICAL ORDER UCSLUGC_BROKEN_PACKAGES = "\ + glib-2.0 \ iperf \ man man-pages \ php \ |