mirror of
https://git.yoctoproject.org/poky
synced 2026-06-03 13:49:49 +00:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
49a465cd23
commit
f674ffa528
-1
@@ -21,6 +21,5 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
|
|||||||
|
|
||||||
SRC_URI += "file://{{=machine}}-standard.scc \
|
SRC_URI += "file://{{=machine}}-standard.scc \
|
||||||
file://{{=machine}}-user-config.cfg \
|
file://{{=machine}}-user-config.cfg \
|
||||||
file://{{=machine}}-user-patches.scc \
|
|
||||||
file://{{=machine}}-user-features.scc \
|
file://{{=machine}}-user-features.scc \
|
||||||
"
|
"
|
||||||
|
|||||||
-1
@@ -22,7 +22,6 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
|
|||||||
|
|
||||||
SRC_URI += "file://{{=machine}}-standard.scc \
|
SRC_URI += "file://{{=machine}}-standard.scc \
|
||||||
file://{{=machine}}-user-config.cfg \
|
file://{{=machine}}-user-config.cfg \
|
||||||
file://{{=machine}}-user-patches.scc \
|
|
||||||
file://{{=machine}}-user-features.scc \
|
file://{{=machine}}-user-features.scc \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|||||||
-1
@@ -22,7 +22,6 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
|
|||||||
|
|
||||||
SRC_URI += "file://{{=machine}}-standard.scc \
|
SRC_URI += "file://{{=machine}}-standard.scc \
|
||||||
file://{{=machine}}-user-config.cfg \
|
file://{{=machine}}-user-config.cfg \
|
||||||
file://{{=machine}}-user-patches.scc \
|
|
||||||
file://{{=machine}}-user-features.scc \
|
file://{{=machine}}-user-features.scc \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
|
|||||||
|
|
||||||
SRC_URI += "file://{{=machine}}-standard.scc \
|
SRC_URI += "file://{{=machine}}-standard.scc \
|
||||||
file://{{=machine}}-user-config.cfg \
|
file://{{=machine}}-user-config.cfg \
|
||||||
file://{{=machine}}-user-patches.scc \
|
|
||||||
file://{{=machine}}-user-features.scc \
|
file://{{=machine}}-user-features.scc \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|||||||
-1
@@ -21,6 +21,5 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
|
|||||||
|
|
||||||
SRC_URI += "file://{{=machine}}-standard.scc \
|
SRC_URI += "file://{{=machine}}-standard.scc \
|
||||||
file://{{=machine}}-user-config.cfg \
|
file://{{=machine}}-user-config.cfg \
|
||||||
file://{{=machine}}-user-patches.scc \
|
|
||||||
file://{{=machine}}-user-features.scc \
|
file://{{=machine}}-user-features.scc \
|
||||||
"
|
"
|
||||||
|
|||||||
-1
@@ -22,7 +22,6 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
|
|||||||
|
|
||||||
SRC_URI += "file://{{=machine}}-standard.scc \
|
SRC_URI += "file://{{=machine}}-standard.scc \
|
||||||
file://{{=machine}}-user-config.cfg \
|
file://{{=machine}}-user-config.cfg \
|
||||||
file://{{=machine}}-user-patches.scc \
|
|
||||||
file://{{=machine}}-user-features.scc \
|
file://{{=machine}}-user-features.scc \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|||||||
-1
@@ -22,7 +22,6 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
|
|||||||
|
|
||||||
SRC_URI += "file://{{=machine}}-standard.scc \
|
SRC_URI += "file://{{=machine}}-standard.scc \
|
||||||
file://{{=machine}}-user-config.cfg \
|
file://{{=machine}}-user-config.cfg \
|
||||||
file://{{=machine}}-user-patches.scc \
|
|
||||||
file://{{=machine}}-user-features.scc \
|
file://{{=machine}}-user-features.scc \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|||||||
-1
@@ -22,7 +22,6 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
|
|||||||
|
|
||||||
SRC_URI += "file://{{=machine}}-standard.scc \
|
SRC_URI += "file://{{=machine}}-standard.scc \
|
||||||
file://{{=machine}}-user-config.cfg \
|
file://{{=machine}}-user-config.cfg \
|
||||||
file://{{=machine}}-user-patches.scc \
|
|
||||||
file://{{=machine}}-user-features.scc \
|
file://{{=machine}}-user-features.scc \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|||||||
-1
@@ -21,6 +21,5 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
|
|||||||
|
|
||||||
SRC_URI += "file://{{=machine}}-standard.scc \
|
SRC_URI += "file://{{=machine}}-standard.scc \
|
||||||
file://{{=machine}}-user-config.cfg \
|
file://{{=machine}}-user-config.cfg \
|
||||||
file://{{=machine}}-user-patches.scc \
|
|
||||||
file://{{=machine}}-user-features.scc \
|
file://{{=machine}}-user-features.scc \
|
||||||
"
|
"
|
||||||
|
|||||||
-1
@@ -22,7 +22,6 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
|
|||||||
|
|
||||||
SRC_URI += "file://{{=machine}}-standard.scc \
|
SRC_URI += "file://{{=machine}}-standard.scc \
|
||||||
file://{{=machine}}-user-config.cfg \
|
file://{{=machine}}-user-config.cfg \
|
||||||
file://{{=machine}}-user-patches.scc \
|
|
||||||
file://{{=machine}}-user-features.scc \
|
file://{{=machine}}-user-features.scc \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|||||||
-1
@@ -22,7 +22,6 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
|
|||||||
|
|
||||||
SRC_URI += "file://{{=machine}}-standard.scc \
|
SRC_URI += "file://{{=machine}}-standard.scc \
|
||||||
file://{{=machine}}-user-config.cfg \
|
file://{{=machine}}-user-config.cfg \
|
||||||
file://{{=machine}}-user-patches.scc \
|
|
||||||
file://{{=machine}}-user-features.scc \
|
file://{{=machine}}-user-features.scc \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|||||||
-1
@@ -22,7 +22,6 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
|
|||||||
|
|
||||||
SRC_URI += "file://{{=machine}}-standard.scc \
|
SRC_URI += "file://{{=machine}}-standard.scc \
|
||||||
file://{{=machine}}-user-config.cfg \
|
file://{{=machine}}-user-config.cfg \
|
||||||
file://{{=machine}}-user-patches.scc \
|
|
||||||
file://{{=machine}}-user-features.scc \
|
file://{{=machine}}-user-features.scc \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|||||||
-1
@@ -21,6 +21,5 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
|
|||||||
|
|
||||||
SRC_URI += "file://{{=machine}}-standard.scc \
|
SRC_URI += "file://{{=machine}}-standard.scc \
|
||||||
file://{{=machine}}-user-config.cfg \
|
file://{{=machine}}-user-config.cfg \
|
||||||
file://{{=machine}}-user-patches.scc \
|
|
||||||
file://{{=machine}}-user-features.scc \
|
file://{{=machine}}-user-features.scc \
|
||||||
"
|
"
|
||||||
|
|||||||
-1
@@ -22,7 +22,6 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
|
|||||||
|
|
||||||
SRC_URI += "file://{{=machine}}-standard.scc \
|
SRC_URI += "file://{{=machine}}-standard.scc \
|
||||||
file://{{=machine}}-user-config.cfg \
|
file://{{=machine}}-user-config.cfg \
|
||||||
file://{{=machine}}-user-patches.scc \
|
|
||||||
file://{{=machine}}-user-features.scc \
|
file://{{=machine}}-user-features.scc \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|||||||
-1
@@ -22,7 +22,6 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
|
|||||||
|
|
||||||
SRC_URI += "file://{{=machine}}-standard.scc \
|
SRC_URI += "file://{{=machine}}-standard.scc \
|
||||||
file://{{=machine}}-user-config.cfg \
|
file://{{=machine}}-user-config.cfg \
|
||||||
file://{{=machine}}-user-patches.scc \
|
|
||||||
file://{{=machine}}-user-features.scc \
|
file://{{=machine}}-user-features.scc \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|||||||
-1
@@ -22,7 +22,6 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
|
|||||||
|
|
||||||
SRC_URI += "file://{{=machine}}-standard.scc \
|
SRC_URI += "file://{{=machine}}-standard.scc \
|
||||||
file://{{=machine}}-user-config.cfg \
|
file://{{=machine}}-user-config.cfg \
|
||||||
file://{{=machine}}-user-patches.scc \
|
|
||||||
file://{{=machine}}-user-features.scc \
|
file://{{=machine}}-user-features.scc \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|||||||
-1
@@ -21,6 +21,5 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
|
|||||||
|
|
||||||
SRC_URI += "file://{{=machine}}-standard.scc \
|
SRC_URI += "file://{{=machine}}-standard.scc \
|
||||||
file://{{=machine}}-user-config.cfg \
|
file://{{=machine}}-user-config.cfg \
|
||||||
file://{{=machine}}-user-patches.scc \
|
|
||||||
file://{{=machine}}-user-features.scc \
|
file://{{=machine}}-user-features.scc \
|
||||||
"
|
"
|
||||||
|
|||||||
-1
@@ -22,7 +22,6 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
|
|||||||
|
|
||||||
SRC_URI += "file://{{=machine}}-standard.scc \
|
SRC_URI += "file://{{=machine}}-standard.scc \
|
||||||
file://{{=machine}}-user-config.cfg \
|
file://{{=machine}}-user-config.cfg \
|
||||||
file://{{=machine}}-user-patches.scc \
|
|
||||||
file://{{=machine}}-user-features.scc \
|
file://{{=machine}}-user-features.scc \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|||||||
-1
@@ -22,7 +22,6 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
|
|||||||
|
|
||||||
SRC_URI += "file://{{=machine}}-standard.scc \
|
SRC_URI += "file://{{=machine}}-standard.scc \
|
||||||
file://{{=machine}}-user-config.cfg \
|
file://{{=machine}}-user-config.cfg \
|
||||||
file://{{=machine}}-user-patches.scc \
|
|
||||||
file://{{=machine}}-user-features.scc \
|
file://{{=machine}}-user-features.scc \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|||||||
-1
@@ -22,7 +22,6 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
|
|||||||
|
|
||||||
SRC_URI += "file://{{=machine}}-standard.scc \
|
SRC_URI += "file://{{=machine}}-standard.scc \
|
||||||
file://{{=machine}}-user-config.cfg \
|
file://{{=machine}}-user-config.cfg \
|
||||||
file://{{=machine}}-user-patches.scc \
|
|
||||||
file://{{=machine}}-user-features.scc \
|
file://{{=machine}}-user-features.scc \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|||||||
-1
@@ -51,6 +51,5 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
|
|||||||
|
|
||||||
SRC_URI += "file://{{=machine}}-standard.scc \
|
SRC_URI += "file://{{=machine}}-standard.scc \
|
||||||
file://{{=machine}}-user-config.cfg \
|
file://{{=machine}}-user-config.cfg \
|
||||||
file://{{=machine}}-user-patches.scc \
|
|
||||||
file://{{=machine}}-user-features.scc \
|
file://{{=machine}}-user-features.scc \
|
||||||
"
|
"
|
||||||
|
|||||||
-1
@@ -51,7 +51,6 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
|
|||||||
|
|
||||||
SRC_URI += "file://{{=machine}}-standard.scc \
|
SRC_URI += "file://{{=machine}}-standard.scc \
|
||||||
file://{{=machine}}-user-config.cfg \
|
file://{{=machine}}-user-config.cfg \
|
||||||
file://{{=machine}}-user-patches.scc \
|
|
||||||
file://{{=machine}}-user-features.scc \
|
file://{{=machine}}-user-features.scc \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|||||||
-1
@@ -51,7 +51,6 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
|
|||||||
|
|
||||||
SRC_URI += "file://{{=machine}}-standard.scc \
|
SRC_URI += "file://{{=machine}}-standard.scc \
|
||||||
file://{{=machine}}-user-config.cfg \
|
file://{{=machine}}-user-config.cfg \
|
||||||
file://{{=machine}}-user-patches.scc \
|
|
||||||
file://{{=machine}}-user-features.scc \
|
file://{{=machine}}-user-features.scc \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|||||||
-1
@@ -51,7 +51,6 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
|
|||||||
|
|
||||||
SRC_URI += "file://{{=machine}}-standard.scc \
|
SRC_URI += "file://{{=machine}}-standard.scc \
|
||||||
file://{{=machine}}-user-config.cfg \
|
file://{{=machine}}-user-config.cfg \
|
||||||
file://{{=machine}}-user-patches.scc \
|
|
||||||
file://{{=machine}}-user-features.scc \
|
file://{{=machine}}-user-features.scc \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|||||||
-1
@@ -21,6 +21,5 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
|
|||||||
|
|
||||||
SRC_URI += "file://{{=machine}}-standard.scc \
|
SRC_URI += "file://{{=machine}}-standard.scc \
|
||||||
file://{{=machine}}-user-config.cfg \
|
file://{{=machine}}-user-config.cfg \
|
||||||
file://{{=machine}}-user-patches.scc \
|
|
||||||
file://{{=machine}}-user-features.scc \
|
file://{{=machine}}-user-features.scc \
|
||||||
"
|
"
|
||||||
|
|||||||
-1
@@ -22,7 +22,6 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
|
|||||||
|
|
||||||
SRC_URI += "file://{{=machine}}-standard.scc \
|
SRC_URI += "file://{{=machine}}-standard.scc \
|
||||||
file://{{=machine}}-user-config.cfg \
|
file://{{=machine}}-user-config.cfg \
|
||||||
file://{{=machine}}-user-patches.scc \
|
|
||||||
file://{{=machine}}-user-features.scc \
|
file://{{=machine}}-user-features.scc \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|||||||
-1
@@ -22,7 +22,6 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
|
|||||||
|
|
||||||
SRC_URI += "file://{{=machine}}-standard.scc \
|
SRC_URI += "file://{{=machine}}-standard.scc \
|
||||||
file://{{=machine}}-user-config.cfg \
|
file://{{=machine}}-user-config.cfg \
|
||||||
file://{{=machine}}-user-patches.scc \
|
|
||||||
file://{{=machine}}-user-features.scc \
|
file://{{=machine}}-user-features.scc \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|||||||
-1
@@ -22,7 +22,6 @@ KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
|
|||||||
|
|
||||||
SRC_URI += "file://{{=machine}}-standard.scc \
|
SRC_URI += "file://{{=machine}}-standard.scc \
|
||||||
file://{{=machine}}-user-config.cfg \
|
file://{{=machine}}-user-config.cfg \
|
||||||
file://{{=machine}}-user-patches.scc \
|
|
||||||
file://{{=machine}}-user-features.scc \
|
file://{{=machine}}-user-features.scc \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user