yocto-bsp updates to reflect tooling changes

PATCH Applied [email protected] 2 participants 4 messages Aug 29, 2012

lore

Share & tools

lore

[email protected]

author

2012-08-29 03:01 UTC #0 lore raw

cover yocto-bsp updates to reflect tooling changes

From: Tom Zanussi <[email protected]>

Since the original changeset was posted and tested, changes to the kernel tools were made and require some updates to the yocto-bsp tools, which are contained in these patches.

The following changes since commit b4c5725af4cd85d5644f0373e2674e903c4eab2b:

yocto-bsp: add missing xserver-xf86-config .bbappend for qemu (2012-08-25 14:47:07 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib.git tzanussi/yocto-bsp-tool-change-updates
http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=tzanussi/yocto-bsp-tool-change-updates

Tom Zanussi (2):
yocto-bsp: remove obsolete references
yocto-bsp: use KBRANCH_DEFAULT in 'newbranch' cases

 ...oice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 3 ++-
 ...oice == \"linux-yocto-rt_3.4\": }} linux-yocto-rt_3.4.bbappend" | 3 ++-
 ...nel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 3 ++-
 ...nel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" | 3 ++-
 .../i386/recipes-kernel/linux/files/{{=machine}}-preempt-rt.scc    | 1 -
 .../arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc | 1 -
 .../target/arch/i386/recipes-kernel/linux/files/{{=machine}}.scc   | 7 -------
 ...oice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 3 ++-
 ...oice == \"linux-yocto-rt_3.4\": }} linux-yocto-rt_3.4.bbappend" | 3 ++-
 ...nel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 3 ++-
 ...nel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" | 3 ++-
 ...oice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 3 ++-
 ...oice == \"linux-yocto-rt_3.4\": }} linux-yocto-rt_3.4.bbappend" | 3 ++-
 ...nel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 3 ++-
 ...nel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" | 3 ++-
 ...oice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 3 ++-
 ...oice == \"linux-yocto-rt_3.4\": }} linux-yocto-rt_3.4.bbappend" | 3 ++-
 ...nel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 3 ++-
 ...nel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" | 3 ++-
 .../target/arch/qemu/recipes-kernel/linux/files/{{=machine}}.scc   | 2 --
 ...oice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 3 ++-
 ...oice == \"linux-yocto-rt_3.4\": }} linux-yocto-rt_3.4.bbappend" | 3 ++-
 ...nel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 3 ++-
 ...nel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" | 3 ++-
 .../x86_64/recipes-kernel/linux/files/{{=machine}}-preempt-rt.scc  | 1 -
 .../x86_64/recipes-kernel/linux/files/{{=machine}}-standard.scc    | 1 -
 .../target/arch/x86_64/recipes-kernel/linux/files/{{=machine}}.scc | 5 -----
 ...oice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 3 ++-
 ...oice == \"linux-yocto-rt_3.4\": }} linux-yocto-rt_3.4.bbappend" | 3 ++-
 ...nel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 3 ++-
 ...nel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" | 3 ++-
 31 files changed, 48 insertions(+), 42 deletions(-)

Signature · 1 line

1.7.11.4

[email protected]

author

2012-08-29 03:01 UTC #1 lore raw

PATCH 1/2 yocto-bsp: remove obsolete references

From: Tom Zanussi <[email protected]>

The logbuf-normal feature is obsolete, so remove any references to it. The dmaengine and hpet features have changed, but don't really need to be added by default to i386 - leave that to the BSP developer. Also, remove a couple duplicate feature references in the .scc files.

Signed-off-by Tom Zanussi <[email protected]>

---
 .../i386/recipes-kernel/linux/files/{{=machine}}-preempt-rt.scc    | 1 -
 .../arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc | 1 -
 .../target/arch/i386/recipes-kernel/linux/files/{{=machine}}.scc   | 7 -------
 .../target/arch/qemu/recipes-kernel/linux/files/{{=machine}}.scc   | 2 --
 .../x86_64/recipes-kernel/linux/files/{{=machine}}-preempt-rt.scc  | 1 -
 .../x86_64/recipes-kernel/linux/files/{{=machine}}-standard.scc    | 1 -
 .../target/arch/x86_64/recipes-kernel/linux/files/{{=machine}}.scc | 5 -----
 7 files changed, 18 deletions(-)

scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-preempt-rt.scc +0 -1

index 6ee1c93..2734d33 100644
@@ -10,6 +10,5 @@ include {{=machine}}.scc
 # default policy for preempt-rt kernels
 include cfg/usb-mass-storage.scc
 include cfg/boot-live.scc
-include features/logbuf/size-normal.scc
 include features/latencytop/latencytop.scc
 include features/profiling/profiling.scc

scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc +0 -1

index c6f42db..e34882f 100644
@@ -15,6 +15,5 @@ include {{=machine}}.scc
 # default policy for standard kernels
 include cfg/usb-mass-storage.scc
 include cfg/boot-live.scc
-include features/logbuf/size-normal.scc
 include features/latencytop/latencytop.scc
 include features/profiling/profiling.scc

scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}.scc +0 -7

index 15bda3c..d8d28ce 100644
@@ -9,9 +9,7 @@ include features/drm-emgd/drm-emgd.scc
 {{ if xserver == "y" and xserver_choice == "xserver_i915": }}
 include features/i915/i915.scc
 
-include features/dmaengine/dmaengine.scc
 include features/serial/8250.scc
-include features/hpet/hpet.scc
 include features/ericsson-3g/f5521gw.scc
 
 {{ if xserver == "y" and xserver_choice == "xserver_vesa" or xserver_choice == "xserver_emgd": }}

@@ -21,10 +19,5 @@ include cfg/usb-mass-storage.scc
 include cfg/boot-live.scc
 include features/power/intel.scc
 
-include features/logbuf/size-normal.scc
-
-include features/latencytop/latencytop.scc
-include features/profiling/profiling.scc
-
 kconf hardware user-config.cfg
 include user-patches.scc

scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}.scc +0 -2

index e301b22..0f20dcd 100644
@@ -1,6 +1,4 @@
 kconf hardware {{=machine}}.cfg
 
-include features/logbuf/size-normal.scc
-
 kconf hardware user-config.cfg
 include user-patches.scc

scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/{{=machine}}-preempt-rt.scc +0 -1

index 5819dce..de9906a 100644
@@ -10,6 +10,5 @@ include {{=machine}}.scc
 # default policy for preempt-rt kernels
 include cfg/usb-mass-storage.scc
 include cfg/boot-live.scc
-include features/logbuf/size-normal.scc
 include features/latencytop/latencytop.scc
 include features/profiling/profiling.scc

scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/{{=machine}}-standard.scc +0 -1

index 9e5cf13..e500bad 100644
@@ -11,6 +11,5 @@ include {{=machine}}.scc
 # default policy for standard kernels
 include cfg/usb-mass-storage.scc
 include cfg/boot-live.scc
-include features/logbuf/size-normal.scc
 include features/latencytop/latencytop.scc
 include features/profiling/profiling.scc

scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/{{=machine}}.scc +0 -5

index 5b8ccba..d8d3d35 100644
@@ -8,10 +8,5 @@ include features/i915/i915.scc
 include cfg/usb-mass-storage.scc
 include features/power/intel.scc
 
-include features/logbuf/size-normal.scc
-
-include features/latencytop/latencytop.scc
-include features/profiling/profiling.scc
-
 kconf hardware user-config.cfg
 include user-patches.scc

Signature · 1 line

1.7.11.4

[email protected]

author

2012-08-29 03:01 UTC #2 lore raw

PATCH 2/2 yocto-bsp: use KBRANCH_DEFAULT in 'newbranch' cases

From: Tom Zanussi <[email protected]>

The new yocto-kernel way of specifying that the branch sanity check doesn't need to be run is to specify a default kbranch and build that.

In the case where we have a new kbranch but it's not yet in the repo, we need to tell it that our new branch is the default and we're building the default and that's how we avoid the sanity check and the subsequent do_validate_branches() failure.

Signed-off-by Tom Zanussi <[email protected]>

---
 ...l_choice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 3 ++-
 ...l_choice == \"linux-yocto-rt_3.4\": }} linux-yocto-rt_3.4.bbappend" | 3 ++-
 ... kernel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 3 ++-
 ... kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" | 3 ++-
 ...l_choice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 3 ++-
 ...l_choice == \"linux-yocto-rt_3.4\": }} linux-yocto-rt_3.4.bbappend" | 3 ++-
 ... kernel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 3 ++-
 ... kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" | 3 ++-
 ...l_choice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 3 ++-
 ...l_choice == \"linux-yocto-rt_3.4\": }} linux-yocto-rt_3.4.bbappend" | 3 ++-
 ... kernel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 3 ++-
 ... kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" | 3 ++-
 ...l_choice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 3 ++-
 ...l_choice == \"linux-yocto-rt_3.4\": }} linux-yocto-rt_3.4.bbappend" | 3 ++-
 ... kernel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 3 ++-
 ... kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" | 3 ++-
 ...l_choice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 3 ++-
 ...l_choice == \"linux-yocto-rt_3.4\": }} linux-yocto-rt_3.4.bbappend" | 3 ++-
 ... kernel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 3 ++-
 ... kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" | 3 ++-
 ...l_choice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 3 ++-
 ...l_choice == \"linux-yocto-rt_3.4\": }} linux-yocto-rt_3.4.bbappend" | 3 ++-
 ... kernel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 3 ++-
 ... kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" | 3 ++-
 24 files changed, 48 insertions(+), 24 deletions(-)

scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend +2 -1

index 25b8ef9..3171cce 100644
@@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
 {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }}
 
 {{ if need_new_kbranch == "y": }}
-KBRANCH_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_DEFAULT_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_{{=machine}}  = "${KBRANCH_DEFAULT}"
 {{ if need_new_kbranch == "n": }}
 KBRANCH_{{=machine}}  = "{{=existing_kbranch}}"

scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.4\": }} linux-yocto-rt_3.4.bbappend +2 -1

index 094cf5c..f11bfa5 100644
@@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
 {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }}
 
 {{ if need_new_kbranch == "y": }}
-KBRANCH_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_DEFAULT_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_{{=machine}}  = "${KBRANCH_DEFAULT}"
 {{ if need_new_kbranch == "n": }}
 KBRANCH_{{=machine}}  = "{{=existing_kbranch}}"

scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend +2 -1

index 730b07a..1278064 100644
@@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
 {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/default" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }}
 
 {{ if need_new_kbranch == "y": }}
-KBRANCH_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_DEFAULT_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_{{=machine}}  = "${KBRANCH_DEFAULT}"
 {{ if need_new_kbranch == "n": }}
 KBRANCH_{{=machine}}  = "{{=existing_kbranch}}"

scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend +2 -1

index bea555c..5b20bab 100644
@@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
 {{ 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_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_DEFAULT_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_{{=machine}}  = "${KBRANCH_DEFAULT}"
 {{ if need_new_kbranch == "n": }}
 KBRANCH_{{=machine}}  = "{{=existing_kbranch}}"

scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend +2 -1

index e3085f5..8af3549 100644
@@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
 {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }}
 
 {{ if need_new_kbranch == "y": }}
-KBRANCH_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_DEFAULT_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_{{=machine}}  = "${KBRANCH_DEFAULT}"
 {{ if need_new_kbranch == "n": }}
 KBRANCH_{{=machine}}  = "{{=existing_kbranch}}"

scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.4\": }} linux-yocto-rt_3.4.bbappend +2 -1

index 094cf5c..f11bfa5 100644
@@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
 {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }}
 
 {{ if need_new_kbranch == "y": }}
-KBRANCH_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_DEFAULT_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_{{=machine}}  = "${KBRANCH_DEFAULT}"
 {{ if need_new_kbranch == "n": }}
 KBRANCH_{{=machine}}  = "{{=existing_kbranch}}"

scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend +2 -1

index 985a6a8..c5ff697 100644
@@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
 {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/default:standard/default/common-pc" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }}
 
 {{ if need_new_kbranch == "y": }}
-KBRANCH_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_DEFAULT_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_{{=machine}}  = "${KBRANCH_DEFAULT}"
 {{ if need_new_kbranch == "n": }}
 KBRANCH_{{=machine}}  = "{{=existing_kbranch}}"

scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend +2 -1

index 23147e9..34aa4cc 100644
@@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
 {{ 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_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_DEFAULT_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_{{=machine}}  = "${KBRANCH_DEFAULT}"
 {{ if need_new_kbranch == "n": }}
 KBRANCH_{{=machine}}  = "{{=existing_kbranch}}"

scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend +2 -1

index e3085f5..8af3549 100644
@@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
 {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }}
 
 {{ if need_new_kbranch == "y": }}
-KBRANCH_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_DEFAULT_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_{{=machine}}  = "${KBRANCH_DEFAULT}"
 {{ if need_new_kbranch == "n": }}
 KBRANCH_{{=machine}}  = "{{=existing_kbranch}}"

scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.4\": }} linux-yocto-rt_3.4.bbappend +2 -1

index 094cf5c..f11bfa5 100644
@@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
 {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }}
 
 {{ if need_new_kbranch == "y": }}
-KBRANCH_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_DEFAULT_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_{{=machine}}  = "${KBRANCH_DEFAULT}"
 {{ if need_new_kbranch == "n": }}
 KBRANCH_{{=machine}}  = "{{=existing_kbranch}}"

scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend +2 -1

index e1230c1..c617070 100644
@@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
 {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/default" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }}
 
 {{ if need_new_kbranch == "y": }}
-KBRANCH_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_DEFAULT_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_{{=machine}}  = "${KBRANCH_DEFAULT}"
 {{ if need_new_kbranch == "n": }}
 KBRANCH_{{=machine}}  = "{{=existing_kbranch}}"

scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend +2 -1

index bea555c..5b20bab 100644
@@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
 {{ 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_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_DEFAULT_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_{{=machine}}  = "${KBRANCH_DEFAULT}"
 {{ if need_new_kbranch == "n": }}
 KBRANCH_{{=machine}}  = "{{=existing_kbranch}}"

scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend +2 -1

index e3085f5..8af3549 100644
@@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
 {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }}
 
 {{ if need_new_kbranch == "y": }}
-KBRANCH_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_DEFAULT_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_{{=machine}}  = "${KBRANCH_DEFAULT}"
 {{ if need_new_kbranch == "n": }}
 KBRANCH_{{=machine}}  = "{{=existing_kbranch}}"

scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.4\": }} linux-yocto-rt_3.4.bbappend +2 -1

index 094cf5c..f11bfa5 100644
@@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
 {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }}
 
 {{ if need_new_kbranch == "y": }}
-KBRANCH_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_DEFAULT_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_{{=machine}}  = "${KBRANCH_DEFAULT}"
 {{ if need_new_kbranch == "n": }}
 KBRANCH_{{=machine}}  = "{{=existing_kbranch}}"

scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend +2 -1

index e1230c1..c617070 100644
@@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
 {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/default" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }}
 
 {{ if need_new_kbranch == "y": }}
-KBRANCH_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_DEFAULT_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_{{=machine}}  = "${KBRANCH_DEFAULT}"
 {{ if need_new_kbranch == "n": }}
 KBRANCH_{{=machine}}  = "{{=existing_kbranch}}"

scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend +2 -1

index bea555c..5b20bab 100644
@@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
 {{ 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_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_DEFAULT_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_{{=machine}}  = "${KBRANCH_DEFAULT}"
 {{ if need_new_kbranch == "n": }}
 KBRANCH_{{=machine}}  = "{{=existing_kbranch}}"

scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend +2 -1

index 6d6f4b6..680973e 100644
@@ -37,7 +37,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
 {{ input type:"choicelist" name:"existing_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }}
 
 {{ if need_new_kbranch == "y": }}
-KBRANCH_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_DEFAULT_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_{{=machine}}  = "${KBRANCH_DEFAULT}"
 {{ if need_new_kbranch == "n": }}
 KBRANCH_{{=machine}}  = "{{=existing_kbranch}}"

scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.4\": }} linux-yocto-rt_3.4.bbappend +2 -1

index 2e3bb00..70ede9f 100644
@@ -37,7 +37,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
 {{ input type:"choicelist" name:"existing_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }}
 
 {{ if need_new_kbranch == "y": }}
-KBRANCH_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_DEFAULT_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_{{=machine}}  = "${KBRANCH_DEFAULT}"
 {{ if need_new_kbranch == "n": }}
 KBRANCH_{{=machine}}  = "{{=existing_kbranch}}"

scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend +2 -1

index 5f3ec83..9af21f2 100644
@@ -37,7 +37,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
 {{ input type:"choicelist" name:"existing_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" branches_base:"standard/default" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/mti-malta32-be" }}
 
 {{ if need_new_kbranch == "y": }}
-KBRANCH_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_DEFAULT_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_{{=machine}}  = "${KBRANCH_DEFAULT}"
 {{ if need_new_kbranch == "n": }}
 KBRANCH_{{=machine}}  = "{{=existing_kbranch}}"

scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend +2 -1

index 977aaf0..1e90cf2 100644
@@ -37,7 +37,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
 {{ 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_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_DEFAULT_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_{{=machine}}  = "${KBRANCH_DEFAULT}"
 {{ if need_new_kbranch == "n": }}
 KBRANCH_{{=machine}}  = "{{=existing_kbranch}}"

scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend +2 -1

index e3085f5..8af3549 100644
@@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
 {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }}
 
 {{ if need_new_kbranch == "y": }}
-KBRANCH_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_DEFAULT_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_{{=machine}}  = "${KBRANCH_DEFAULT}"
 {{ if need_new_kbranch == "n": }}
 KBRANCH_{{=machine}}  = "{{=existing_kbranch}}"

scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-rt_3.4\": }} linux-yocto-rt_3.4.bbappend +2 -1

index 094cf5c..f11bfa5 100644
@@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
 {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }}
 
 {{ if need_new_kbranch == "y": }}
-KBRANCH_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_DEFAULT_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_{{=machine}}  = "${KBRANCH_DEFAULT}"
 {{ if need_new_kbranch == "n": }}
 KBRANCH_{{=machine}}  = "{{=existing_kbranch}}"

scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend +2 -1

index e3e0cc2..6f0d884 100644
@@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
 {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/default:standard/default/common-pc-64" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/common-pc-64/base" }}
 
 {{ if need_new_kbranch == "y": }}
-KBRANCH_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_DEFAULT_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_{{=machine}}  = "${KBRANCH_DEFAULT}"
 {{ if need_new_kbranch == "n": }}
 KBRANCH_{{=machine}}  = "{{=existing_kbranch}}"

scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend +2 -1

index 7db77a4..e855037 100644
@@ -13,7 +13,8 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
 {{ 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_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_DEFAULT_{{=machine}}  = "{{=strip_base(new_kbranch)}}/{{=machine}}"
+KBRANCH_{{=machine}}  = "${KBRANCH_DEFAULT}"
 {{ if need_new_kbranch == "n": }}
 KBRANCH_{{=machine}}  = "{{=existing_kbranch}}"

Signature · 1 line

1.7.11.4

Saul Wold

Applied

2012-08-29 22:16 UTC #3 lore raw

In reply to [email protected]

Quoted 43 lines · On 08/28/2012 08:01 PM, [email protected] wrote:

From: Tom Zanussi <[email protected]>

Since the original changeset was posted and tested, changes to the kernel tools were made and require some updates to the yocto-bsp tools, which are contained in these patches.

The following changes since commit b4c5725af4cd85d5644f0373e2674e903c4eab2b:

   yocto-bsp: add missing xserver-xf86-config .bbappend for qemu (2012-08-25 14:47:07 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib.git tzanussi/yocto-bsp-tool-change-updates
http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=tzanussi/yocto-bsp-tool-change-updates

Tom Zanussi (2):
yocto-bsp: remove obsolete references
yocto-bsp: use KBRANCH_DEFAULT in 'newbranch' cases

  ...oice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 3 ++-
  ...oice == \"linux-yocto-rt_3.4\": }} linux-yocto-rt_3.4.bbappend" | 3 ++-
  ...nel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 3 ++-
  ...nel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" | 3 ++-
  .../i386/recipes-kernel/linux/files/{{=machine}}-preempt-rt.scc    | 1 -
  .../arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc | 1 -
  .../target/arch/i386/recipes-kernel/linux/files/{{=machine}}.scc   | 7 -------
  ...oice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 3 ++-
  ...oice == \"linux-yocto-rt_3.4\": }} linux-yocto-rt_3.4.bbappend" | 3 ++-
  ...nel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 3 ++-
  ...nel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" | 3 ++-
  ...oice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 3 ++-
  ...oice == \"linux-yocto-rt_3.4\": }} linux-yocto-rt_3.4.bbappend" | 3 ++-
  ...nel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 3 ++-
  ...nel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" | 3 ++-
  ...oice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 3 ++-
  ...oice == \"linux-yocto-rt_3.4\": }} linux-yocto-rt_3.4.bbappend" | 3 ++-
  ...nel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 3 ++-
  ...nel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" | 3 ++-
  .../target/arch/qemu/recipes-kernel/linux/files/{{=machine}}.scc   | 2 --
  ...oice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 3 ++-
  ...oice == \"linux-yocto-rt_3.4\": }} linux-yocto-rt_3.4.bbappend" | 3 ++-
  ...nel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 3 ++-
  ...nel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" | 3 ++-

Quoted 9 lines

  .../x86_64/recipes-kernel/linux/files/{{=machine}}-preempt-rt.scc  | 1 -
  .../x86_64/recipes-kernel/linux/files/{{=machine}}-standard.scc    | 1 -
  .../target/arch/x86_64/recipes-kernel/linux/files/{{=machine}}.scc | 5 -----
  ...oice == \"linux-yocto-rt_3.2\": }} linux-yocto-rt_3.2.bbappend" | 3 ++-
  ...oice == \"linux-yocto-rt_3.4\": }} linux-yocto-rt_3.4.bbappend" | 3 ++-
  ...nel_choice == \"linux-yocto_3.2\": }} linux-yocto_3.2.bbappend" | 3 ++-
  ...nel_choice == \"linux-yocto_3.4\": }} linux-yocto_3.4.bbappend" | 3 ++-
  31 files changed, 48 insertions(+), 42 deletions(-)

Merged into Poky Master

Sau!