From patchwork Fri Sep 23 10:28:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinuvasan Arjunan X-Patchwork-Id: 2139 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 23 Sep 2022 12:29:26 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-ej1-f58.google.com (mail-ej1-f58.google.com [209.85.218.58]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 28NATPiV002670 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 23 Sep 2022 12:29:25 +0200 Received: by mail-ej1-f58.google.com with SMTP id dm10-20020a170907948a00b00781fa5e140fsf4047419ejc.21; Fri, 23 Sep 2022 03:29:25 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1663928960; cv=pass; d=google.com; s=arc-20160816; b=WoKZ1F3v9S9sMDvHQIMLS/f9jy/0aqUhKrpmVHz+Q0Ej71BWrPU7P3yT57ElIMh+IB vHS+TTnjkfp0Bomy52m5es2fjVLL3vihocYdy2AECaRj8Ni5+P85n4nkFqpMIbKOV3dg SVV6fgjKkEMMYjOov2hoEOv3RSQVpEqbVUcIrEAX7FQUURA54xj45VKpPsrfDp118nqr Jq2Fobj3AWkLMMAiMcG6OiME2UtMotGFztOw7I+EVODKvN6J5qXYPgKP+VU9DaWBxOIC WvOP/AXdbdG7VxzMS84G4kIEMSFBXlvj7kiGkzX/Gs+DtCPJs1n03AI5wu2vMIJ4alav F1dw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:ironport-sdr:sender :dkim-signature; bh=MyhLEuoMTiqI1xjq7LrWIyUqhbw1RevudXzukIlOMLk=; b=kZsjJYIIhKyQysjX10gTq2Ctd2mE/8uqaOSHM8KKiOILFfh3TayK29uFAEkIt2kUC7 XSoVjwfXMZchU1AMZ/bob0I4MIVuD8tbGSGjbKI/J4FGYUc2BVTqhv0UT18JiM7Bm90I v/J+aPE2Rm5yTNEIQueAVQi5+SsTzJlVgFeFv0ODuYw4BusKhiIPv1ZRePjwiA34mIcL UH5HOAJfmb9YvFlBi0tZVS5t8TuiBX8jB6O8f7ERSUpmkKlnXaqX5EANzHjB6ot5Kzy3 MIyHEZLGPZcGqiGHcVz9GRdFfUA/rane2xtalwV+donEf2fuPyJlOyEh6PiUxN25hFJq Z06w== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:ironport-sdr:sender:from:to:cc:subject:date; bh=MyhLEuoMTiqI1xjq7LrWIyUqhbw1RevudXzukIlOMLk=; b=nXubpVchL62kLcTtbixfcgl9TfYguCV92XDb//oSJDquJSD9ZxKH092hgYhP8dHn+R Ck2gT8KkvPaltorJmQ5CZRUAejK8DGDf1MqmpgVlMzKwIQAXqO2yEyL79qI9/qwfhuo8 r9jJOeIuQcrAfk/dHAPqyPsUOLcZ3B+z1LUctveXXH3qhzzV0OqwGzZ5ti1Jt4ZDjj4j zQd4p33f7Ntv78jUykgrUqE+YCtHXIGEl9+tXGvBNsuw7kJ5JFMM7lUdo9G/3xdGLgPJ rJYuD+8gzKg9q8JNxfRYvq7slfHlpM81+Qu1Gql/9chLEg/fVCFCqLPAWRH44aVKbbs6 Bo3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:x-gm-message-state:sender:from:to:cc:subject:date; bh=MyhLEuoMTiqI1xjq7LrWIyUqhbw1RevudXzukIlOMLk=; b=QHUsIbEPLiZB6l0SYpPykK9HhTox+OPGFY/zd5Evpmbo+96PJGObuYMbmqhanRYuJv IjNfVHuhBz8CT2IYjiR4I0wJBJ1EmGKX/iMKQjrmsXNDcHavqopzTIAZGRQfzRI8r8vE YnEkn0DFLf2kEaTTfZhL8IKyu/jqm6XFfw0PH145n5lN3u3f6K8i3x4kLuPzCo1tA/uY ueS5ykav2X/WT/qOFWz2l0uP/1ieUpk5k/U2UFTWGPuGofGJ1BOaXY2FNI1cd6ZlPZkl YULcst0Iwo8wK+Kzv3M0kvd7zPQ4ADbwvDOGuRAMRNB9jEG6GQ0ez7pOUCQllBRqNfj4 8k7A== Sender: isar-users@googlegroups.com X-Gm-Message-State: ACrzQf3CAd9DxH9qgHsxe1JY+wyWQUsZ/um37p+2kRBGL0te4JNNJgsr qSGNPzdE4RjryU5WheVBF5w= X-Google-Smtp-Source: AMsMyM5TdF4mKtQDxPTl1sX4GgtOtEQfLimLYu8N/y8XpRLwir82b7KxH5AWE5CqKJ0PcfOEWQvY5w== X-Received: by 2002:a17:907:8a13:b0:782:5146:dffa with SMTP id sc19-20020a1709078a1300b007825146dffamr6115857ejc.538.1663928960141; 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-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 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; 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 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-Original-Sender: Srinuvasan_A@mentor.com X-Original-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 Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_PASS 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= 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},"