SlugOS: lockdown the kernel version in slugos.conf to override ixp4xx.conf

Also remove PREFERENCE nslu2 override in the kernel bb, as it does nothing at all.

diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index bb02f4b60a57e416a441ee713f52ec11dc37059f..78e9917722ab9335a6aa4dbf32bca54e588d106f 100644 (file)
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -5,6 +5,26 @@
 # WARNING: this file should not be used directly, use one of
 # the supported slugos-derived distributions instead.
 
+#===============================================================================#
+#===============================================================================#
+#===============================================================================#
+#                              NOTE NOTE NOTE
+#
+# This *forces* the preferred kernel version; making it unable to be overridden
+# in the local.conf file.  This is a Very Bad Thing.  This is temporary, and
+# is intended to facilitate some SlugOS-specific testing without disturbing
+# other distros that use the ixp4xx machine type (which is currently where the
+# preferred kernel version is set).
+#
+# This *must* be removed after initial testing is completed.  MJW 08-Dec-2008
+#
+PREFERRED_VERSION_linux-ixp4xx = "2.6.27.8+svnr${SRCREV}"
+#
+#===============================================================================#
+#===============================================================================#
+#===============================================================================#
+
+
 #----------------------------------------------------------------------------------
 # STANDARD SLUGOS DEFINITIONS
 #----------------------------------------------------------------------------------
@@ -95,9 +115,6 @@ DISTRO_EXTRA_RRECOMMENDS ?= ""
 # this is done by selecting the provider of libc (in this case it needs the
 # kernel, so there has to be a non-libc gcc to build the kernel!)
 
-# Our preferred kernel version:
-PREFERRED_VERSION_linux-ixp4xx ?= "2.6.27.8+svnr${SRCREV}"
-
 # Virtuals:
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate"

diff --git a/packages/linux/linux-ixp4xx_2.6.27.8.bb b/packages/linux/linux-ixp4xx_2.6.27.8.bb
index c4a433470ebbd4fb6e933273cc8f7df74e8d2bd8..c003127a3e44ec305a89e666261d93d199b69f02 100644 (file)
--- a/packages/linux/linux-ixp4xx_2.6.27.8.bb
+++ b/packages/linux/linux-ixp4xx_2.6.27.8.bb
@@ -2,7 +2,6 @@ require linux.inc
 require linux-ixp4xx.inc
 
 DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_nslu2 = "1"
 
 VANILLA_VERSION = "2.6.27"
 KERNEL_RELEASE = "2.6.27.8"