* [PATCH 0/1] Tweak for linux-yocto SRC_URI @ 2016-03-31 8:47 Paul Eggleton 2016-03-31 8:47 ` [PATCH 1/1] linux-yocto: add patch in existing SRC_URI value rather than using _append Paul Eggleton 0 siblings, 1 reply; 4+ messages in thread From: Paul Eggleton @ 2016-03-31 8:47 UTC (permalink / raw) To: openembedded-core 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(-) -- 2.5.5 ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/1] linux-yocto: add patch in existing SRC_URI value rather than using _append 2016-03-31 8:47 [PATCH 0/1] Tweak for linux-yocto SRC_URI Paul Eggleton @ 2016-03-31 8:47 ` Paul Eggleton 2016-03-31 12:05 ` Bruce Ashfield 0 siblings, 1 reply; 4+ messages in thread From: Paul Eggleton @ 2016-03-31 8:47 UTC (permalink / raw) To: openembedded-core 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. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- meta/recipes-kernel/linux/linux-yocto_4.4.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto_4.4.bb b/meta/recipes-kernel/linux/linux-yocto_4.4.bb index 3d6991e..2832876 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.4.bb @@ -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" -- 2.5.5 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/1] linux-yocto: add patch in existing SRC_URI value rather than using _append 2016-03-31 8:47 ` [PATCH 1/1] linux-yocto: add patch in existing SRC_URI value rather than using _append Paul Eggleton @ 2016-03-31 12:05 ` Bruce Ashfield 2016-03-31 19:12 ` Paul Eggleton 0 siblings, 1 reply; 4+ messages in thread From: Bruce Ashfield @ 2016-03-31 12:05 UTC (permalink / raw) To: Paul Eggleton; +Cc: Patches and discussions about the oe-core layer [-- Attachment #1: Type: text/plain, Size: 2551 bytes --] On Thu, Mar 31, 2016 at 4:47 AM, Paul Eggleton < paul.eggleton@linux.intel.com> wrote: > 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. > 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 > > Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> > --- > meta/recipes-kernel/linux/linux-yocto_4.4.bb | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/meta/recipes-kernel/linux/linux-yocto_4.4.bb > b/meta/recipes-kernel/linux/linux-yocto_4.4.bb > index 3d6991e..2832876 100644 > --- a/meta/recipes-kernel/linux/linux-yocto_4.4.bb > +++ b/meta/recipes-kernel/linux/linux-yocto_4.4.bb > @@ -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" > -- > 2.5.5 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -- "Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end" [-- Attachment #2: Type: text/html, Size: 4449 bytes --] ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/1] linux-yocto: add patch in existing SRC_URI value rather than using _append 2016-03-31 12:05 ` Bruce Ashfield @ 2016-03-31 19:12 ` Paul Eggleton 0 siblings, 0 replies; 4+ messages in thread From: Paul Eggleton @ 2016-03-31 19:12 UTC (permalink / raw) To: Bruce Ashfield; +Cc: Patches and discussions about the oe-core layer On Thu, 31 Mar 2016 08:05:31 Bruce Ashfield wrote: > On Thu, Mar 31, 2016 at 4:47 AM, Paul Eggleton < > > paul.eggleton@linux.intel.com> wrote: > > 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. > > 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 -- Paul Eggleton Intel Open Source Technology Centre ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-03-31 19:12 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-03-31 8:47 [PATCH 0/1] Tweak for linux-yocto SRC_URI Paul Eggleton 2016-03-31 8:47 ` [PATCH 1/1] linux-yocto: add patch in existing SRC_URI value rather than using _append Paul Eggleton 2016-03-31 12:05 ` Bruce Ashfield 2016-03-31 19:12 ` Paul Eggleton
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox