diff options
author | Florian Boor <florian.boor@kernelconcepts.de> | 2007-05-22 10:30:21 +0000 |
---|---|---|
committer | Florian Boor <florian.boor@kernelconcepts.de> | 2007-05-22 10:30:21 +0000 |
commit | 729c54400c5ed5b51fbdc579de768d45ce212c67 (patch) | |
tree | 400b621b1ae7cb4e642bd73fb2fe7b8714924c8e /conf | |
parent | ec786605012af55c4060164d1b076bdceb968c99 (diff) | |
parent | 69b2b0b5d684fe6c54ee87eb47bf4ec33ef2fce1 (diff) |
merge of '1363ef74e5eef89aecd3b1cd42142546b27d3d6a'
and '37e29e33ed5a8bc07374cf9980746d5aba2c6a90'
Diffstat (limited to 'conf')
-rw-r--r-- | conf/distro/angstrom-2007.1.conf | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 8a84984a4d..71303ab836 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -219,11 +219,6 @@ PREFERRED_VERSION_binutils ?= "2.17.50.0.5" PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5" PREFERRED_VERSION_binutils-cross-sdk ?= "2.17.50.0.5" -PREFERRED_VERSION_linux-libc-headers_i486 ?= "2.6.18" -PREFERRED_VERSION_linux-libc-headers_i586 ?= "2.6.18" -PREFERRED_VERSION_linux-libc-headers_i686 ?= "2.6.18" -PREFERRED_VERSION_linux-libc-headers_powerpc ?= "2.6.18" -PREFERRED_VERSION_linux-libc-headers_ixp4xx ?= "2.6.18" PREFERRED_VERSION_linux-libc-headers ?= "2.6.20" PREFERRED_VERSION_glibc ?= "2.5" @@ -282,10 +277,8 @@ EXTRA_STUFF ?= "" # Angstrom want to ship some extra stuff. This should be moved into task-base eventually # contains ipkg specific stuff as well :( DISTRO_EXTRA_RDEPENDS += "\ - update-modules module-init-tools modutils-initscripts \ - sysvinit initscripts sysvinit-pidof \ - ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \ - netbase dropbear \ + update-modules \ + ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \ angstrom-version \ ipkg ipkg-collateral \ util-linux-mount util-linux-umount \ |