[oe-commits] [openembedded-core] 09/13: linux-yocto: add patch in existing SRC_URI value rather than using _append

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit ddced54ddb38584951e8962822e2601314a25fd4
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
AuthorDate: Thu Mar 31 21:47:02 2016 +1300

    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.
    
    Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 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"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.