diff options
| author | Matthias Hentges <oe@hentges.net> | 2007-06-30 15:04:16 +0000 |
|---|---|---|
| committer | Matthias Hentges <oe@hentges.net> | 2007-06-30 15:04:16 +0000 |
| commit | 82a28216be6b768237beeaed7e997c8632f96049 (patch) | |
| tree | e57b80bfb9b67ea69030dd3d4c8793dda9ef3219 /conf | |
| parent | f37cf32fdd68ac074c7d960d770d4e76b729caa0 (diff) | |
| parent | f39d03b866c12872d98be8028a8e314c756002e1 (diff) | |
merge of 'a716072bb40b66870ec9797e151cda776beacf6c'
and 'b3615d69f6416b196ef0183e2864d4289292a007'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 1 | ||||
| -rw-r--r-- | conf/distro/include/slugos.inc | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 5b5ea40d5b..f4b16d7dd8 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -318,6 +318,7 @@ DISTRO_EXTRA_RDEPENDS += "\ ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \ angstrom-version \ ipkg ipkg-collateral \ + util-linux-mount util-linux-umount \ avahi-daemon \ avahi-autoipd \ ${EXTRA_STUFF} \ diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 46ba2fcf74..c2970d2b99 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -111,7 +111,7 @@ PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627" # Select the correct versions of the kernel and modules (these are the # defaults, override in the conf/distro top-level distro file). PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel" -PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.21.1" +PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.21.5" # Select the smallest provider of x11 libraries PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" @@ -144,4 +144,4 @@ IGNORE_STRIP_ERRORS = "" # Remove this once the madwifi-ng stuff seems to stabilize once again. #PREFERRED_VERSION_madwifi-ng ?= "r2156-20070225" -PREFERRED_VERSION_linux-libc-headers = "2.6.18"
\ No newline at end of file +PREFERRED_VERSION_linux-libc-headers = "2.6.18" |