From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Thu, 5 Jul 2012 18:39:17 +0000 (-0400)
Subject: linux-yocto/3.4: remove explicit KBRANCH designations
X-Git-Tag: 2015-4~9490
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=7984a9f6ccd00bf282c9eedab7ab933add68448c;p=openembedded-core.git

linux-yocto/3.4: remove explicit KBRANCH designations

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>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---

diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
index 64a19a1caa..8ac240275e 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"