From 4e74b36458b36ee1202689388da5423ed9ee7b71 Mon Sep 17 00:00:00 2001 From: Leonardo Sandoval Date: Tue, 2 Feb 2016 10:50:50 +0000 Subject: yocto-bsp: Avoid duplication of user patches ({{=machine}}-user-patches.scc) On linux-yocto-dev or linux-yocto_X.YY bbappend files, the SRC_URI includes {{=machine}}-standard.scc, which in turn includes {{=machine}}-user-parches.scc, thus there is no need to include it again on the corresponding bbappend file. [YOCTO #8486] (From meta-yocto rev: 11c93b5dd8c651df478d4810e1b6ff6ad9fa57e8) (From meta-yocto rev: c1105ff0e65a24f344e5fab17402b1b4fcb1d728) Signed-off-by: Leonardo Sandoval Signed-off-by: Richard Purdie (cherry picked from commit f674ffa528b06e22d2c70c12f2e17cf308e26173) Signed-off-by: Leonardo Sandoval Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../target/arch/mips/recipes-kernel/linux/linux-yocto-dev.bbappend | 1 - .../target/arch/mips/recipes-kernel/linux/linux-yocto_3.14.bbappend | 3 +-- .../target/arch/mips/recipes-kernel/linux/linux-yocto_3.19.bbappend | 3 +-- .../target/arch/mips/recipes-kernel/linux/linux-yocto_4.1.bbappend | 1 - 4 files changed, 2 insertions(+), 6 deletions(-) (limited to 'scripts/lib/bsp/substrate/target/arch/mips') diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-dev.bbappend b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-dev.bbappend index 2fa6231cbf..c336007ebf 100644 --- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-dev.bbappend @@ -21,6 +21,5 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" SRC_URI += "file://{{=machine}}-standard.scc \ file://{{=machine}}-user-config.cfg \ - file://{{=machine}}-user-patches.scc \ file://{{=machine}}-user-features.scc \ " diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_3.14.bbappend b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_3.14.bbappend index 1e1cc51315..b7603aa069 100644 --- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_3.14.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_3.14.bbappend @@ -22,7 +22,6 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" SRC_URI += "file://{{=machine}}-standard.scc \ file://{{=machine}}-user-config.cfg \ - file://{{=machine}}-user-patches.scc \ file://{{=machine}}-user-features.scc \ " @@ -30,4 +29,4 @@ SRC_URI += "file://{{=machine}}-standard.scc \ # the appropriate changes committed to the upstream linux-yocto repo #SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "840bb8c059418c4753415df56c9aff1c0d5354c8" #SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "4fd76cc4f33e0afd8f906b1e8f231b6d13b6c993" -#LINUX_VERSION = "3.14" \ No newline at end of file +#LINUX_VERSION = "3.14" diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_3.19.bbappend b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_3.19.bbappend index 97e1bb8432..729afed1f1 100644 --- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_3.19.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_3.19.bbappend @@ -22,7 +22,6 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" SRC_URI += "file://{{=machine}}-standard.scc \ file://{{=machine}}-user-config.cfg \ - file://{{=machine}}-user-patches.scc \ file://{{=machine}}-user-features.scc \ " @@ -30,4 +29,4 @@ SRC_URI += "file://{{=machine}}-standard.scc \ # the appropriate changes committed to the upstream linux-yocto repo #SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "840bb8c059418c4753415df56c9aff1c0d5354c8" #SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "4fd76cc4f33e0afd8f906b1e8f231b6d13b6c993" -#LINUX_VERSION = "3.19" \ No newline at end of file +#LINUX_VERSION = "3.19" diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_4.1.bbappend b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_4.1.bbappend index 61adafd542..38adca306b 100644 --- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_4.1.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_4.1.bbappend @@ -22,7 +22,6 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" SRC_URI += "file://{{=machine}}-standard.scc \ file://{{=machine}}-user-config.cfg \ - file://{{=machine}}-user-patches.scc \ file://{{=machine}}-user-features.scc \ " -- cgit v1.2.3-54-g00ecf