merge of '98c11111632ec1f22cd780bfc86f7f03dc5bfbcb'

     and 'f34d4b68a24b0179a8f2bdb573db7a7be933641a'

4 files changed, 24 insertions, 17 deletions

diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 3993bf6ec0..e015314d92 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -185,5 +185,16 @@ PREFERRED_VERSION_wpa-supplicant ?= "0.5.1"
 PREFERRED_PROVIDER_virtual/db = "db"
 PREFERRED_PROVIDER_virtual/db-native = "db-native"
 
+SRCDATE_ipkg-utils ?= "20060106"
+SRCDATE_ipkg-utils-native ?= "20060106"
+SRCDATE_ipkg-link ?= "20060106"
+SRCDATE_irssi ?= "20050930"
+
+CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/"
+INHERIT += "nslu2-mirrors"
+
+PREFERRED_VERSION_ipkg ?= "0.99.154"
+PREFERRED_VERSION_ipkg-native ?= "0.99.154"
+
 #FIXME: HACK: REMOVE THIS
 IGNORE_STRIP_ERRORS = ""
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index da1efa9cc4..541eaef852 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -63,3 +63,15 @@ PREFERRED_VERSION_unslung-rootfs         ?= "2.3r63"
 PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63"
 PREFERRED_VERSION_nslu2-linksys-libs     ?= "2.3r63"
 PREFERRED_VERSION_nslu2-linksys-ramdisk  ?= "2.3r63"
+
+SRCDATE_ipkg-utils ?= "20060106"
+SRCDATE_ipkg-utils-native ?= "20060106"
+SRCDATE_ipkg-link ?= "20060106"
+SRCDATE_irssi ?= "20050930"
+
+CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/"
+INHERIT += "nslu2-mirrors"
+
+PREFERRED_VERSION_ipkg ?= "0.99.154"
+PREFERRED_VERSION_ipkg-native ?= "0.99.154"
+
diff --git a/conf/machine/gumstix.conf b/conf/machine/gumstix.conf
index 75c671a3d4..0fccf05b3b 100644
--- a/conf/machine/gumstix.conf
+++ b/conf/machine/gumstix.conf
@@ -19,6 +19,6 @@ GUMSTIX_400MHZ = "y"
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel-modules-mmc kernel-modules-usb kernel-modules-fat kernel-modules-bluetooth kernel-module-jfs udev lrzsz"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel-module-mmc kernel-module-usb kernel-module-fat kernel-module-bluetooth kernel-module-jfs udev lrzsz"
 PREFERRED_VERSION_task-bootstrap = "1.0unionroot"
 
diff --git a/conf/machine/include/ixp4xx.conf b/conf/machine/include/ixp4xx.conf
index 93befb92ce..541d350f21 100644
--- a/conf/machine/include/ixp4xx.conf
+++ b/conf/machine/include/ixp4xx.conf
@@ -149,22 +149,6 @@ IPKG_EXTRA_ARCHS = "ixp4xx ${MACHINE} \
 IPKG_ARCH_LIST = "all any noarch ixp4xx ${MACHINE} ${IPKG_EXTRA_ARCHS}"
 
 #-------------------------------------------------------------------------------
-# Package versions
-#-------------------------------------------------------------------------------
-# Warning: these are shared across the different machine and distro
-# configurations but can be overridden therein if required.
-SRCDATE_ipkg-utils ?= "20060106"
-SRCDATE_ipkg-utils-native ?= "20060106"
-SRCDATE_ipkg-link ?= "20060106"
-SRCDATE_irssi ?= "20050930"
-
-CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/"
-INHERIT += "nslu2-mirrors"
-
-PREFERRED_VERSION_ipkg ?= "0.99.154"
-PREFERRED_VERSION_ipkg-native ?= "0.99.154"
-
-#-------------------------------------------------------------------------------
 # Board defaults
 #-------------------------------------------------------------------------------
 # These values are board specific but they seem to be common to a large number