From 4a562fd2614bb6ccce1222d47b9268d6980cf315 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 6 Dec 2013 05:11:03 +0000 Subject: [PATCH] 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. Signed-off-by: Bruce Ashfield Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto_3.10.bb | 8 ++++++++ meta/recipes-kernel/linux/linux-yocto_3.4.bb | 8 ++++++++ meta/recipes-kernel/linux/linux-yocto_3.8.bb | 8 ++++++++ 3 files changed, 24 insertions(+) diff --git a/meta/recipes-kernel/linux/linux-yocto_3.10.bb b/meta/recipes-kernel/linux/linux-yocto_3.10.bb index d85c6c4829d..10f29011123 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 KBRANCH_DEFAULT = "standard/base" KBRANCH = "${KBRANCH_DEFAULT}" +# 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" + SRCREV_machine_qemuarm ?= "7744145fcc3e4b6b6e308a1b86dc1c8b237b7575" SRCREV_machine_qemumips ?= "2b8e8c694c38729ce724facdb0ab20751d061a2e" SRCREV_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 9b8456fd6f3..765d4deec7a 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 KBRANCH_DEFAULT = "standard/base" KBRANCH = "${KBRANCH_DEFAULT}" +# 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" + SRCREV_machine_qemuarm ?= "38fe75106c5faa3ea49d0a285769de3d08478f90" SRCREV_machine_qemumips ?= "67c8918ce3cfd66f19f23b46381993ff488b3fe0" SRCREV_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 20fce1b9815..dfc67bd9c06 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 KBRANCH_DEFAULT = "standard/base" KBRANCH = "${KBRANCH_DEFAULT}" +# 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" + SRCREV_machine_qemuarm ?= "aa76cc28408376814752bd36fb0dcf0e25aa5ba3" SRCREV_machine_qemumips ?= "aa0affda03c955678b26b2fb586f1d9505127871" SRCREV_machine_qemumips64 ?= "077bff22c9951db6b35470ba17b1df2f2a91fefb" -- 2.47.3