[oe-commits] org.oe.dev linux-openmoko-devel: use patch instead of forcing people to download 40MB every time the nano version gets bumped, also apply patch using patch.bbclass instead of inside silly do_prepatch hack

[koen commit]

linux-openmoko-devel: use patch instead of forcing people to download 40MB every time the nano version gets bumped, also apply patch using patch.bbclass instead of inside silly do_prepatch hack

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 9058454eba6fb20ffdf253fa9b5e7f4b76514e6b
ViewMTN: http://monotone.openembedded.org/revision/info/9058454eba6fb20ffdf253fa9b5e7f4b76514e6b
Files:
1
packages/linux/linux-openmoko-devel_svn+2.6.23.1.bb
Diffs:

#
# mt diff -rf49dde3dd2953708867ba4f263181567a30a6466 -r9058454eba6fb20ffdf253fa9b5e7f4b76514e6b
#
# 
# 
# patch "packages/linux/linux-openmoko-devel_svn+2.6.23.1.bb"
#  from [607297ec1d58873d740b775fbb27d95fc82206d3]
#    to [374e9c2d3f3e722eb449ba737da945aa883a1f45]
# 
============================================================
--- packages/linux/linux-openmoko-devel_svn+2.6.23.1.bb	607297ec1d58873d740b775fbb27d95fc82206d3
+++ packages/linux/linux-openmoko-devel_svn+2.6.23.1.bb	374e9c2d3f3e722eb449ba737da945aa883a1f45
@@ -1,13 +1,15 @@ DESCRIPTION = "Linux 2.6.x (development)
 require linux.inc
 
 DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/ OpenMoko"
-VANILLA_VERSION = "2.6.23.1"
+VANILLA_VERSION = "2.6.23"
 #KERNEL_VERSION = "2.6.23-rc9"
-#KERNEL_RELEASE = "2.6.23-rc9"
+KERNEL_RELEASE = "2.6.23.1"
+
+# If you use a rc, you will need to use this:
 #PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}-moko11+svnr${SRCREV}"
-KERNEL_VERSION = "${VANILLA_VERSION}"
-KERNEL_RELEASE = "${VANILLA_VERSION}"
-PV = "${VANILLA_VERSION}+svnr${SRCREV}"
+
+KERNEL_VERSION = "${KERNEL_RELEASE}"
+PV = "${KERNEL_RELEASE}+svnr${SRCREV}"
 PR = "r1"
 
 KERNEL_IMAGETYPE = "uImage"
@@ -20,7 +22,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux
 SRCREV = "3140"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
-#           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-${KERNEL_VERSION}.bz2 \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_VERSION}.bz2;patch=1 \
            svn://svn.openmoko.org/branches/src/target/kernel/2.6.23.x;module=patches;proto=http;name=patches \
            file://squashfs-2.6.23.patch;patch=1 \
            file://fix-EVIOCGRAB-semantics-2.6.22.5.patch;patch=1 \
@@ -55,7 +57,6 @@ do_prepatch() {
 module_autoload_s3cmci = "s3cmci"
 
 do_prepatch() {
-#        cd ${S} && patch -p1 < ${WORKDIR}/patch-${KERNEL_VERSION}
         mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
         mv patches patches.openmoko
         mv .pc .pc.old