From 2db8f3265e3b253f9e21301661f9fbe102aa595a Mon Sep 17 00:00:00 2001 From: Leonardo Sandoval Date: Fri, 9 Jun 2017 13:32:28 -0700 Subject: linux-yocto: include missing description files and conf fragments Include missing description files and configuration fragments into the SRC_URI. [YOCTO #10918] (From meta-yocto rev: e57f92996e71d4085ebaa41e802bea3cc1466cd7) Signed-off-by: Leonardo Sandoval Signed-off-by: Richard Purdie --- .../target/arch/qemu/recipes-kernel/linux/linux-yocto-dev.bbappend | 5 ++++- .../arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend | 4 +++- .../arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.10.bbappend | 4 +++- .../arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend | 4 +++- .../target/arch/qemu/recipes-kernel/linux/linux-yocto_4.1.bbappend | 5 ++++- .../target/arch/qemu/recipes-kernel/linux/linux-yocto_4.10.bbappend | 5 ++++- .../target/arch/qemu/recipes-kernel/linux/linux-yocto_4.4.bbappend | 5 ++++- 7 files changed, 25 insertions(+), 7 deletions(-) (limited to 'scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel') diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-dev.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-dev.bbappend index 11105ebcc2..d7b9cef98b 100644 --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-dev.bbappend @@ -50,7 +50,10 @@ KBRANCH_{{=machine}} = "{{=existing_kbranch}}" {{ if smp == "y": }} KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" -SRC_URI += "file://{{=machine}}-standard.scc \ +SRC_URI += "file://{{=machine}}.scc \ + file://{{=machine}}.cfg \ + file://{{=machine}}-standard.scc \ file://{{=machine}}-user-config.cfg \ file://{{=machine}}-user-features.scc \ + file://{{=machine}}-user-patches.scc \ " diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend index ad77a66268..fce24d0dd3 100644 --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend @@ -50,7 +50,9 @@ KBRANCH_{{=machine}} = "{{=existing_kbranch}}" {{ if smp == "y": }} KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" -SRC_URI += "file://{{=machine}}-tiny.scc \ +SRC_URI += "file://{{=machine}}.scc \ + file://{{=machine}}.cfg \ + file://{{=machine}}-tiny.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/qemu/recipes-kernel/linux/linux-yocto-tiny_4.10.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.10.bbappend index 9b5f801684..8c0fd1577c 100644 --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.10.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.10.bbappend @@ -50,7 +50,9 @@ KBRANCH_{{=machine}} = "{{=existing_kbranch}}" {{ if smp == "y": }} KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" -SRC_URI += "file://{{=machine}}-tiny.scc \ +SRC_URI += "file://{{=machine}}.scc \ + file://{{=machine}}.cfg \ + file://{{=machine}}-tiny.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/qemu/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend index 2fc992992c..22abc230bf 100644 --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend @@ -50,7 +50,9 @@ KBRANCH_{{=machine}} = "{{=existing_kbranch}}" {{ if smp == "y": }} KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" -SRC_URI += "file://{{=machine}}-tiny.scc \ +SRC_URI += "file://{{=machine}}.scc \ + file://{{=machine}}.cfg \ + file://{{=machine}}-tiny.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/qemu/recipes-kernel/linux/linux-yocto_4.1.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.1.bbappend index 13450f4743..f239ba10b9 100644 --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.1.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.1.bbappend @@ -50,9 +50,12 @@ KBRANCH_{{=machine}} = "{{=existing_kbranch}}" {{ if smp == "y": }} KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" -SRC_URI += "file://{{=machine}}-standard.scc \ +SRC_URI += "file://{{=machine}}.scc \ + file://{{=machine}}.cfg \ + file://{{=machine}}-standard.scc \ file://{{=machine}}-user-config.cfg \ file://{{=machine}}-user-features.scc \ + file://{{=machine}}-user-patches.scc \ " # replace these SRCREVs with the real commit ids once you've had diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.10.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.10.bbappend index e1af4976fc..851d96c375 100644 --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.10.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.10.bbappend @@ -50,9 +50,12 @@ KBRANCH_{{=machine}} = "{{=existing_kbranch}}" {{ if smp == "y": }} KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" -SRC_URI += "file://{{=machine}}-standard.scc \ +SRC_URI += "file://{{=machine}}.scc \ + file://{{=machine}}.cfg \ + file://{{=machine}}-standard.scc \ file://{{=machine}}-user-config.cfg \ file://{{=machine}}-user-features.scc \ + file://{{=machine}}-user-patches.scc \ " # replace these SRCREVs with the real commit ids once you've had diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.4.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.4.bbappend index a2511ba197..71be913bb0 100644 --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.4.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.4.bbappend @@ -50,9 +50,12 @@ KBRANCH_{{=machine}} = "{{=existing_kbranch}}" {{ if smp == "y": }} KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" -SRC_URI += "file://{{=machine}}-standard.scc \ +SRC_URI += "file://{{=machine}}.scc \ + file://{{=machine}}.cfg \ + file://{{=machine}}-standard.scc \ file://{{=machine}}-user-config.cfg \ file://{{=machine}}-user-features.scc \ + file://{{=machine}}-user-patches.scc \ " # replace these SRCREVs with the real commit ids once you've had -- cgit v1.2.3-54-g00ecf