summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2013-12-06 05:11:03 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-06 13:54:23 +0000
commit121dcd38552a38421a9dc4371b2169886c66643f (patch)
tree85b0d07ed9966104d2b5183e4893da73249c5964 /meta
parent14c2326d13338522e4e93b9e1fca9a990d8377cd (diff)
downloadpoky-121dcd38552a38421a9dc4371b2169886c66643f.tar.gz
linux-yocto/*: restore branch designations
The fetcher now confirms that a given SRCREV exists on the branch specified in the SRC_URI. The linux-yocto recipes used to do this themselves, but that functionality was removed to allow builds when only the SRCREV was set and to be similar to other recipes. Now that the fetcher checks this value, and other recipes must also have SRCREV + branch information, this extra information can be put back into the recipes. (From OE-Core rev: 4a562fd2614bb6ccce1222d47b9268d6980cf315) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.10.bb8
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.4.bb8
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.8.bb8
3 files changed, 24 insertions, 0 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.10.bb b/meta/recipes-kernel/linux/linux-yocto_3.10.bb
index d85c6c4829..10f2901112 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.10.bb
@@ -3,6 +3,14 @@ require recipes-kernel/linux/linux-yocto.inc
3KBRANCH_DEFAULT = "standard/base" 3KBRANCH_DEFAULT = "standard/base"
4KBRANCH = "${KBRANCH_DEFAULT}" 4KBRANCH = "${KBRANCH_DEFAULT}"
5 5
6# board specific branches
7KBRANCH_qemuarm = "standard/arm-versatile-926ejs"
8KBRANCH_qemumips = "standard/mti-malta32"
9KBRANCH_qemuppc = "standard/qemuppc"
10KBRANCH_qemux86 = "standard/common-pc/base"
11KBRANCH_qemux86-64 = "standard/common-pc-64/base"
12KBRANCH_qemumips64 = "standard/mti-malta64"
13
6SRCREV_machine_qemuarm ?= "7744145fcc3e4b6b6e308a1b86dc1c8b237b7575" 14SRCREV_machine_qemuarm ?= "7744145fcc3e4b6b6e308a1b86dc1c8b237b7575"
7SRCREV_machine_qemumips ?= "2b8e8c694c38729ce724facdb0ab20751d061a2e" 15SRCREV_machine_qemumips ?= "2b8e8c694c38729ce724facdb0ab20751d061a2e"
8SRCREV_machine_qemuppc ?= "9a7537cb9bcc5c835dae6ac84fbbe7298473f69c" 16SRCREV_machine_qemuppc ?= "9a7537cb9bcc5c835dae6ac84fbbe7298473f69c"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
index 9b8456fd6f..765d4deec7 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
@@ -3,6 +3,14 @@ require recipes-kernel/linux/linux-yocto.inc
3KBRANCH_DEFAULT = "standard/base" 3KBRANCH_DEFAULT = "standard/base"
4KBRANCH = "${KBRANCH_DEFAULT}" 4KBRANCH = "${KBRANCH_DEFAULT}"
5 5
6# board specific branches
7KBRANCH_qemuarm = "standard/arm-versatile-926ejs"
8KBRANCH_qemumips = "standard/mti-malta32"
9KBRANCH_qemuppc = "standard/qemuppc"
10KBRANCH_qemux86 = "standard/common-pc/base"
11KBRANCH_qemux86-64 = "standard/common-pc-64/base"
12KBRANCH_qemumips64 = "standard/mti-malta64"
13
6SRCREV_machine_qemuarm ?= "38fe75106c5faa3ea49d0a285769de3d08478f90" 14SRCREV_machine_qemuarm ?= "38fe75106c5faa3ea49d0a285769de3d08478f90"
7SRCREV_machine_qemumips ?= "67c8918ce3cfd66f19f23b46381993ff488b3fe0" 15SRCREV_machine_qemumips ?= "67c8918ce3cfd66f19f23b46381993ff488b3fe0"
8SRCREV_machine_qemuppc ?= "0e81c96b36e05746ae978a830fe3dbdac8a51e58" 16SRCREV_machine_qemuppc ?= "0e81c96b36e05746ae978a830fe3dbdac8a51e58"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.8.bb b/meta/recipes-kernel/linux/linux-yocto_3.8.bb
index 20fce1b981..dfc67bd9c0 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.8.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.8.bb
@@ -3,6 +3,14 @@ require recipes-kernel/linux/linux-yocto.inc
3KBRANCH_DEFAULT = "standard/base" 3KBRANCH_DEFAULT = "standard/base"
4KBRANCH = "${KBRANCH_DEFAULT}" 4KBRANCH = "${KBRANCH_DEFAULT}"
5 5
6# board specific branches
7KBRANCH_qemuarm = "standard/arm-versatile-926ejs"
8KBRANCH_qemumips = "standard/mti-malta32"
9KBRANCH_qemuppc = "standard/qemuppc"
10KBRANCH_qemux86 = "standard/common-pc/base"
11KBRANCH_qemux86-64 = "standard/common-pc-64/base"
12KBRANCH_qemumips64 = "standard/mti-malta64"
13
6SRCREV_machine_qemuarm ?= "aa76cc28408376814752bd36fb0dcf0e25aa5ba3" 14SRCREV_machine_qemuarm ?= "aa76cc28408376814752bd36fb0dcf0e25aa5ba3"
7SRCREV_machine_qemumips ?= "aa0affda03c955678b26b2fb586f1d9505127871" 15SRCREV_machine_qemumips ?= "aa0affda03c955678b26b2fb586f1d9505127871"
8SRCREV_machine_qemumips64 ?= "077bff22c9951db6b35470ba17b1df2f2a91fefb" 16SRCREV_machine_qemumips64 ?= "077bff22c9951db6b35470ba17b1df2f2a91fefb"