meta-tlk: fix ignored SRC_URI appends

PATCH In review Mihai Lindner 2 participants 4 messages Oct 4, 2012 – Oct 5, 2012

Share & tools

Mihai Lindner

author

2012-10-04 17:47 UTC #0 lore raw

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]

Signed-off-by Mihai Lindner <[email protected]>

---

The following changes since commit c4a86a2ad5df3a94b47e394090f67f7e324b1483:

meta-crystalforest: Create a custom build Image recipe. (2012-10-03 23:56:13 -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

Mihai Lindner

author

2012-10-04 17:47 UTC #1 lore raw

PATCH 1/1 meta-tlk: fix ignored SRC_URI appends

[YOCTO #3217]

Signed-off-by Mihai Lindner <[email protected]>

---
 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

new file mode 100644
index 0000000..96a3adf
@@ -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

index 138cc21..bd54419 100644
@@ -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

index 138cc21..bd54419 100644
@@ -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

index 138cc21..bd54419 100644
@@ -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

Paul Eggleton

2012-10-04 17:51 UTC #2 lore raw

Hi Mihai,

Quoted 22 lines · On Thursday 04 October 2012 20:47:08 Mihai Lindner wrote:

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 <[email protected]>
---
 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
(quoted diff) +0 -0
b/meta-tlk/recipes-kernel/linux/linux-yocto.inc new file mode 100644 index 0000000..96a3adf

meta-tlk/recipes-kernel/linux/linux-yocto.inc line 2

Quoted 2 lines

meta-tlk/recipes-kernel/linux/linux-yocto.inc new file +2 -0
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI_append += "file://time-limited-kernel.cfg"

You should use SRC_URI_append = " file://time-limited-kernel.cfg" (note leading space) here. Obviously what you have done does work, but we want to avoid _append += as it can be confusing.

Cheers,
Paul

Signature · 2 lines

Paul Eggleton
Intel Open Source Technology Centre

Mihai Lindner

author

2012-10-05 09:28 UTC #3 lore raw

Quoted 32 lines · Paul Eggleton

Hi Mihai,
Quoted 22 lines · On Thursday 04 October 2012 20:47:08 Mihai Lindner wrote:
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 <[email protected]>
---
 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
(quoted diff) +0 -0
b/meta-tlk/recipes-kernel/linux/linux-yocto.inc new file mode 100644 index 0000000..96a3adf
meta-tlk/recipes-kernel/linux/linux-yocto.inc line 2
Quoted 2 lines
meta-tlk/recipes-kernel/linux/linux-yocto.inc new file +2 -0
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI_append += "file://time-limited-kernel.cfg"
You should use SRC_URI_append = " file://time-limited-kernel.cfg" (note leading space) here. Obviously what you have done does work, but we want to avoid _append += as it can be confusing.

Quoted 3 lines

Cheers,
Paul

Hi Paul,

Ok, good to know. I will resend.
I was trying to avoid spaces in values and += fitted the description.

Thanks,

Signature · 1 line

Mihai Lindner