[oe-commits] Mike Westerhof : SlugOS: Bump up to SlugOS 5.7 with kernel 2.6.29

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 3b8e2e2e9c5eed7cbba40e8a69e868147854d0e8
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=3b8e2e2e9c5eed7cbba40e8a69e868147854d0e8

Author: Mike Westerhof <mwester at dls.net>
Date:   Sun Jan 30 07:54:47 2011 -0600

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 at mwester.net>

---

 conf/distro/include/preferred-slugos-versions.inc |   10 +++++-----
 conf/distro/include/slugos.inc                    |    4 ++--
 recipes/linux/linux-ixp4xx/nslu2/defconfig-2.6.29 |    4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc
index c68d511..9d188db 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 d342737..35919fd 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
diff --git a/recipes/linux/linux-ixp4xx/nslu2/defconfig-2.6.29 b/recipes/linux/linux-ixp4xx/nslu2/defconfig-2.6.29
index f10ec6a..f9f54a7 100644
--- a/recipes/linux/linux-ixp4xx/nslu2/defconfig-2.6.29
+++ b/recipes/linux/linux-ixp4xx/nslu2/defconfig-2.6.29
@@ -56,8 +56,8 @@ CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_GROUP_SCHED is not set
 # CONFIG_CGROUPS is not set
-CONFIG_SYSFS_DEPRECATED=y
-CONFIG_SYSFS_DEPRECATED_V2=y
+# CONFIG_SYSFS_DEPRECATED is not set
+# CONFIG_SYSFS_DEPRECATED_V2 is not set
 # CONFIG_RELAY is not set
 # CONFIG_NAMESPACES is not set
 # CONFIG_BLK_DEV_INITRD is not set