Patchwork [2/4] linux-yocto/3.4: remove explicit KBRANCH designations

login
mail settings
Submitter Bruce Ashfield
Date Aug. 15, 2012, 8:06 p.m.
Message ID <71e186f1f0e62c2d9a1faa7da9472258cb9ae799.1345059176.git.bruce.ashfield@windriver.com>
Download mbox | patch
Permalink /patch/34669/
State Accepted
Commit 7984a9f6ccd00bf282c9eedab7ab933add68448c
Headers show

Comments

Bruce Ashfield - Aug. 15, 2012, 8:06 p.m.
A BSP specific KBRANCH assignment is no longer a required
element to locate and build a yocto kernel. As such we can
set the default kbranch, and remove all other explicit
assignments.

KBRANCH is still used, and if it is changed from the
default, that branch will be built.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/recipes-kernel/linux/linux-yocto_3.4.bb |   11 ++---------
 1 files changed, 2 insertions(+), 9 deletions(-)

Patch

diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
index 64a19a1..8ac2402 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
@@ -1,14 +1,7 @@ 
 require recipes-kernel/linux/linux-yocto.inc
 
-KBRANCH = "standard/base"
-KBRANCH_qemux86  = "standard/common-pc/base"
-KBRANCH_qemux86-64  = "standard/common-pc-64/base"
-KBRANCH_qemuppc  = "standard/qemuppc"
-KBRANCH_qemumips = "standard/mti-malta32"
-KBRANCH_qemumipsel = "standard/mti-malta32"
-KBRANCH_qemumips64 = "standard/mti-malta64"
-KBRANCH_qemumips64el = "standard/mti-malta64"
-KBRANCH_qemuarm  = "standard/arm-versatile-926ejs"
+KBRANCH_DEFAULT = "standard/base"
+KBRANCH = "${KBRANCH_DEFAULT}"
 
 SRCREV_machine_qemuarm ?= "6db2c606429fa8671e76eb312cdd92f9451cf8e8"
 SRCREV_machine_qemumips  ?= "a9f79fc1bde4f5adb7cb015d2f2b5a04bd5597a1"