[oe-commits] org.oe.dev ixp4xx-kernel-2.6.18: pull patches automatically from SVN

blaster8 commit openembedded-commits at lists.openembedded.org
Fri Sep 22 16:41:15 UTC 2006


ixp4xx-kernel-2.6.18: pull patches automatically from SVN
* Improved previous system so patch tree is pulled automagically
* Specific SVN revision can be specified
* Patches applied using quilt

Author: blaster8 at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 0b92f5db2f95d0c6de41c8d1e583c2c82e14b488
ViewMTN: http://monotone.openembedded.org/revision.psp?id=0b92f5db2f95d0c6de41c8d1e583c2c82e14b488
Files:
1
packages/linux/ixp4xx-kernel-svnpatch.inc
packages/linux/ixp4xx-kernel_2.6.18.bb
Diffs:

#
# mt diff -r5284192204304d3d26e738c2dc498b4d58c71d1f -r0b92f5db2f95d0c6de41c8d1e583c2c82e14b488
#
# 
# 
# add_file "packages/linux/ixp4xx-kernel-svnpatch.inc"
#  content [d9d2753fb5bde7916ec63e9652cf5b6659d94129]
# 
# patch "packages/linux/ixp4xx-kernel_2.6.18.bb"
#  from [566234e7ab32418d15a7136975e9923c9b8d6a0a]
#    to [9b7deb8ab7c1887f47a5b878240b619640d85898]
# 
============================================================
--- packages/linux/ixp4xx-kernel-svnpatch.inc	d9d2753fb5bde7916ec63e9652cf5b6659d94129
+++ packages/linux/ixp4xx-kernel-svnpatch.inc	d9d2753fb5bde7916ec63e9652cf5b6659d94129
@@ -0,0 +1,10 @@
+addtask svnpatch before do_configure after do_patch
+
+do_svnpatch() {
+	svn co http://svn.nslu2-linux.org/svnroot/kernel/branches/ixp_npe/patches/${PV} --revision ${IXP4XX_KERNEL_SVN_REV} ${WORKDIR}/patches-${PV}
+	cp ${WORKDIR}/patches-${PV}/defconfig ${WORKDIR}/defconfig
+	rm -rf ${S}/patches
+    cd ${S} && ln -s ${WORKDIR}/patches-${PV} ${S}/patches
+	cd ${S} && ${STAGING_BINDIR}/quilt push -av
+}
+
============================================================
--- packages/linux/ixp4xx-kernel_2.6.18.bb	566234e7ab32418d15a7136975e9923c9b8d6a0a
+++ packages/linux/ixp4xx-kernel_2.6.18.bb	9b7deb8ab7c1887f47a5b878240b619640d85898
@@ -1,43 +1,19 @@
 # Kernel for IXP4xx
 #
-# Increment PR_CONFIG for changes to the ixp4xx-kernel specific
-# defconfig (do *NOT* increment anything in here for changes
-# to other kernel configs!)
-PR_CONFIG = "1"
+# 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 = "411"
+#
 # Increment the number below (i.e. the digits after PR) when
-# making changes within this file or for changes to the patches
-# applied to the kernel.
-PR = "r0.${PR_CONFIG}"
+# 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
 
-SRC_URI += "http://svn.nslu2-linux.org/svnroot/kernel/branches/ixp_npe/patches/2.6.18/defconfig"
-
-# IXP4XX_PATCHES - full list of patches to apply
-IXP4XX_PATCHES  = ""
-
-SVN_SRC = "http://svn.nslu2-linux.org/svnroot/kernel/branches/ixp_npe/patches/2.6.18"
-
-# IXP4XX_PATCHES += "${SVN_SRC}/00-squashfs3.1.patch;patch=1"
-IXP4XX_PATCHES += "${SVN_SRC}/02-nas100d-mac-addr.patch;patch=1"
-IXP4XX_PATCHES += "${SVN_SRC}/04-nslu2-mac-addr.patch;patch=1"
-# IXP4XX_PATCHES += "${SVN_SRC}/05-timer-ixp4xx.patch;patch=1"
-# IXP4XX_PATCHES += "${SVN_SRC}/06-timer-nslu2.patch;patch=1"
-IXP4XX_PATCHES += "${SVN_SRC}/07-copypage-xscale.patch;patch=1"
-IXP4XX_PATCHES += "${SVN_SRC}/13-zd1211-arm-fix.patch;patch=1"
-IXP4XX_PATCHES += "${SVN_SRC}/15-jffs2-endian-config.patch;patch=1"
-IXP4XX_PATCHES += "${SVN_SRC}/20-nas100d-cmdline-fixup.patch;patch=1"
-IXP4XX_PATCHES += "${SVN_SRC}/20-nslu2-cmdline-fixup.patch;patch=1"
-IXP4XX_PATCHES += "${SVN_SRC}/30-ixp4xx-0.1.0-driver.patch;patch=1"
-IXP4XX_PATCHES += "${SVN_SRC}/31-ixp4xx-0.1.0-fix-compiler-issues.patch;patch=1"
-IXP4XX_PATCHES += "${SVN_SRC}/32-ixp4xx-0.1.0-fix-MAC-address-setting.patch;patch=1"
-IXP4XX_PATCHES += "${SVN_SRC}/36-ixp4xx-0.1.0-localfixes.patch;patch=1"
-IXP4XX_PATCHES += "${SVN_SRC}/37-nslu-setup-mac.patch;patch=1"
-IXP4XX_PATCHES += "${SVN_SRC}/40-scsi-idle.patch;patch=1"
-IXP4XX_PATCHES += "${SVN_SRC}/50-leds-arm-cpu-activity.patch;patch=1"
-# IXP4XX_PATCHES += "${SVN_SRC}/75-dsmg600.patch;patch=1"
-# IXP4XX_PATCHES += "${SVN_SRC}/76-dsmg600-pwrbtn.patch;patch=1"
-IXP4XX_PATCHES += "${SVN_SRC}/77-velocity-module.patch;patch=1"
-IXP4XX_PATCHES += "${SVN_SRC}/78-velocity-BE.patch;patch=1"
-IXP4XX_PATCHES += "${SVN_SRC}/79-rtl8110sb-fix.diff;patch=1"






More information about the Openembedded-commits mailing list