summaryrefslogtreecommitdiff
path: root/conf/distro
diff options
context:
space:
mode:
authorMike Westerhof <mwester@dls.net>2008-12-08 23:17:24 -0600
committerMike Westerhof <mwester@dls.net>2008-12-08 23:17:24 -0600
commit6532e3b4719dde42e102d38cf0a3c3ffcfac6218 (patch)
tree2d6912d1e2acb66c05aecd99eea21c0eec18b538 /conf/distro
parent129a3a934bbb65bbff42d1e56521d042d48a1ca8 (diff)
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.
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/include/slugos.inc23
1 files changed, 20 insertions, 3 deletions
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index bb02f4b60a..78e9917722 100644
--- 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"