From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7146085165372014592 X-Received: by 2002:adf:e109:0:b0:225:4ca5:80d5 with SMTP id t9-20020adfe109000000b002254ca580d5mr12576356wrz.465.1664186586713; Mon, 26 Sep 2022 03:03:06 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6000:695:b0:22b:e6:7bce with SMTP id bo21-20020a056000069500b0022b00e67bcels11724472wrb.1.-pod-prod-gmail; Mon, 26 Sep 2022 03:03:05 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5JS0IOpuJdHuM1gqwcTBO0ihrqvWMXEsS6pVZKfpJYsv1XJXN15kQYk1aGy5uoozF/Tuql X-Received: by 2002:adf:d1e8:0:b0:22a:c131:4c49 with SMTP id g8-20020adfd1e8000000b0022ac1314c49mr13280454wrd.647.1664186585565; Mon, 26 Sep 2022 03:03:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664186585; cv=none; d=google.com; s=arc-20160816; b=pQsQf1MTD5HPRMbBl2Ata3vk6zZERw7sNKELAfZDiAkxyxKYgbbY4vtkhDLKwl1M4O Dz2VEyEf1oYLiAfgIcufj1ZzIdSIKZcU7DpgWs5JJW7IF8fJW2sDrcWfbwtm9UDVlaCV JXUOy3TEGEedSuMryrCoQcd8Ta0zCljZmQvdkhhoTNHY+vr7GS7Fg5SBG+MwQFU3XgS9 k1xTxq+qDpt76iSKlbVI1Z3ZbWr/QQMOHh3Hwk6fmSKq6jJ1G5ENGBhi0IMiNTPgKiXT 2NRyBUKsQmZMx6ndJNDyBbttGBVzi4UdeaTR+7/IDKQdv89I+lvTXe3Nfkyjey+6oURR grUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=in-reply-to:from:references:to:content-language:subject:user-agent :mime-version:date:message-id; bh=swEiBL9SSMCO9V/IDFrFLyOvfBb8aZbfupkP3IO3XfY=; b=SvekRtMKqISktIe5B1vdkKkvkKZItGdR5hw4mq2jaztBalMBoW1fPGfXXkGsevl2/C XK7gPyzdrZoaYz4wigPXCZj/WLT9oipYjW9sY7trv9KLe8XRZbKjkQycfzagTexrRsIz gkZHfpjDVSINLP4wCqJ0ovuf8ho5uG5ysyZ2n25I8yWftUy+NLvEUKytro1WzvQl2LKD TE5KDXMj8MbTcrn9wViWg+elvjGDaNLBQCkKK3DxvcGWvDaJJEO52jSsTMfQrFA66hZK oXt45+7FHPcG7KBbUfYBwWutwHt65Zn1NO/gIzN05yGELes1E4sFp+Vlif7EjttUaX9b pX+Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id m188-20020a1ca3c5000000b003a6787eaf57si476483wme.2.2022.09.26.03.03.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Sep 2022 03:03:05 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from [127.0.0.1] (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 28QA30AE019591 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 26 Sep 2022 12:03:01 +0200 Content-Type: multipart/alternative; boundary="------------YFPljBoDZhjvyFLRA68GIZ8p" Message-ID: <962a4b9a-936c-5451-4d59-50ea6c15ab6a@ilbers.de> Date: Mon, 26 Sep 2022 13:03:00 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: Re: [PATCH] bitbake.conf: Add BASE_DISTRO_CODENAME in OVERRIDES variable Content-Language: en-US To: Srinuvasan Arjunan , isar-users References: <20220922061928.1977-1-Srinuvasan_A@mentor.com> <20220923102855.1357346-1-Srinuvasan_A@mentor.com> <3ae3eede-e989-4f3e-99da-3ee955b0abfbn@googlegroups.com> From: Anton Mikanovich In-Reply-To: <3ae3eede-e989-4f3e-99da-3ee955b0abfbn@googlegroups.com> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,HTML_MESSAGE autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: OAhARAlU0nDx This is a multi-part message in MIME format. --------------YFPljBoDZhjvyFLRA68GIZ8p Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit 26.09.2022 12:55, Srinuvasan Arjunan wrote > > > On Sunday, September 25, 2022 at 1:57:30 PM UTC+5:30 Moessbauer, Felix > wrote: > > > -----Original Message----- > > From: 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) ; Srinuvasan A > > > > Subject: [PATCH] bitbake.conf: Add BASE_DISTRO_CODENAME in > OVERRIDES > > variable > > > > From: Srinuvasan A > > > > 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 > > --- > > 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. Hello Srinuvasan, v2 looks ok (BTW please mark resend patch as v2 next time), and it is already in testing with our CI. Will be merged after passing all the tests (fast+full). --------------YFPljBoDZhjvyFLRA68GIZ8p Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 8bit
26.09.2022 12:55, Srinuvasan Arjunan wrote


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.

Hello Srinuvasan,

v2 looks ok (BTW please mark resend patch as v2 next time), and it is already
in testing with our CI. Will be merged after passing all the tests (fast+full).

--------------YFPljBoDZhjvyFLRA68GIZ8p--