From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7146085165372014592 X-Received: by 2002:a17:907:318b:b0:740:33f2:9e8 with SMTP id xe11-20020a170907318b00b0074033f209e8mr6400684ejb.138.1663928960187; Fri, 23 Sep 2022 03:29:20 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:268a:b0:43d:b3c4:cd21 with SMTP id w10-20020a056402268a00b0043db3c4cd21ls7431986edd.2.-pod-prod-gmail; Fri, 23 Sep 2022 03:29:19 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6zNs7BUrCgeyyU4T5o4QcTJh2cF3dp87rH9szeybTeTeYi6x6DgOYkMJse/pT+RpoZcylk X-Received: by 2002:a05:6402:40cc:b0:452:697e:da18 with SMTP id z12-20020a05640240cc00b00452697eda18mr7476032edb.288.1663928959074; Fri, 23 Sep 2022 03:29:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663928959; cv=none; d=google.com; s=arc-20160816; b=tfxCBG4FoejA7bSazfDM5AZYyLsXzULQF/i3GC4AhDnefHU+9G5c5S9XjOFsvmvP/i HCC77yaAffs9K2ankW9KZvHRkZJYijmQ/Vi3xtoo2yjJ4FiNx/Nox+z0REPE7C/MPFGN uG9Lpm+Klbcd4YXk+1/lgENZYoGDPe763HVTpf5K6i+oN+wuRc4L6r46d+QGODryZ4fo e9lycMOxl4cU9cDX8dmrJoCFdemdd+fkwpYNUtxIVMJ4D+q0okL7JtGLWIhKiSs7kxWr +kxpiaamejDEM7u/pgCy3SU0eWR/wOjLJ42esfTXd+YMULwNFiC7x958Oo8FUGVW5+Cs H6Sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:ironport-sdr; bh=bj88Nv4nQQ2oiAaKFVKY3VofCZh/zfY87e9El7Q8w28=; b=q1ysvoYb0/8g3wJfo62tLZRpoidFWlcfkXdQjruFUVqf+OtofuW6b8bXQf2fS1ap4t c9N1k1YHp/rrOscAw/WSFqZ09+L41ENUN/iKOqYhIpb+5yM9/HCNVnuTvSW09HnzfVOS 7cxP/PLdOPKzWaQk4ejOr7QjV/MBp3CQfIXFHHiuFXFQitKsb2JQj5pRZexS4eJoSMDm p9BTYLYpNXSxoMT4knk4uJLs/g+pID9s49bdR1svTwOhZBBmJ+4j7jA3r9ZPhHP4zGej POxlk8VYH0M79GO4SF4wzetx1r1wBzl8+NnvrLctVc1XzE9aIWHU2gY+E20mNJhhUDG5 FnqA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of srinuvasan_a@mentor.com designates 68.232.137.180 as permitted sender) smtp.mailfrom=Srinuvasan_A@mentor.com Return-Path: Received: from esa3.mentor.iphmx.com (esa3.mentor.iphmx.com. [68.232.137.180]) by gmr-mx.google.com with ESMTPS id o21-20020a50fd95000000b00454412dc7c5si278685edt.1.2022.09.23.03.29.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Sep 2022 03:29:19 -0700 (PDT) Received-SPF: pass (google.com: domain of srinuvasan_a@mentor.com designates 68.232.137.180 as permitted sender) client-ip=68.232.137.180; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of srinuvasan_a@mentor.com designates 68.232.137.180 as permitted sender) smtp.mailfrom=Srinuvasan_A@mentor.com X-IronPort-AV: E=Sophos;i="5.93,337,1654588800"; d="scan'208";a="83376385" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa3.mentor.iphmx.com with ESMTP; 23 Sep 2022 02:29:17 -0800 IronPort-SDR: zV9PY+HDys9Pkxh2cyCXd0UGmPwDDvilcrsw7QRVsEGRVI3VkoH5WdOm78se8df30hLC1ToTkl frVTAT7gTGL21eSDITWhAWmVXpM7LH3gSpFQmXHumFLOFFUZHKDMgZxpAM1CQlYQ0LLx4hmJLE sta9EO/ssbOo96SEzEik5R5+LHlyP4Jtww2Xv3z7gEviY4arLLfzxJumnXMK5cb9kUqmLDh29O aatAEIuDa7lBCt2968dFFnMJq7SsafOdsaMXIUtHFPw7OHD8NsmgnD38+OEhBPR1sof7f+hpbj ub0= From: Srinuvasan A To: , CC: , Srinuvasan A Subject: [PATCH] bitbake.conf: Add BASE_DISTRO_CODENAME in OVERRIDES variable Date: Fri, 23 Sep 2022 15:58:55 +0530 Message-ID: <20220923102855.1357346-1-Srinuvasan_A@mentor.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220922061928.1977-1-Srinuvasan_A@mentor.com> References: <20220922061928.1977-1-Srinuvasan_A@mentor.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Return-Path: Srinuvasan_A@mentor.com X-ClientProxiedBy: svr-orw-mbx-14.mgc.mentorg.com (147.34.90.214) To svr-orw-mbx-13.mgc.mentorg.com (147.34.90.213) X-TUID: kLoTfFG2iZAA 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}:forcevariable" +OVERRIDES = "${DISTRO_ARCH}:${COMPAT_OVERRIDE}:${MACHINE}:${DISTRO}:${BASE_DISTRO_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