All of lore.kernel.org
 help / color / mirror / Atom feed
From: Bruce Ashfield <bruce.ashfield@windriver.com>
To: <richard.purdie@linuxfoundation.org>
Cc: openembedded-core@lists.openembedded.org
Subject: [PATCH 11/18] kernel-yocto: remove KBRANCH_DEFAULT
Date: Sat, 30 Aug 2014 00:38:14 -0400	[thread overview]
Message-ID: <0f0ec6c1d6411603d5757a037c79c49df646db52.1409345003.git.bruce.ashfield@windriver.com> (raw)
In-Reply-To: <cover.1409345003.git.bruce.ashfield@windriver.com>

KBRANCH_DEFAULT is no longer used, so we can remove it from all
recipes (and it won't be missed).

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/recipes-kernel/linux/linux-yocto-dev.bb       |  1 -
 meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb   |  4 ++--
 meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb   |  4 ++--
 meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb    |  4 ++--
 meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb |  3 +--
 meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb |  2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb  |  3 +--
 meta/recipes-kernel/linux/linux-yocto_3.10.bb      | 15 +++++++--------
 meta/recipes-kernel/linux/linux-yocto_3.14.bb      | 14 +++++++-------
 meta/recipes-kernel/linux/linux-yocto_3.4.bb       | 15 +++++++--------
 10 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-dev.bb b/meta/recipes-kernel/linux/linux-yocto-dev.bb
index 10f3d234ed25..595f72d5bb6e 100644
--- a/meta/recipes-kernel/linux/linux-yocto-dev.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-dev.bb
@@ -23,7 +23,6 @@ python () {
 }
 
 KBRANCH = "standard/base"
-KBRANCH_DEFAULT = "${KBRANCH}"
 KMETA = "meta"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
index 65a74d3ec75d..80d8db082338 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
@@ -1,7 +1,7 @@
 require recipes-kernel/linux/linux-yocto.inc
 
-KBRANCH = "standard/preempt-rt/base"
-KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
+KBRANCH ?= "standard/preempt-rt/base"
+KBRANCH_qemuppc ?= "standard/preempt-rt/qemuppc"
 
 SRCREV_machine ?= "c373b342af7bcbeda346df9598a5b1e9784d362f"
 SRCREV_machine_qemuppc ?= "767da5a30782cc1bc6522cef8aa5fd8130ecc06c"
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
index 0c5767a49e5b..59918d77e1cf 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
@@ -1,7 +1,7 @@
 require recipes-kernel/linux/linux-yocto.inc
 
-KBRANCH = "standard/preempt-rt/base"
-KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
+KBRANCH ?= "standard/preempt-rt/base"
+KBRANCH_qemuppc ?= "standard/preempt-rt/qemuppc"
 
 SRCREV_machine ?= "77d54dcdf1e078290d88e85adbbe3f90d41f4c9e"
 SRCREV_machine_qemuppc ?= "ba132753cc6688c1c22d7147b02e434a3441833c"
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
index e01ffeec7ab0..6929dfaec198 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
@@ -1,7 +1,7 @@
 require recipes-kernel/linux/linux-yocto.inc
 
-KBRANCH = "standard/preempt-rt/base"
-KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
+KBRANCH ?= "standard/preempt-rt/base"
+KBRANCH_qemuppc ?= "standard/preempt-rt/qemuppc"
 
 LINUX_VERSION ?= "3.4.91"
 LINUX_KERNEL_TYPE = "preempt-rt"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb
index b70d7bc081ce..a751d541179a 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb
@@ -1,7 +1,6 @@
 require recipes-kernel/linux/linux-yocto.inc
 
-KBRANCH_DEFAULT = "standard/tiny/base"
-KBRANCH = "${KBRANCH_DEFAULT}"
+KBRANCH ?= "standard/tiny/base"
 LINUX_KERNEL_TYPE = "tiny"
 KCONFIG_MODE = "--allnoconfig"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
index 3e8c0bc67127..34341d7a016a 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
@@ -1,6 +1,6 @@
 require recipes-kernel/linux/linux-yocto.inc
 
-KBRANCH = "standard/tiny/base"
+KBRANCH ?= "standard/tiny/base"
 LINUX_KERNEL_TYPE = "tiny"
 KCONFIG_MODE = "--allnoconfig"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
index fd5c9f76967e..bad6b8f4eb9b 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
@@ -3,8 +3,7 @@ require recipes-kernel/linux/linux-yocto.inc
 # We need lzma (as CONFIG_KERNEL_LZMA=y)
 DEPENDS += "xz-native"
 
-KBRANCH_DEFAULT = "standard/tiny/base"
-KBRANCH = "${KBRANCH_DEFAULT}"
+KBRANCH ?= "standard/tiny/base"
 LINUX_KERNEL_TYPE = "tiny"
 KCONFIG_MODE = "--allnoconfig"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.10.bb b/meta/recipes-kernel/linux/linux-yocto_3.10.bb
index 57395b4ebb1b..f2904b62a132 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.10.bb
@@ -1,15 +1,14 @@
 require recipes-kernel/linux/linux-yocto.inc
 
-KBRANCH_DEFAULT = "standard/base"
-KBRANCH = "${KBRANCH_DEFAULT}"
+KBRANCH = "standard/base"
 
 # board specific branches
-KBRANCH_qemuarm  = "standard/arm-versatile-926ejs"
-KBRANCH_qemumips = "standard/mti-malta32"
-KBRANCH_qemuppc  = "standard/qemuppc"
-KBRANCH_qemux86  = "standard/common-pc/base"
-KBRANCH_qemux86-64  = "standard/common-pc-64/base"
-KBRANCH_qemumips64 = "standard/mti-malta64"
+KBRANCH_qemuarm  ?= "standard/arm-versatile-926ejs"
+KBRANCH_qemumips ?= "standard/mti-malta32"
+KBRANCH_qemuppc  ?= "standard/qemuppc"
+KBRANCH_qemux86  ?= "standard/common-pc/base"
+KBRANCH_qemux86-64  ?= "standard/common-pc-64/base"
+KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
 SRCREV_machine_qemuarm ?= "db489eed7f5c86037358cc9d0fefa7b90dbbaa86"
 SRCREV_machine_qemumips ?= "780aac11b3f20ed2f5df3f173b0d02b28a6eb96b"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.14.bb b/meta/recipes-kernel/linux/linux-yocto_3.14.bb
index 8c3cceec7d8d..9f154b6775aa 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.14.bb
@@ -1,14 +1,14 @@
 require recipes-kernel/linux/linux-yocto.inc
 
-KBRANCH = "standard/base"
+KBRANCH ?= "standard/base"
 
 # board specific branches
-KBRANCH_qemuarm  = "standard/arm-versatile-926ejs"
-KBRANCH_qemumips = "standard/mti-malta32"
-KBRANCH_qemuppc  = "standard/qemuppc"
-KBRANCH_qemux86  = "standard/common-pc/base"
-KBRANCH_qemux86-64  = "standard/common-pc-64/base"
-KBRANCH_qemumips64 = "standard/mti-malta64"
+KBRANCH_qemuarm  ?= "standard/arm-versatile-926ejs"
+KBRANCH_qemumips ?= "standard/mti-malta32"
+KBRANCH_qemuppc  ?= "standard/qemuppc"
+KBRANCH_qemux86  ?= "standard/common-pc/base"
+KBRANCH_qemux86-64 ?= "standard/common-pc-64/base"
+KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
 SRCREV_machine_qemuarm ?= "92de8060e113e4a13f16c6b4b5333f538e291c6d"
 SRCREV_machine_qemumips ?= "313647599dd3cd7f42374d918a9397f82eed36fb"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
index 1eabf764ef6d..3538afcf9809 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
@@ -1,15 +1,14 @@
 require recipes-kernel/linux/linux-yocto.inc
 
-KBRANCH_DEFAULT = "standard/base"
-KBRANCH = "${KBRANCH_DEFAULT}"
+KBRANCH = "standard/base"
 
 # board specific branches
-KBRANCH_qemuarm  = "standard/arm-versatile-926ejs"
-KBRANCH_qemumips = "standard/mti-malta32"
-KBRANCH_qemuppc  = "standard/qemuppc"
-KBRANCH_qemux86  = "standard/common-pc/base"
-KBRANCH_qemux86-64  = "standard/common-pc-64/base"
-KBRANCH_qemumips64 = "standard/mti-malta64"
+KBRANCH_qemuarm  ?= "standard/arm-versatile-926ejs"
+KBRANCH_qemumips ?= "standard/mti-malta32"
+KBRANCH_qemuppc  ?= "standard/qemuppc"
+KBRANCH_qemux86  ?= "standard/common-pc/base"
+KBRANCH_qemux86-64  ?= "standard/common-pc-64/base"
+KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
 SRCREV_machine_qemuarm ?= "192b56b2f529af1be014ea85667c9f3fea0afd53"
 SRCREV_machine_qemumips  ?= "58fb8b8fb2f9911cac84cd840d63c8a58bada6ca"
-- 
1.8.1.2



  parent reply	other threads:[~2014-08-30  4:38 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-30  4:38 [PATCH 00/18] kernel-yocto: consolidated pull request Bruce Ashfield
2014-08-30  4:38 ` [PATCH 01/18] kernel-yocto: use cat-file instead of git-show Bruce Ashfield
2014-08-30  4:38 ` [PATCH 02/18] kernel-yocto: move SRCREV validation to patching phase Bruce Ashfield
2014-08-30 13:55   ` Richard Purdie
2014-08-31  0:52     ` Bruce Ashfield
2014-08-31  5:25     ` Bruce Ashfield
2014-08-30  4:38 ` [PATCH 03/18] kernel-yocto: remove containing branch check Bruce Ashfield
2014-08-30  4:38 ` [PATCH 04/18] kernel-yocto: remove SRC_URI kbranch validation Bruce Ashfield
2014-08-30  4:38 ` [PATCH 05/18] kernel-yocto: remove branch existence checking in do_validate_branches Bruce Ashfield
2014-08-30  4:38 ` [PATCH 06/18] kernel-yocto: remove KBRANCH_DEFAULT Bruce Ashfield
2014-08-30  4:38 ` [PATCH 07/18] kernel-yocto: simplify branch SRCREV validation Bruce Ashfield
2014-08-30  4:38 ` [PATCH 08/18] kernel-yocto: use show-ref instead of branch -a Bruce Ashfield
2014-08-30  4:38 ` [PATCH 09/18] kernel-yocto: clean overly complex branch checkout Bruce Ashfield
2014-08-30  4:38 ` [PATCH 10/18] kernel-yocto: allow custom non-meta, SRCREV format builds Bruce Ashfield
2014-08-30  4:38 ` Bruce Ashfield [this message]
2014-08-30  4:38 ` [PATCH 12/18] kernel-yocto: convert echo statements to bb* equivalents Bruce Ashfield
2014-08-30  4:38 ` [PATCH 13/18] kern-tools: allow meta branch and meta data directory to differ Bruce Ashfield
2014-08-30  4:38 ` [PATCH 14/18] images: introduce core-image-kernel-dev Bruce Ashfield
2014-08-30  4:38 ` [PATCH 15/18] linux-yocto/3.14: vhost, vxland, openvswitch and block/bfq updates Bruce Ashfield
2014-08-30  4:38 ` [PATCH 16/18] linux-yocto/3.14: update to v3.14.17 Bruce Ashfield
2014-08-30  4:38 ` [PATCH 17/18] linux-yocto/3.4: remove 3.4 name recipes Bruce Ashfield
2014-08-30  4:38 ` [PATCH 18/18] linux-libc-headers: update to 3.16 Bruce Ashfield
2014-08-31 10:07 ` [PATCH 00/18] kernel-yocto: consolidated pull request Richard Purdie
2014-08-31 13:57   ` Bruce Ashfield
2014-09-01  1:53   ` Bruce Ashfield
2014-09-01  2:39   ` Bruce Ashfield
2014-09-01 16:12     ` Richard Purdie
2014-09-02 12:11       ` Bruce Ashfield
2014-08-31 23:41 ` Otavio Salvador
2014-09-01  1:18   ` Bruce Ashfield

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=0f0ec6c1d6411603d5757a037c79c49df646db52.1409345003.git.bruce.ashfield@windriver.com \
    --to=bruce.ashfield@windriver.com \
    --cc=openembedded-core@lists.openembedded.org \
    --cc=richard.purdie@linuxfoundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.