various kernels: remove apply=yes from SRC_URI
PATCH 1/2 various kernels: remove apply=yes from SRC_URI
* not necessary anymore, obsolete in oe-core
--- recipes-kernel/linux/linux-kexecboot_3.1.bb | 2 +- .../linux/linux-palm-omap1_2.6.22-omap1.bb | 2 +- recipes-kernel/linux/linux_3.1.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
recipes-kernel/linux/linux-kexecboot_3.1.bb +1 -1
@@ -6,7 +6,7 @@ S = "${WORKDIR}/linux-${PV}" COMPATIBLE_MACHINE = "(akita|c7x0|collie|poodle|tosa|spitz)" SRC_URI += "${KERNELORG_MIRROR}/linux/kernel/v3.x/linux-${PV}.tar.bz2;name=kernel \ - ${KERNELORG_MIRROR}/linux/kernel/v3.x/patch-${PV}.7.bz2;apply=yes;name=stablepatch \ + ${KERNELORG_MIRROR}/linux/kernel/v3.x/patch-${PV}.7.bz2;name=stablepatch \ file://defconfig \ file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 \ "
recipes-kernel/linux/linux-palm-omap1_2.6.22-omap1.bb +1 -1
@@ -9,7 +9,7 @@ inherit kernel DEPENDS = "" SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/v2.6/linux-2.6.22.tar.bz2;name=kernel \ - http://www.muru.com/linux/omap/patches/patch-2.6.22-omap1.bz2;apply=yes;name=patch \ + http://www.muru.com/linux/omap/patches/patch-2.6.22-omap1.bz2;name=patch \ file://defconfig" S = "${WORKDIR}/linux-2.6.22"
recipes-kernel/linux/linux_3.1.bb +1 -1
@@ -5,7 +5,7 @@ PR = "${INC_PR}.5" COMPATIBLE_MACHINE = "(akita|c7x0|collie|poodle|tosa|spitz|h1940)" SRC_URI += "${KERNELORG_MIRROR}/linux/kernel/v3.x/linux-${PV}.tar.bz2;name=kernel \ - ${KERNELORG_MIRROR}/linux/kernel/v3.x/patch-${PV}.7.bz2;apply=yes;name=stablepatch \ + ${KERNELORG_MIRROR}/linux/kernel/v3.x/patch-${PV}.7.bz2;name=stablepatch \ file://defconfig \ file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 \ "
Signature · 1 line
1.7.3.4
PATCH 2/2 linux(-kexecboot): update from 3.1.7 to 3.1.8
* apply latest stable patchset
* bump PR
--- recipes-kernel/linux/linux-kexecboot_3.1.bb | 8 ++++---- recipes-kernel/linux/linux_3.1.bb | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-)
recipes-kernel/linux/linux-kexecboot_3.1.bb +4 -4
@@ -1,12 +1,12 @@ require linux-kexecboot.inc -PR = "${INC_PR}.4" +PR = "${INC_PR}.5" S = "${WORKDIR}/linux-${PV}" COMPATIBLE_MACHINE = "(akita|c7x0|collie|poodle|tosa|spitz)" SRC_URI += "${KERNELORG_MIRROR}/linux/kernel/v3.x/linux-${PV}.tar.bz2;name=kernel \ - ${KERNELORG_MIRROR}/linux/kernel/v3.x/patch-${PV}.7.bz2;name=stablepatch \ + ${KERNELORG_MIRROR}/linux/kernel/v3.x/patch-${PV}.8.bz2;name=stablepatch \ file://defconfig \ file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 \ "
@@ -22,5 +22,5 @@ SRC_URI_append_poodle = " \ SRC_URI[kernel.md5sum] = "8d43453f8159b2332ad410b19d86a931" SRC_URI[kernel.sha256sum] = "2573d2378c754b0c602b57586e9311e5b38c5d1e6c137f02873833633a4b9359" -SRC_URI[stablepatch.md5sum] = "13ea1e611a0a580138b8203e6f1353ed" -SRC_URI[stablepatch.sha256sum] = "44f2611ce923db17254eeb618ed06703acf4dd6dcc8357b360e11a1111b0bc9d" +SRC_URI[stablepatch.md5sum] = "54fac8e4b0b55201e012ef0337a6cc87" +SRC_URI[stablepatch.sha256sum] = "e191f1fd3d3e0a27e3e5116391a97b47b0c2adc3f6f779df1996766b37759d30"
recipes-kernel/linux/linux_3.1.bb +4 -4
@@ -1,11 +1,11 @@ require linux.inc -PR = "${INC_PR}.5" +PR = "${INC_PR}.6" COMPATIBLE_MACHINE = "(akita|c7x0|collie|poodle|tosa|spitz|h1940)" SRC_URI += "${KERNELORG_MIRROR}/linux/kernel/v3.x/linux-${PV}.tar.bz2;name=kernel \ - ${KERNELORG_MIRROR}/linux/kernel/v3.x/patch-${PV}.7.bz2;name=stablepatch \ + ${KERNELORG_MIRROR}/linux/kernel/v3.x/patch-${PV}.8.bz2;name=stablepatch \ file://defconfig \ file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 \ "
@@ -21,5 +21,5 @@ SRC_URI_append_poodle = " \ SRC_URI[kernel.md5sum] = "8d43453f8159b2332ad410b19d86a931" SRC_URI[kernel.sha256sum] = "2573d2378c754b0c602b57586e9311e5b38c5d1e6c137f02873833633a4b9359" -SRC_URI[stablepatch.md5sum] = "13ea1e611a0a580138b8203e6f1353ed" -SRC_URI[stablepatch.sha256sum] = "44f2611ce923db17254eeb618ed06703acf4dd6dcc8357b360e11a1111b0bc9d" +SRC_URI[stablepatch.md5sum] = "54fac8e4b0b55201e012ef0337a6cc87" +SRC_URI[stablepatch.sha256sum] = "e191f1fd3d3e0a27e3e5116391a97b47b0c2adc3f6f779df1996766b37759d30"
Signature · 1 line
1.7.3.4
Re: [meta-handheld] [PATCH 2/2] linux(-kexecboot): update from 3.1.7 to 3.1.8
Quoted 73 lines · On Wednesday 11 January 2012 01:54:29 Andrea Adami wrote:
* apply latest stable patchset
* bump PRSigned-off-by Andrea Adami <[email protected]>--- recipes-kernel/linux/linux-kexecboot_3.1.bb | 8 ++++---- recipes-kernel/linux/linux_3.1.bb | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-)(quoted diff) +0
-0b/recipes-kernel/linux/linux-kexecboot_3.1.bb index 9e2fb69..8a7f38f 100644
recipes-kernel/linux/linux-kexecboot_3.1.bb +1
-1@@ -1,12 +1,12 @@ require linux-kexecboot.inc -PR = "${INC_PR}.4" +PR = "${INC_PR}.5" S = "${WORKDIR}/linux-${PV}" COMPATIBLE_MACHINE = "(akita|c7x0|collie|poodle|tosa|spitz)" SRC_URI +="${KERNELORG_MIRROR}/linux/kernel/v3.x/linux-${PV}.tar.bz2;name=kernel \ -
${KERNELORG_MIRROR}/linux/kernel/v3.x/patch-${PV}.7.bz2;name=stablepatch \
+ ${KERNELORG_MIRROR}/linux/kernel/v3.x/patch-${PV}.8.bz2;name=stablepatch \file://defconfig \ file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 \ "recipes-kernel/linux/linux-kexecboot_3.1.bb +0
-0@@ -22,5 +22,5 @@ SRC_URI_append_poodle = " \ SRC_URI[kernel.md5sum] = "8d43453f8159b2332ad410b19d86a931" SRC_URI[kernel.sha256sum] ="
2573d2378c754b0c602b57586e9311e5b38c5d1e6c137f02873833633a4b9359"recipes-kernel/linux/linux-kexecboot_3.1.bb +0
-2-SRC_URI[stablepatch.md5sum] = "13ea1e611a0a580138b8203e6f1353ed" -SRC_URI[stablepatch.sha256sum] ="
44f2611ce923db17254eeb618ed06703acf4dd6dcc8357b360e11a1111b0bc9d"recipes-kernel/linux/linux-kexecboot_3.1.bb +2
-0+SRC_URI[stablepatch.md5sum] = "54fac8e4b0b55201e012ef0337a6cc87" +SRC_URI[stablepatch.sha256sum] ="
e191f1fd3d3e0a27e3e5116391a97b47b0c2adc3f6f779df1996766b37759d30" diff --git a/recipes-kernel/linux/linux_3.1.bb b/recipes-kernel/linux/linux_3.1.bb index baa0b34..3dc2759 100644recipes-kernel/linux/linux_3.1.bb +1
-1@@ -1,11 +1,11 @@ require linux.inc -PR = "${INC_PR}.5" +PR = "${INC_PR}.6" COMPATIBLE_MACHINE = "(akita|c7x0|collie|poodle|tosa|spitz|h1940)" SRC_URI +="${KERNELORG_MIRROR}/linux/kernel/v3.x/linux-${PV}.tar.bz2;name=kernel \ -
${KERNELORG_MIRROR}/linux/kernel/v3.x/patch-${PV}.7.bz2;name=stablepatch \
+ ${KERNELORG_MIRROR}/linux/kernel/v3.x/patch-${PV}.8.bz2;name=stablepatch \file://defconfig \ file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 \ "recipes-kernel/linux/linux_3.1.bb +0
-0@@ -21,5 +21,5 @@ SRC_URI_append_poodle = " \ SRC_URI[kernel.md5sum] = "8d43453f8159b2332ad410b19d86a931" SRC_URI[kernel.sha256sum] ="
2573d2378c754b0c602b57586e9311e5b38c5d1e6c137f02873833633a4b9359"recipes-kernel/linux/linux_3.1.bb +0
-2-SRC_URI[stablepatch.md5sum] = "13ea1e611a0a580138b8203e6f1353ed" -SRC_URI[stablepatch.sha256sum] ="
44f2611ce923db17254eeb618ed06703acf4dd6dcc8357b360e11a1111b0bc9d"recipes-kernel/linux/linux_3.1.bb +2
-0+SRC_URI[stablepatch.md5sum] = "54fac8e4b0b55201e012ef0337a6cc87" +SRC_URI[stablepatch.sha256sum] =
Quoted 1 line
"
e191f1fd3d3e0a27e3e5116391a97b47b0c2adc3f6f779df1996766b37759d30"
I left the other patch but took this one. Thanks!
Cheers,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre
Quoted 1 line · On Wednesday 11 January 2012 01:54:28 Andrea Adami wrote:
* not necessary anymore, obsolete in oe-core
Unfortunately that is not the case here - because the patches in question do not have .patch or .diff extensions then you need to have apply=yes - with your change, the patch no longer gets applied.
Cheers,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre