Tweak for linux-yocto SRC_URI
cover Tweak for linux-yocto SRC_URI
The following changes since commit e3fc8ef152494e9b7cff8de110a784150295f17e:
recipes-support/rng-tools: Change runlevel start from S to 2, 3, 4, 5. (2016-03-30 21:32:11 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib paule/kernel-src-uri-tidy
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/kernel-src-uri-tidy
Paul Eggleton (1):
linux-yocto: add patch in existing SRC_URI value rather than using _append
meta/recipes-kernel/linux/linux-yocto_4.4.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
Signature · 1 line
2.5.5
PATCH 1/1 linux-yocto: add patch in existing SRC_URI value rather than using _append
Of course SRC_URI_append works just fine for building here, but it does introduce two problems:
1) It's not really very tidy and you could look at the SRC_URI value and miss the fact that there's a patch appended at the end.
2) devtool update-recipe will end up duplicating the appended item (covered under [YOCTO #9360]).
Given the above it seems reasonable to squash the appended value into the main SRC_URI value.
--- meta/recipes-kernel/linux/linux-yocto_4.4.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
meta/recipes-kernel/linux/linux-yocto_4.4.bb +3 -2
@@ -22,7 +22,9 @@ SRCREV_machine ?= "c43425f73287757a166d74464fddf1f5389c9f59" SRCREV_meta ?= "770996a263e22562c81f48fde0f0dc647156abce" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;name=machine;branch=${KBRANCH}; \ - git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}" + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA} \ + file://0001-Fix-qemux86-pat-issue.patch \ + " LINUX_VERSION ?= "4.4.3"
@@ -41,4 +43,3 @@ KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" -SRC_URI_append = " file://0001-Fix-qemux86-pat-issue.patch"
Signature · 1 line
2.5.5
Re: [PATCH 1/1] linux-yocto: add patch in existing SRC_URI value rather than using _append
Quoted 11 lines · Paul Eggleton
Of course
SRC_URI_appendworks just fine for building here, but it does introduce two problems:1) It's not really very tidy and you could look at the
SRC_URIvalue and miss the fact that there's a patch appended at the end.
2) devtool update-recipe will end up duplicating the appended item (covered under [YOCTO #9360]).Given the above it seems reasonable to squash the appended value into the main
SRC_URIvalue.
This is only temporary, which is why it's an _append, and I'm about to get rid of the need for this patch completely
since upstream has finally produced a 7 patch series to fix the regression.
So I'd rather not churn this, and leave it as-is for another few days.
Bruce
Quoted 44 lines
Signed-off-by Paul Eggleton <[email protected]>--- meta/recipes-kernel/linux/linux-yocto_4.4.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)meta/recipes-kernel/linux/linux-yocto_4.4.bb +0
-0@@ -22,7 +22,9 @@ SRCREV_machine ?="
c43425f73287757a166d74464fddf1f5389c9f59"
SRCREV_meta?= "770996a263e22562c81f48fde0f0dc647156abce"
SRC_URI= "git://
git.yoctoproject.org/linux-yocto-4.4.git;name=machine;branch=${KBRANCH}; \
-git://
git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA} "
+git://
git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA} \meta/recipes-kernel/linux/linux-yocto_4.4.bb +2
-0+ file://0001-Fix-qemux86-pat-issue.patch \ + " LINUX_VERSION ?= "4.4.3"@@ -41,4 +43,3 @@ KERNEL_FEATURES_append_qemux86=" cfg/sound.scccfg/paravirt_kvm.scc"
KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc"KERNEL_FEATURES_append= " ${@bb.utils.contains("TUNE_FEATURES", "mx32",
" cfg/x32.scc", "" ,d)}"-SRC_URI_append = " file://0001-Fix-qemux86-pat-issue.patch" --
2.5.5--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"
Re: [PATCH 1/1] linux-yocto: add patch in existing SRC_URI value rather than using _append
Quoted 14 lines · On Thu, 31 Mar 2016 08:05:31 Bruce Ashfield wrote:
On Thu, Mar 31, 2016 at 4:47 AM, Paul Eggleton <
Quoted 11 lines · [email protected]> wrote:
Of course
SRC_URI_appendworks just fine for building here, but it does introduce two problems:1) It's not really very tidy and you could look at the
SRC_URIvalue andmiss the fact that there's a patch appended at the end.
2) devtool update-recipe will end up duplicating the appended item
(covered under [YOCTO #9360]).
Quoted 8 lines
Quoted 2 lines
Given the above it seems reasonable to squash the appended value into the main
SRC_URIvalue.This is only temporary, which is why it's an
_append, and I'm about to get rid of the need for this patch completely
since upstream has finally produced a 7 patch series to fix the regression.So I'd rather not churn this, and leave it as-is for another few days.
OK, that's fine - as long as we don't release with this in it I'll be happy.
Thanks,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre