From: Bruce Ashfield Date: Mon, 15 Aug 2016 18:27:00 +0000 (-0400) Subject: yocto-bsp/yocto-kernel: update to work with the latest kern-tools X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=34ed5eebd0b5baab98b6b2d7b3f06ca40932b37d;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git yocto-bsp/yocto-kernel: update to work with the latest kern-tools With some recent changes in the kern tools, we can drop some changes in the yocto-bsp and yocto-kernel tools that ensured proper patching and BSP inheritance. In particular, we no longer need to signify the start of patching, and we must instruct the tools that we only want configuration fragments via inheritance .. no patches (since they are already applied). Signed-off-by: Bruce Ashfield Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- diff --git a/scripts/lib/bsp/kernel.py b/scripts/lib/bsp/kernel.py index 32cab3b642a..a3ee325a8fc 100644 --- a/scripts/lib/bsp/kernel.py +++ b/scripts/lib/bsp/kernel.py @@ -331,7 +331,6 @@ def write_patch_items(scripts_path, machine, patch_items): patch list [${machine}-user-patches.scc]. """ f = open_user_file(scripts_path, machine, machine+"-user-patches.scc", "w") - f.write("mark patching start\n") for item in patch_items: f.write("patch " + item + "\n") f.close() diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-standard.scc b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-standard.scc index 405972d98a4..8a881574d9b 100644 --- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-standard.scc +++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-standard.scc @@ -3,7 +3,7 @@ define KMACHINE {{=machine}} define KARCH arm -include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} +include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} nopatch {{ if need_new_kbranch == "y": }} define KTYPE {{=new_kbranch}} branch {{=machine}} diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-standard.scc b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-standard.scc index 67a54be8740..38d1ca558bf 100644 --- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-standard.scc +++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-standard.scc @@ -3,7 +3,7 @@ define KMACHINE {{=machine}} define KARCH i386 -include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} +include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} nopatch {{ if need_new_kbranch == "y": }} define KTYPE {{=new_kbranch}} branch {{=machine}} diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-standard.scc b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-standard.scc index 7c9dc52d22c..b34f3d35222 100644 --- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-standard.scc +++ b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-standard.scc @@ -3,7 +3,7 @@ define KMACHINE {{=machine}} define KARCH mips -include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} +include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} nopatch {{ if need_new_kbranch == "y": }} define KTYPE {{=new_kbranch}} branch {{=machine}} diff --git a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-standard.scc b/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-standard.scc index 7c9dc52d22c..b34f3d35222 100644 --- a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-standard.scc +++ b/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-standard.scc @@ -3,7 +3,7 @@ define KMACHINE {{=machine}} define KARCH mips -include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} +include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} nopatch {{ if need_new_kbranch == "y": }} define KTYPE {{=new_kbranch}} branch {{=machine}} diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-standard.scc b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-standard.scc index 89b344feab2..c166fcd3d9e 100644 --- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-standard.scc +++ b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-standard.scc @@ -3,7 +3,7 @@ define KMACHINE {{=machine}} define KARCH powerpc -include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} +include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} nopatch {{ if need_new_kbranch == "y": }} define KTYPE {{=new_kbranch}} branch {{=machine}} diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-standard.scc b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-standard.scc index 14554da285c..43cf642d491 100644 --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-standard.scc +++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-standard.scc @@ -4,15 +4,15 @@ define KMACHINE {{=machine}} define KARCH {{=qemuarch}} {{ if qemuarch == "i386" or qemuarch == "x86_64": }} -include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} +include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} nopatch {{ if qemuarch == "arm": }} -include bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard +include bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard nopatch {{ if qemuarch == "powerpc": }} -include bsp/qemu-ppc32/qemu-ppc32-standard +include bsp/qemu-ppc32/qemu-ppc32-standard nopatch {{ if qemuarch == "mips": }} -include bsp/mti-malta32/mti-malta32-be-standard +include bsp/mti-malta32/mti-malta32-be-standard nopatch {{ if qemuarch == "mips64": }} -include bsp/mti-malta64/mti-malta64-be-standard +include bsp/mti-malta64/mti-malta64-be-standard nopatch {{ if need_new_kbranch == "y": }} define KTYPE {{=new_kbranch}} branch {{=machine}} diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-standard.scc b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-standard.scc index 9c9cc90253d..a2b29108519 100644 --- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-standard.scc +++ b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-standard.scc @@ -3,7 +3,7 @@ define KMACHINE {{=machine}} define KARCH x86_64 -include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} +include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} nopatch {{ if need_new_kbranch == "y": }} define KTYPE {{=new_kbranch}} branch {{=machine}}