meta-tlk: fix ignored SRC_URI appends
cover meta-tlk: fix ignored SRC_URI appends
Fix SRC_URI appends ignored by meta-cedartrail and meta-crownbay. Used SRC_URI_append instead of SRC_URI.
Also placed all variables in an .inc file to be required by all linux-yocto recipes in here, since all versions use the same.
[YOCTO #3217]
---
The following changes since commit 6eea475e2038c1de3fbbd5bcd0986862ff85bb9a:
meta-crownbay: remove 3.0 kernel support (2012-10-04 20:20:52 -0500)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib mihai/bug3217
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=mihai/bug3217
Mihai Lindner (1):
meta-tlk: fix ignored SRC_URI appends
meta-tlk/recipes-kernel/linux/linux-yocto.inc | 3 +++ meta-tlk/recipes-kernel/linux/linux-yocto_3.0.bbappend | 7 +------ meta-tlk/recipes-kernel/linux/linux-yocto_3.2.bbappend | 7 +------ meta-tlk/recipes-kernel/linux/linux-yocto_3.4.bbappend | 7 +------ 4 files changed, 6 insertions(+), 18 deletions(-) create mode 100644 meta-tlk/recipes-kernel/linux/linux-yocto.inc
Signature · 1 line
1.7.12
PATCH 1/1 meta-tlk: fix ignored SRC_URI appends
Fix SRC_URI appends ignored by meta-cedartrail and meta-crownbay. Used SRC_URI_append instead of SRC_URI.
Also placed all variables in an .inc file to be required by all linux-yocto recipes in here, since all versions use the same.
[YOCTO #3217]
--- meta-tlk/recipes-kernel/linux/linux-yocto.inc | 3 +++ meta-tlk/recipes-kernel/linux/linux-yocto_3.0.bbappend | 7 +------ meta-tlk/recipes-kernel/linux/linux-yocto_3.2.bbappend | 7 +------ meta-tlk/recipes-kernel/linux/linux-yocto_3.4.bbappend | 7 +------ 4 files changed, 6 insertions(+), 18 deletions(-) create mode 100644 meta-tlk/recipes-kernel/linux/linux-yocto.inc
meta-tlk/recipes-kernel/linux/linux-yocto.inc new file +3 -0
@@ -0,0 +1,3 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +SRC_URI_append = " file://time-limited-kernel.cfg" +PR .= ".2"
meta-tlk/recipes-kernel/linux/linux-yocto_3.0.bbappend +1 -6
@@ -1,6 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -# enable the time limited kernel configuration options -SRC_URI += "file://time-limited-kernel.cfg" - -PR .= ".1" +require ${PN}.inc
meta-tlk/recipes-kernel/linux/linux-yocto_3.2.bbappend +1 -6
@@ -1,6 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -# enable the time limited kernel configuration options -SRC_URI += "file://time-limited-kernel.cfg" - -PR .= ".1" +require ${PN}.inc
meta-tlk/recipes-kernel/linux/linux-yocto_3.4.bbappend +1 -6
@@ -1,6 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -# enable the time limited kernel configuration options -SRC_URI += "file://time-limited-kernel.cfg" - -PR .= ".1" +require ${PN}.inc
Signature · 1 line
1.7.12
Quoted 10 lines · Mihai Lindner
Fix
SRC_URIappends ignored by meta-cedartrail and meta-crownbay. UsedSRC_URI_appendinstead ofSRC_URI.
Also placed all variables in an .inc file to be required by all linux-yocto recipes in here, since all versions use the same.[YOCTO #3217]
Signed-off-by Mihai Lindner <[email protected]>--- meta-tlk/recipes-kernel/linux/linux-yocto.inc | 3 +++
Could you use a slightly less generic name for this include please? I worry about collisions...
Cheers,
Richard
PATCH 1/1 meta-tlk: fix ignored SRC_URI appends
Fix SRC_URI appends ignored by meta-cedartrail and meta-crownbay. Used SRC_URI_append instead of SRC_URI.
Also placed all variables in an .inc file to be required by all linux-yocto recipes in here, since all versions use the same.
[YOCTO #3217]
--- meta-tlk/recipes-kernel/linux/linux-yocto-tlk.inc | 3 +++ meta-tlk/recipes-kernel/linux/linux-yocto_3.0.bbappend | 7 +------ meta-tlk/recipes-kernel/linux/linux-yocto_3.2.bbappend | 7 +------ meta-tlk/recipes-kernel/linux/linux-yocto_3.4.bbappend | 7 +------ 4 files changed, 6 insertions(+), 18 deletions(-) create mode 100644 meta-tlk/recipes-kernel/linux/linux-yocto-tlk.inc
meta-tlk/recipes-kernel/linux/linux-yocto-tlk.inc new file +3 -0
@@ -0,0 +1,3 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +SRC_URI_append = " file://time-limited-kernel.cfg" +PR .= ".2"
meta-tlk/recipes-kernel/linux/linux-yocto_3.0.bbappend +1 -6
@@ -1,6 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -# enable the time limited kernel configuration options -SRC_URI += "file://time-limited-kernel.cfg" - -PR .= ".1" +require ${PN}-tlk.inc
meta-tlk/recipes-kernel/linux/linux-yocto_3.2.bbappend +1 -6
@@ -1,6 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -# enable the time limited kernel configuration options -SRC_URI += "file://time-limited-kernel.cfg" - -PR .= ".1" +require ${PN}-tlk.inc
meta-tlk/recipes-kernel/linux/linux-yocto_3.4.bbappend +1 -6
@@ -1,6 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -# enable the time limited kernel configuration options -SRC_URI += "file://time-limited-kernel.cfg" - -PR .= ".1" +require ${PN}-tlk.inc
Signature · 1 line
1.7.12
Quoted 12 lines · Richard Purdie
Quoted 10 lines · Mihai Lindner
Fix
SRC_URIappends ignored by meta-cedartrail and meta-crownbay. UsedSRC_URI_appendinstead ofSRC_URI.
Also placed all variables in an .inc file to be required by all linux-yocto recipes in here, since all versions use the same.[YOCTO #3217]
Signed-off-by Mihai Lindner <[email protected]>--- meta-tlk/recipes-kernel/linux/linux-yocto.inc | 3 +++
Quoted 10 lines
Could you use a slightly less generic name for this include please? I worry about collisions...
Cheers,
Richard
Sure.
Thanks,
Signature · 1 line
Mihai Lindner
Quoted 11 lines · Mihai Lindner
Fix
SRC_URIappends ignored by meta-cedartrail and meta-crownbay. UsedSRC_URI_appendinstead ofSRC_URI.
Also placed all variables in an .inc file to be required by all linux-yocto recipes in here, since all versions use the same.[YOCTO #3217]
Signed-off-by Mihai Lindner <[email protected]>---
The following changes since commit6eea475e2038c1de3fbbd5bcd0986862ff85bb9a:
Quoted 7 lines
meta-crownbay: remove 3.0 kernel support (2012-10-04 20:20:52 -0500)
are available in the git repository at:
git://git.yoctoproject.org/poky-contribmihai/bug3217
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=mihai/bug3217
Pulled into meta-intel/master.
Thanks,
Tom
Quoted 10 lines
Mihai Lindner (1):
meta-tlk: fix ignoredSRC_URIappendsmeta-tlk/recipes-kernel/linux/linux-yocto.inc | 3 +++ meta-tlk/recipes-kernel/linux/linux-yocto_3.0.bbappend | 7 +------ meta-tlk/recipes-kernel/linux/linux-yocto_3.2.bbappend | 7 +------ meta-tlk/recipes-kernel/linux/linux-yocto_3.4.bbappend | 7 +------ 4 files changed, 6 insertions(+), 18 deletions(-) create mode 100644 meta-tlk/recipes-kernel/linux/linux-yocto.inc