diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-03-18 23:01:19 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-01 14:35:41 +0100 |
commit | cf8a0ac1b097a6790b4b02a86182764e3eecf581 (patch) | |
tree | be1ba4285c8657a1378cddd358ee0424e44d440b | |
parent | 63f2e18987f0c494fdc878ee2e44ec6d6159f2ea (diff) | |
download | ast2050-yocto-poky-cf8a0ac1b097a6790b4b02a86182764e3eecf581.zip ast2050-yocto-poky-cf8a0ac1b097a6790b4b02a86182764e3eecf581.tar.gz |
kernel-yocto: remove KBRANCH_DEFAULT
KBRANCH_DEFAULT is no longer used, so we can remove it from all
recipes (and it won't be missed).
(From OE-Core rev: e631fc989b08873f559c5927117301294f04298c)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-dev.bb | 1 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb | 3 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb | 3 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.10.bb | 15 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.14.bb | 14 | ||||
-rw-r--r-- | 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 10f3d23..595f72d 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 65a74d3..80d8db0 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 0c5767a..59918d7 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 e01ffee..6929dfa 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 b70d7bc..a751d54 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 3e8c0bc..34341d7 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 fd5c9f7..bad6b8f 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 57395b4..f2904b6 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 8c3ccee..9f154b6 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 1eabf76..3538afc 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" |