linux-yocto-dev: Set KBRANCH with =

Message ID 20220111031616.43536-1-zhe.he@windriver.com
State Accepted, archived
Commit c7a1004c7f7e86506ccd7d6d40f148931096461a
Headers show
Series linux-yocto-dev: Set KBRANCH with = | expand

Commit Message

He Zhe Jan. 11, 2022, 3:16 a.m. UTC
The "?=" assignment to KBRANCH in kernel-yocto.bbclass is selected prior to
the one in this recipe and makes it "master" as a result.

Change the KBRANCH assignment back to "=" as how it was done before.

Signed-off-by: He Zhe <zhe.he@windriver.com>
---
 meta/recipes-kernel/linux/linux-yocto-dev.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Bruce Ashfield Jan. 11, 2022, 1:38 p.m. UTC | #1
On Mon, Jan 10, 2022 at 10:16 PM He Zhe <zhe.he@windriver.com> wrote:
>
> The "?=" assignment to KBRANCH in kernel-yocto.bbclass is selected prior to
> the one in this recipe and makes it "master" as a result.
>
> Change the KBRANCH assignment back to "=" as how it was done before.
>

Right! I was trying to make the switch way from standard/* to be a bit
more flexible, but didn't notice that master was building, since it is
typically in sync in my local tests.

The change is fine with me.

Bruce

> Signed-off-by: He Zhe <zhe.he@windriver.com>
> ---
>  meta/recipes-kernel/linux/linux-yocto-dev.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-kernel/linux/linux-yocto-dev.bb b/meta/recipes-kernel/linux/linux-yocto-dev.bb
> index 80f62a0412..0d94637352 100644
> --- a/meta/recipes-kernel/linux/linux-yocto-dev.bb
> +++ b/meta/recipes-kernel/linux/linux-yocto-dev.bb
> @@ -16,7 +16,7 @@ inherit pkgconfig
>  # provide this .inc to set specific revisions
>  include recipes-kernel/linux/linux-yocto-dev-revisions.inc
>
> -KBRANCH ?= "v5.16/standard/base"
> +KBRANCH = "v5.16/standard/base"
>  KMETA = "kernel-meta"
>
>  SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name=machine \
> --
> 2.17.1
>


--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

Patch

diff --git a/meta/recipes-kernel/linux/linux-yocto-dev.bb b/meta/recipes-kernel/linux/linux-yocto-dev.bb
index 80f62a0412..0d94637352 100644
--- a/meta/recipes-kernel/linux/linux-yocto-dev.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-dev.bb
@@ -16,7 +16,7 @@  inherit pkgconfig
 # provide this .inc to set specific revisions
 include recipes-kernel/linux/linux-yocto-dev-revisions.inc
 
-KBRANCH ?= "v5.16/standard/base"
+KBRANCH = "v5.16/standard/base"
 KMETA = "kernel-meta"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name=machine \