diff options
author | Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com> | 2015-11-03 16:35:37 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-11-25 07:45:19 +0000 |
commit | f674ffa528b06e22d2c70c12f2e17cf308e26173 (patch) | |
tree | 06b82df0ad7ac75cf79f8301a337b19fe2fbae9e /scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux | |
parent | 49a465cd2370084917b9271cb6815240993a2d8b (diff) | |
download | poky-f674ffa528b06e22d2c70c12f2e17cf308e26173.tar.gz |
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)
Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux')
4 files changed, 0 insertions, 4 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-dev.bbappend b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-dev.bbappend index 2fa6231cbf..c336007ebf 100644 --- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-dev.bbappend | |||
@@ -21,6 +21,5 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" | |||
21 | 21 | ||
22 | SRC_URI += "file://{{=machine}}-standard.scc \ | 22 | SRC_URI += "file://{{=machine}}-standard.scc \ |
23 | file://{{=machine}}-user-config.cfg \ | 23 | file://{{=machine}}-user-config.cfg \ |
24 | file://{{=machine}}-user-patches.scc \ | ||
25 | file://{{=machine}}-user-features.scc \ | 24 | file://{{=machine}}-user-features.scc \ |
26 | " | 25 | " |
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_3.14.bbappend b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_3.14.bbappend index e688384020..b7603aa069 100644 --- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_3.14.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_3.14.bbappend | |||
@@ -22,7 +22,6 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" | |||
22 | 22 | ||
23 | SRC_URI += "file://{{=machine}}-standard.scc \ | 23 | SRC_URI += "file://{{=machine}}-standard.scc \ |
24 | file://{{=machine}}-user-config.cfg \ | 24 | file://{{=machine}}-user-config.cfg \ |
25 | file://{{=machine}}-user-patches.scc \ | ||
26 | file://{{=machine}}-user-features.scc \ | 25 | file://{{=machine}}-user-features.scc \ |
27 | " | 26 | " |
28 | 27 | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_3.19.bbappend b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_3.19.bbappend index ded9e85db5..729afed1f1 100644 --- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_3.19.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_3.19.bbappend | |||
@@ -22,7 +22,6 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" | |||
22 | 22 | ||
23 | SRC_URI += "file://{{=machine}}-standard.scc \ | 23 | SRC_URI += "file://{{=machine}}-standard.scc \ |
24 | file://{{=machine}}-user-config.cfg \ | 24 | file://{{=machine}}-user-config.cfg \ |
25 | file://{{=machine}}-user-patches.scc \ | ||
26 | file://{{=machine}}-user-features.scc \ | 25 | file://{{=machine}}-user-features.scc \ |
27 | " | 26 | " |
28 | 27 | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_4.1.bbappend b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_4.1.bbappend index 61adafd542..38adca306b 100644 --- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_4.1.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_4.1.bbappend | |||
@@ -22,7 +22,6 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" | |||
22 | 22 | ||
23 | SRC_URI += "file://{{=machine}}-standard.scc \ | 23 | SRC_URI += "file://{{=machine}}-standard.scc \ |
24 | file://{{=machine}}-user-config.cfg \ | 24 | file://{{=machine}}-user-config.cfg \ |
25 | file://{{=machine}}-user-patches.scc \ | ||
26 | file://{{=machine}}-user-features.scc \ | 25 | file://{{=machine}}-user-features.scc \ |
27 | " | 26 | " |
28 | 27 | ||