[oe-commits] org.oe.dev ixp4xx-kernel: Updated to 2.6.20-rc4, and made default for SlugOS. Includes latest 0.3.1 version of open source ixp npe driver.

[rwhitby commit]

ixp4xx-kernel: Updated to 2.6.20-rc4, and made default for SlugOS.  Includes latest 0.3.1 version of open source ixp npe driver.

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 83586dad1e12c1cf5cf8039a2864b27b1304547e
ViewMTN: http://monotone.openembedded.org/revision.psp?id=83586dad1e12c1cf5cf8039a2864b27b1304547e
Files:
1
packages/linux/ixp4xx-kernel_2.6.19+2.6.20-rc4.bb
conf/distro/include/slugos.inc
packages/linux/ixp4xx-kernel.inc
Diffs:

#
# mt diff -r28548b0eda864e1b3a44136bcced77ee8c1e9dab -r83586dad1e12c1cf5cf8039a2864b27b1304547e
#
# 
# 
# add_file "packages/linux/ixp4xx-kernel_2.6.19+2.6.20-rc4.bb"
#  content [eaa9de2c046f78c3ebcb2ca588aef0283dec938b]
# 
# patch "conf/distro/include/slugos.inc"
#  from [e3a127f25b2386199777dcd2e78133fe2ef8f71d]
#    to [165f486760cb39de40ceb1566db3eaccace634a1]
# 
# patch "packages/linux/ixp4xx-kernel.inc"
#  from [aab482a396d80e6b2fad69188cacac35e1827930]
#    to [e469bc7deb1ac5925e5407f8aca604f7c78fb449]
# 
============================================================
--- packages/linux/ixp4xx-kernel_2.6.19+2.6.20-rc4.bb	eaa9de2c046f78c3ebcb2ca588aef0283dec938b
+++ packages/linux/ixp4xx-kernel_2.6.19+2.6.20-rc4.bb	eaa9de2c046f78c3ebcb2ca588aef0283dec938b
@@ -0,0 +1,22 @@
+# Kernel for IXP4xx
+#
+# This bitbake file pulls patches and the defconfig straight
+# from the NSLU2-Linux SVN repository. Information about this
+# repository can be found at:
+# http://trac.nslu2-linux.org/kernel/
+#
+# The revision that is pulled from SVN is specified below
+IXP4XX_KERNEL_SVN_REV = "659"
+#
+# The directory containing the patches to be applied is
+# specified below
+IXP4XX_KERNEL_PATCH_DIR = "2.6.20"
+#
+# Increment the number below (i.e. the digits after PR) when
+# the changes in SVN between revisions include changes in the
+# patches applied to the kernel, rather than simply defconfig
+# changes
+PR = "r1.${IXP4XX_KERNEL_SVN_REV}"
+
+require ixp4xx-kernel.inc
+require ixp4xx-kernel-svnpatch.inc
============================================================
--- conf/distro/include/slugos.inc	e3a127f25b2386199777dcd2e78133fe2ef8f71d
+++ conf/distro/include/slugos.inc	165f486760cb39de40ceb1566db3eaccace634a1
@@ -36,7 +36,7 @@
 #DISTRO_TYPE
 
 # The following may be overridden to make sub-versions
-SLUGOS_VERSION = "4.1"
+SLUGOS_VERSION = "4.2"
 DISTRO_REVISION ?= ""
 DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
 # For release (only):
@@ -171,7 +171,7 @@ PREFERRED_PROVIDER_virtual/kernel ?= "ix
 # Select the correct versions of the kernel and modules (these are the
 # defaults, override in the conf/distro top-level distro file).
 PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel"
-PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.19"
+PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.19+2.6.20-rc4"
 
 # Select the smallest provider of x11 libraries
 PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
============================================================
--- packages/linux/ixp4xx-kernel.inc	aab482a396d80e6b2fad69188cacac35e1827930
+++ packages/linux/ixp4xx-kernel.inc	e469bc7deb1ac5925e5407f8aca604f7c78fb449
@@ -72,6 +72,9 @@ python () {
     # pre patches actually require the *preceding* kernel version the code
     # fixes that up appropriately.
     pv = bb.data.getVar("PV",d,1).split('-')
+    if pv[0].count('+'):
+	prev = pv[0].split('+')
+	pv[0] = prev[1];
     kernel = pv[0].split('.')
     base = pv[0]
     name = [base]