From: Tom Zanussi <tom.zanu...@linux.intel.com>
Without 'branch' in the SRC_URI, a SRCREV specified for a non-master
KBRANCH will result in a fetch failure since the branch tested by the
fetcher will default to master, which doesn't contain the SRCREV.
This fixes the problem by adding branch=KBRANCH to the SRC_URI.
Fixes [Yocto #6518].
Signed-off-by: Tom Zanussi <tom.zanu...@linux.intel.com>
Signed-off-by: Armin Kuster <akuster...@gmail.com>
---
.../{{ if kernel_choice == \"custom\": }} linux-yocto-custom.bb" | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
"a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if
kernel_choice == \"custom\": }} linux-yocto-custom.bb"
"b/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if
kernel_choice == \"custom\": }} linux-yocto-custom.bb"
index 6d3cc6f..c85e731 100644
--- "a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if
kernel_choice == \"custom\": }} linux-yocto-custom.bb"
+++ "b/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if
kernel_choice == \"custom\": }} linux-yocto-custom.bb"
@@ -31,9 +31,9 @@ inherit kernel
require recipes-kernel/linux/linux-yocto.inc
{{ if kernel_choice == "custom" and custom_kernel_remote == "y": }}
-SRC_URI = "{{=custom_kernel_remote_path}};protocol=git;bareclone=1"
+SRC_URI =
"{{=custom_kernel_remote_path}};protocol=git;bareclone=1;branch=${KBRANCH}"
{{ if kernel_choice == "custom" and custom_kernel_remote == "n": }}
-SRC_URI = "git://{{=custom_kernel_local_path}};protocol=file;bareclone=1"
+SRC_URI =
"git://{{=custom_kernel_local_path}};protocol=file;bareclone=1;branch=${KBRANCH}"
SRC_URI += "file://defconfig"
--
1.9.1
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
