aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorMike Westerhof <mwester@dls.net>2011-01-30 07:54:47 -0600
committerMike Westerhof <mwester@dls.net>2011-01-30 07:54:47 -0600
commit3b8e2e2e9c5eed7cbba40e8a69e868147854d0e8 (patch)
treed7253829a6a3d54df696179916b07d3b65b31b97 /conf
parent94993e5748dbed157eefc719a49fa11c575bf49a (diff)
downloadopenembedded-3b8e2e2e9c5eed7cbba40e8a69e868147854d0e8.tar.gz
SlugOS: Bump up to SlugOS 5.7 with kernel 2.6.29
- drop CONFIG_SYSFS_DEPRECATED in the kernel config - drop "native" feed as it is empty, and will remain so Signed-off-by: Mike Westerhof <mike@mwester.net>
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/include/preferred-slugos-versions.inc10
-rw-r--r--conf/distro/include/slugos.inc4
2 files changed, 7 insertions, 7 deletions
diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc
index c68d5115a8..9d188db0af 100644
--- a/conf/distro/include/preferred-slugos-versions.inc
+++ b/conf/distro/include/preferred-slugos-versions.inc
@@ -1,5 +1,5 @@
-#===============================================================================#
-#===============================================================================#
+#===========================================================================#
+#===========================================================================#
# NOTE NOTE NOTE
#
# This *forces* the preferred kernel version; making it unable to be overridden
@@ -11,10 +11,10 @@
# This *must* be removed after initial testing is completed. MJW 08-Dec-2008
#
SRCREV_pn-linux-ixp4xx ?= "1090"
-PREFERRED_VERSION_linux-ixp4xx = "2.6.27.8+svnr${SRCREV_pn-linux-ixp4xx}"
+PREFERRED_VERSION_linux-ixp4xx = "2.6.29+svnr${SRCREV_pn-linux-ixp4xx}"
#
-#===============================================================================#
-#===============================================================================#
+#===========================================================================#
+#===========================================================================#
### Standard package preferred versions go here, sorted
### alphabetically. Note that the main slugos.inc file
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index d342737f9d..35919fd345 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -16,7 +16,7 @@
#TARGET_OS "linux" or "linux-uclibc"
# The following may be overridden to make sub-versions
-SLUGOS_VERSION = "5.6"
+SLUGOS_VERSION = "5.7"
DISTRO_REVISION ?= ""
DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
# For release (only):
@@ -84,7 +84,7 @@ BUILD_OPTIMIZATION_pn-perl = "-O1"
#----------------------------------------------------------------------------------
#
FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/${IMAGE_BASENAME}/cross/${DISTRO_FEED}"
-FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/${IMAGE_BASENAME}/native/${DISTRO_FEED}"
+#FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/${IMAGE_BASENAME}/native/${DISTRO_FEED}"
#----------------------------------------------------------------------------------
# FIRMWARE CONFIGURATION