diff options
| author | Frans Meulenbroeks <fransmeulenbroeks@yahoo.com> | 2006-08-19 17:25:57 +0000 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@yahoo.com> | 2006-08-19 17:25:57 +0000 |
| commit | 74b7777259487e83caba871c7b77cf43ac12fa82 (patch) | |
| tree | 7530bf532a86d3221c4f8d58b9ca689b1a3b4d0a | |
| parent | 74548169592daa787b2813602acfc624aa8d4828 (diff) | |
| parent | ceca77cf969f24603a0527cfdf1d3d99d43ec820 (diff) | |
merge of 'cb591f5b883733fa2368b93267c8b93a727fa2c7'
and 'f9b2fe26aea3315e537bd3dccf2d89fb990f3b5d'
| -rw-r--r-- | packages/meta/slugos-native.bb | 4 | ||||
| -rw-r--r-- | packages/meta/slugos-packages.bb | 20 |
2 files changed, 12 insertions, 12 deletions
diff --git a/packages/meta/slugos-native.bb b/packages/meta/slugos-native.bb index 7af7f7961a..e3988aa8a2 100644 --- a/packages/meta/slugos-native.bb +++ b/packages/meta/slugos-native.bb @@ -5,7 +5,7 @@ # DESCRIPTION = "Packages that are required for the SlugOS native build environment" LICENSE = "MIT" -PR = "r4" +PR = "r5" INHIBIT_DEFAULT_DEPS = "1" EXCLUDE_FROM_WORLD = "1" @@ -28,7 +28,6 @@ SLUGOS_NATIVE_RT = "\ gcc gcc-symlinks \ gdbm \ libstdc++-dev \ - libc6-dev \ ncurses-dev ncurses-terminfo \ perl perl-modules \ python-core python-crypt python-io python-lang python-pickle python-shell python-textutils \ @@ -37,6 +36,7 @@ SLUGOS_NATIVE_RT = "\ # Run-time and DEPENDS SLUGOS_NATIVE_prepend_linux = "\ + libc6-dev \ " SLUGOS_NATIVE_prepend_linux-uclibc = "\ libiconv \ diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index ec42c59c64..60a23cd16d 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r11" +PR = "r12" CONFLICTS = "db3" PROVIDES += "${SLUGOS_IMAGENAME}-packages" @@ -14,11 +14,13 @@ EXCLUDE_FROM_WORLD = "1" INHIBIT_DEFAULT_DEPS = "1" ALLOW_EMPTY = 1 -# The list of packages to build for the ucslugc DISTRO. +# The list of packages to build for the slugos DISTRO. # KEEP IN ALPHABETICAL ORDER SLUGOS_PACKAGES = "\ alsa-lib \ - apr \ + alsa-utils \ + asterisk \ + asterisk-sounds \ atftp \ audiofile \ aumix \ @@ -31,7 +33,6 @@ SLUGOS_PACKAGES = "\ bison \ bluez-libs \ bluez-utils-nodbus \ - boost \ bridge-utils \ bwmon \ bzip2 \ @@ -77,6 +78,7 @@ SLUGOS_PACKAGES = "\ ifupdown \ ipkg-utils \ iptables \ + ircp \ joe \ jpeg \ lcdproc \ @@ -95,7 +97,6 @@ SLUGOS_PACKAGES = "\ libusb \ libvorbis \ libxml2 \ - linphone \ lirc \ lrzsz \ lsof \ @@ -154,7 +155,6 @@ SLUGOS_PACKAGES = "\ ssmtp \ strace \ streamripper \ - sudo \ sysfsutils \ syslog-ng \ tar \ @@ -199,11 +199,11 @@ UCLIBC_UNSUPPORTABLE_PACKAGES = "\ # These packages work with glibc, but break on uclibc. UCLIBC_BROKEN_PACKAGES = "\ - alsa-utils \ - asterisk \ - asterisk-sounds \ + apr \ bogofilter \ - ircp \ + boost \ + linphone \ + sudo \ " # Packages which build only with glibc (some of these use internal |