| Message ID | 20220922061928.1977-1-Srinuvasan_A@mentor.com |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | linux-custom: Update to BASE_DISTRO_CODENAME instead of DISTRO | expand |
22.09.2022 09:19, Srinuvasan A wrote: > From: Srinuvasan A <srinuvasan_a@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 <srinuvasan_a@mentor.com> > --- > meta/recipes-kernel/linux/linux-custom.inc | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc > index 8581dc8..31840f1 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 > > @@ -13,6 +13,8 @@ CHANGELOG_V = "${PV}+${PR}" > DESCRIPTION ?= "Custom kernel" > MAINTAINER ?= "isar-users <isar-users@googlegroups.com>" > > +OVERRIDES_append = ":${BASE_DISTRO_CODENAME}" > + Changing OVERRIDES might be done globally to keep used prefixes equal for all the recipes. For example meta/conf/bitbake.conf looks quite ok for that. > KBUILD_DEPENDS ?= "build-essential:native, \ > libelf-dev:native, \ > libncurses-dev:native, \ > @@ -30,9 +32,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},"
diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc index 8581dc8..31840f1 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 @@ -13,6 +13,8 @@ CHANGELOG_V = "${PV}+${PR}" DESCRIPTION ?= "Custom kernel" MAINTAINER ?= "isar-users <isar-users@googlegroups.com>" +OVERRIDES_append = ":${BASE_DISTRO_CODENAME}" + KBUILD_DEPENDS ?= "build-essential:native, \ libelf-dev:native, \ libncurses-dev:native, \ @@ -30,9 +32,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},"