* [PATCH 0/1][daisy] yocto-bsp fix
@ 2015-01-27 13:39 Tom Zanussi
2015-01-27 13:39 ` [PATCH 1/1] yocto-bsp: Add branch to SRC_URI for custom kernels Tom Zanussi
0 siblings, 1 reply; 3+ messages in thread
From: Tom Zanussi @ 2015-01-27 13:39 UTC (permalink / raw)
To: poky; +Cc: Tom Zanussi
This patchset contains a fix for Yocto Bug 6518 (yocto-bsp create
creates faulty SRC_URI). Please apply to daisy-next.
The following changes since commit b1dfbe192ee5d8f5595504017bdcbb530264597c:
yocto-bsp: Add missing conf dir to arm template (2015-01-21 10:40:38 -0600)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib.git tzanussi/custom-kbranch-master
http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=tzanussi/custom-kbranch-daisy
Tom Zanussi (1):
yocto-bsp: Add branch to SRC_URI for custom kernels
.../target/arch/common/recipes-kernel/linux/linux-yocto-custom.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
1.9.3
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/1] yocto-bsp: Add branch to SRC_URI for custom kernels
2015-01-27 13:39 [PATCH 0/1][daisy] yocto-bsp fix Tom Zanussi
@ 2015-01-27 13:39 ` Tom Zanussi
2015-01-28 13:05 ` Saul Wold
0 siblings, 1 reply; 3+ messages in thread
From: Tom Zanussi @ 2015-01-27 13:39 UTC (permalink / raw)
To: poky; +Cc: Tom Zanussi
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.zanussi@linux.intel.com>
---
.../target/arch/common/recipes-kernel/linux/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/linux-yocto-custom.bb b/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom.bb
index 69f598e..80a52e7c 100644
--- a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom.bb
+++ b/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom.bb
@@ -32,9 +32,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.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] yocto-bsp: Add branch to SRC_URI for custom kernels
2015-01-27 13:39 ` [PATCH 1/1] yocto-bsp: Add branch to SRC_URI for custom kernels Tom Zanussi
@ 2015-01-28 13:05 ` Saul Wold
0 siblings, 0 replies; 3+ messages in thread
From: Saul Wold @ 2015-01-28 13:05 UTC (permalink / raw)
To: Tom Zanussi, sgw, poky
On 01/27/2015 08:46 AM, Tom Zanussi wrote:
> 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.zanussi@linux.intel.com>
> ---
> .../target/arch/common/recipes-kernel/linux/linux-yocto-custom.bb | 4 ++--
This does not apply to daisy since daisy uses the older style of file
naming with the command check.
Sau!
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom.bb b/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom.bb
> index 69f598e..80a52e7c 100644
> --- a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom.bb
> +++ b/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom.bb
> @@ -32,9 +32,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"
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-01-28 13:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-27 13:39 [PATCH 0/1][daisy] yocto-bsp fix Tom Zanussi
2015-01-27 13:39 ` [PATCH 1/1] yocto-bsp: Add branch to SRC_URI for custom kernels Tom Zanussi
2015-01-28 13:05 ` Saul Wold
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.