Re: [PATCH] bitbake.conf: Add BASE_DISTRO_CODENAME in OVERRIDES variable

[Srinuvasan Arjunan <srinuvasanasv@gmail.com>]

[-- Attachment #1.1: Type: text/plain, Size: 3313 bytes --]



On Sunday, September 25, 2022 at 1:57:30 PM UTC+5:30 Moessbauer, Felix 
wrote:

> > -----Original Message----- 
> > From: isar-...@googlegroups.com <isar-...@googlegroups.com> On 
> > Behalf Of Srinuvasan A 
> > Sent: Friday, September 23, 2022 6:29 PM 
> > To: isar-...@googlegroups.com; ami...@ilbers.de 
> > Cc: Kiszka, Jan (T CED) <jan.k...@siemens.com>; Srinuvasan A 
> > <srinuv...@mentor.com> 
> > Subject: [PATCH] bitbake.conf: Add BASE_DISTRO_CODENAME in OVERRIDES 
> > variable 
> > 
> > From: Srinuvasan A <srinuv...@mentor.com> 
> > 
> > Commit 4ffdf792 says, Switch custom kernel modules to use libssl3 by 
> default 
> > and left libssl1.1 dependency only for distros not yet migrated, here 
> they used 
> > overrides based on "DISTRO". 
> > 
> > Here DISTRO is debian-bullseye or debian-buster and so on, downstream 
> layers 
> > might define their own DISTRO name. 
> > 
> > Use the overrides based on "BASE_DISTRO_CODENAME" to pick up the exact 
> > version of libssl for the corresponding DISTRO to better support 
> downstream 
> > layers with custom DISTRO names. 
> > 
> > Signed-off-by: Srinuvasan A <srinuv...@mentor.com> 
> > --- 
> > meta/conf/bitbake.conf | 2 +- 
> > meta/recipes-kernel/linux/linux-custom.inc | 10 +++++----- 
> > 2 files changed, 6 insertions(+), 6 deletions(-) 
> > 
> > diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 
> > 19798b7..98412e0 100644 
> > --- a/meta/conf/bitbake.conf 
> > +++ b/meta/conf/bitbake.conf 
> > @@ -67,7 +67,7 @@ KERNEL_FILE_mipsel ?= "vmlinux" 
> > KERNEL_FILE_riscv64 ?= "vmlinux" 
> > KERNEL_FILE_arm64 ?= "vmlinux" 
> > 
> > -OVERRIDES = 
> > "${DISTRO_ARCH}:${COMPAT_OVERRIDE}:${MACHINE}:${DISTRO}:forcevariabl 
> > e" 
> > +OVERRIDES = 
> > "${DISTRO_ARCH}:${COMPAT_OVERRIDE}:${MACHINE}:${DISTRO}:${BASE_DIST 
> > RO_CODENAME}:forcevariable" 
> > FILESOVERRIDES = "${DISTRO_ARCH}:${MACHINE}" 
> > COMPAT_OVERRIDE = "${@'compat-arch' if 
> > d.getVar('ISAR_ENABLE_COMPAT_ARCH') == '1' else ''}" 
> > 
> > diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes- 
> > kernel/linux/linux-custom.inc 
> > index 8581dc8..96f0afc 100644 
> > --- a/meta/recipes-kernel/linux/linux-custom.inc 
> > +++ b/meta/recipes-kernel/linux/linux-custom.inc 
> > @@ -1,8 +1,8 @@ 
> > # Custom kernel build 
> > # 
> > # This software is a part of ISAR. 
> > -# Copyright (c) Siemens AG, 2018 
> > -# Copyright (c) Mentor Graphics, a Siemens business, 2019 
> > +# Copyright (c) Siemens AG, 2022 
> > +# Copyright (c) Mentor Graphics, a Siemens business, 2022 
> > # 
> > # SPDX-License-Identifier: MIT 
> > 
> > @@ -30,9 +30,9 @@ KERNEL_DEBIAN_DEPENDS ?= "initramfs-tools | linux- 
> > initramfs-tool, \ 
> > linux-base (>= 4.3~)," 
> > 
> > LIBSSL_DEP = "libssl3" 
> > -LIBSSL_DEP_debian-stretch = "libssl1.1" 
> > -LIBSSL_DEP_debian-buster = "libssl1.1" 
> > -LIBSSL_DEP_debian-bullseye = "libssl1.1" 
> > +LIBSSL_DEP_stretch = "libssl1.1" 
> > +LIBSSL_DEP_buster = "libssl1.1" 
> > +LIBSSL_DEP_bullseye = "libssl1.1" 
> > 
> > KERNEL_HEADERS_DEBIAN_DEPENDS ?= "libc6, \ 
> > ${LIBSSL_DEP}," 
> > -- 
> > 2.25.1 
> > 
>
> ACK - tested on the Siemens internal ipc520a layer. 
> This fixes the broken kernel-headers package.


  Thanks felix for your feedback. 

>
>
> Felix


  Amikan , Please have a look, thanks.

[-- Attachment #1.2: Type: text/html, Size: 4586 bytes --]