From 7228f6b0c81817c8a8455ea78271abfd5d66fed8 Mon Sep 17 00:00:00 2001 From: Mihai Lindner Date: Fri, 5 Oct 2012 13:58:14 +0300 Subject: 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] Signed-off-by: Mihai Lindner Signed-off-by: Tom Zanussi --- 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 (limited to 'meta-tlk') diff --git a/meta-tlk/recipes-kernel/linux/linux-yocto-tlk.inc b/meta-tlk/recipes-kernel/linux/linux-yocto-tlk.inc new file mode 100644 index 00000000..b1cf8834 --- /dev/null +++ b/meta-tlk/recipes-kernel/linux/linux-yocto-tlk.inc @@ -0,0 +1,3 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +SRC_URI_append = " file://time-limited-kernel.cfg" +PR .= ".2" diff --git a/meta-tlk/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-tlk/recipes-kernel/linux/linux-yocto_3.0.bbappend index 138cc219..e316320e 100644 --- a/meta-tlk/recipes-kernel/linux/linux-yocto_3.0.bbappend +++ b/meta-tlk/recipes-kernel/linux/linux-yocto_3.0.bbappend @@ -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 diff --git a/meta-tlk/recipes-kernel/linux/linux-yocto_3.2.bbappend b/meta-tlk/recipes-kernel/linux/linux-yocto_3.2.bbappend index 138cc219..e316320e 100644 --- a/meta-tlk/recipes-kernel/linux/linux-yocto_3.2.bbappend +++ b/meta-tlk/recipes-kernel/linux/linux-yocto_3.2.bbappend @@ -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 diff --git a/meta-tlk/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-tlk/recipes-kernel/linux/linux-yocto_3.4.bbappend index 138cc219..e316320e 100644 --- a/meta-tlk/recipes-kernel/linux/linux-yocto_3.4.bbappend +++ b/meta-tlk/recipes-kernel/linux/linux-yocto_3.4.bbappend @@ -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 -- cgit v1.2.3-54-g00ecf