From 03a1091fa556b730c1a493029bf6a3fa7fe760fd Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Mon, 4 Mar 2013 09:36:37 -0600 Subject: yocto-bsp: update 3.4 .bbappends Simplify by removing unnecessary KMACHINE/KBRANCH and SRC_URI items. (From meta-yocto rev: d1224846e5ff6c101bf50011d5d3314cbbd81f61) Signed-off-by: Tom Zanussi Signed-off-by: Richard Purdie --- ... == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" | 15 +++------------ ... == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" | 15 +++------------ ... == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" | 15 +++------------ ... == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" | 15 +++------------ ... == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" | 16 +++------------- ... == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" | 15 +++------------ 6 files changed, 18 insertions(+), 73 deletions(-) (limited to 'scripts') diff --git "a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" "b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" index 07aa9d1e8b..3b12ed8011 100644 --- "a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" +++ "b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" @@ -12,26 +12,17 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ if need_new_kbranch == "n": }} {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/base" }} -{{ if need_new_kbranch == "y": }} -KBRANCH_DEFAULT_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" -KBRANCH_{{=machine}} = "${KBRANCH_DEFAULT}" -{{ if need_new_kbranch == "n": }} -KBRANCH_{{=machine}} = "{{=existing_kbranch}}" - -KMACHINE_{{=machine}} = "{{=machine}}" - {{ input type:"boolean" name:"smp" prio:"30" msg:"Do you need SMP support? (y/n)" default:"y"}} {{ if smp == "y": }} KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" SRC_URI += "file://{{=machine}}-standard.scc \ - file://{{=machine}}.scc \ - file://{{=machine}}.cfg \ file://{{=machine}}-user-config.cfg \ file://{{=machine}}-user-patches.scc \ " # uncomment and replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -#SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "19f7e43b54aef08d58135ed2a897d77b624b320a" -#SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "459165c1dd61c4e843c36e6a1abeb30949a20ba7" +#SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "840bb8c059418c4753415df56c9aff1c0d5354c8" +#SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "4fd76cc4f33e0afd8f906b1e8f231b6d13b6c993" +#LINUX_VERSION = "3.4.34" diff --git "a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" "b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" index 0a96c7e5f9..1359bfaeb6 100644 --- "a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" +++ "b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" @@ -12,26 +12,17 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ if need_new_kbranch == "n": }} {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard:standard/common-pc" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/base" }} -{{ if need_new_kbranch == "y": }} -KBRANCH_DEFAULT_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" -KBRANCH_{{=machine}} = "${KBRANCH_DEFAULT}" -{{ if need_new_kbranch == "n": }} -KBRANCH_{{=machine}} = "{{=existing_kbranch}}" - -KMACHINE_{{=machine}} = "{{=machine}}" - {{ input type:"boolean" name:"smp" prio:"30" msg:"Do you need SMP support? (y/n)" default:"y"}} {{ if smp == "y": }} KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" SRC_URI += "file://{{=machine}}-standard.scc \ - file://{{=machine}}.scc \ - file://{{=machine}}.cfg \ file://{{=machine}}-user-config.cfg \ file://{{=machine}}-user-patches.scc \ " # uncomment and replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -#SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "19f7e43b54aef08d58135ed2a897d77b624b320a" -#SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "459165c1dd61c4e843c36e6a1abeb30949a20ba7" +#SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "840bb8c059418c4753415df56c9aff1c0d5354c8" +#SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "4fd76cc4f33e0afd8f906b1e8f231b6d13b6c993" +#LINUX_VERSION = "3.4.34" diff --git "a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" "b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" index 07aa9d1e8b..3b12ed8011 100644 --- "a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" +++ "b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" @@ -12,26 +12,17 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ if need_new_kbranch == "n": }} {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/base" }} -{{ if need_new_kbranch == "y": }} -KBRANCH_DEFAULT_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" -KBRANCH_{{=machine}} = "${KBRANCH_DEFAULT}" -{{ if need_new_kbranch == "n": }} -KBRANCH_{{=machine}} = "{{=existing_kbranch}}" - -KMACHINE_{{=machine}} = "{{=machine}}" - {{ input type:"boolean" name:"smp" prio:"30" msg:"Do you need SMP support? (y/n)" default:"y"}} {{ if smp == "y": }} KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" SRC_URI += "file://{{=machine}}-standard.scc \ - file://{{=machine}}.scc \ - file://{{=machine}}.cfg \ file://{{=machine}}-user-config.cfg \ file://{{=machine}}-user-patches.scc \ " # uncomment and replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -#SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "19f7e43b54aef08d58135ed2a897d77b624b320a" -#SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "459165c1dd61c4e843c36e6a1abeb30949a20ba7" +#SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "840bb8c059418c4753415df56c9aff1c0d5354c8" +#SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "4fd76cc4f33e0afd8f906b1e8f231b6d13b6c993" +#LINUX_VERSION = "3.4.34" diff --git "a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" "b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" index 07aa9d1e8b..3b12ed8011 100644 --- "a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" +++ "b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" @@ -12,26 +12,17 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ if need_new_kbranch == "n": }} {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/base" }} -{{ if need_new_kbranch == "y": }} -KBRANCH_DEFAULT_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" -KBRANCH_{{=machine}} = "${KBRANCH_DEFAULT}" -{{ if need_new_kbranch == "n": }} -KBRANCH_{{=machine}} = "{{=existing_kbranch}}" - -KMACHINE_{{=machine}} = "{{=machine}}" - {{ input type:"boolean" name:"smp" prio:"30" msg:"Do you need SMP support? (y/n)" default:"y"}} {{ if smp == "y": }} KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" SRC_URI += "file://{{=machine}}-standard.scc \ - file://{{=machine}}.scc \ - file://{{=machine}}.cfg \ file://{{=machine}}-user-config.cfg \ file://{{=machine}}-user-patches.scc \ " # uncomment and replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -#SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "19f7e43b54aef08d58135ed2a897d77b624b320a" -#SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "459165c1dd61c4e843c36e6a1abeb30949a20ba7" +#SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "840bb8c059418c4753415df56c9aff1c0d5354c8" +#SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "4fd76cc4f33e0afd8f906b1e8f231b6d13b6c993" +#LINUX_VERSION = "3.4.34" diff --git "a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" "b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" index 59359b3358..513ca301ab 100644 --- "a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" +++ "b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" @@ -3,7 +3,6 @@ FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:" PR := "${PR}.1" COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" - {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} {{ if need_new_kbranch == "y" and qemuarch == "arm": }} @@ -36,26 +35,17 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ if need_new_kbranch == "n" and qemuarch == "mips": }} {{ input type:"choicelist" name:"existing_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" branches_base:"standard" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/mti-malta32-be" }} -{{ if need_new_kbranch == "y": }} -KBRANCH_DEFAULT_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" -KBRANCH_{{=machine}} = "${KBRANCH_DEFAULT}" -{{ if need_new_kbranch == "n": }} -KBRANCH_{{=machine}} = "{{=existing_kbranch}}" - -KMACHINE_{{=machine}} = "{{=machine}}" - {{ input type:"boolean" name:"smp" prio:"30" msg:"Would you like SMP support? (y/n)" default:"y"}} {{ if smp == "y": }} KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" SRC_URI += "file://{{=machine}}-standard.scc \ - file://{{=machine}}.scc \ - file://{{=machine}}.cfg \ file://{{=machine}}-user-config.cfg \ file://{{=machine}}-user-patches.scc \ " # uncomment and replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -#SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "19f7e43b54aef08d58135ed2a897d77b624b320a" -#SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "459165c1dd61c4e843c36e6a1abeb30949a20ba7" +#SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "840bb8c059418c4753415df56c9aff1c0d5354c8" +#SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "4fd76cc4f33e0afd8f906b1e8f231b6d13b6c993" +#LINUX_VERSION = "3.4.34" diff --git "a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" "b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" index 16966e01f4..cf8bf1d07e 100644 --- "a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" +++ "b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" @@ -12,26 +12,17 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" {{ if need_new_kbranch == "n": }} {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard:standard/common-pc-64" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/common-pc-64/base" }} -{{ if need_new_kbranch == "y": }} -KBRANCH_DEFAULT_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" -KBRANCH_{{=machine}} = "${KBRANCH_DEFAULT}" -{{ if need_new_kbranch == "n": }} -KBRANCH_{{=machine}} = "{{=existing_kbranch}}" - -KMACHINE_{{=machine}} = "{{=machine}}" - {{ input type:"boolean" name:"smp" prio:"30" msg:"Do you need SMP support? (y/n)" default:"y"}} {{ if smp == "y": }} KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" SRC_URI += "file://{{=machine}}-standard.scc \ - file://{{=machine}}.scc \ - file://{{=machine}}.cfg \ file://{{=machine}}-user-config.cfg \ file://{{=machine}}-user-patches.scc \ " # uncomment and replace these SRCREVs with the real commit ids once you've had # the appropriate changes committed to the upstream linux-yocto repo -#SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "19f7e43b54aef08d58135ed2a897d77b624b320a" -#SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "459165c1dd61c4e843c36e6a1abeb30949a20ba7" +#SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "840bb8c059418c4753415df56c9aff1c0d5354c8" +#SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "4fd76cc4f33e0afd8f906b1e8f231b6d13b6c993" +#LINUX_VERSION = "3.4.34" -- cgit v1.2.3-54-g00ecf