From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 23 Oct 2024 14:52:34 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-il1-f192.google.com (mail-il1-f192.google.com [209.85.166.192]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 49NCqHFd012365 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 23 Oct 2024 14:52:30 +0200 Received: by mail-il1-f192.google.com with SMTP id e9e14a558f8ab-3a3bb31e3cfsf57352615ab.0 for ; Wed, 23 Oct 2024 05:52:17 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1729687931; cv=pass; d=google.com; s=arc-20240605; b=CIkUJvHKPo11bCPY28E70jASjZl4ipgxqpRNMsP8NH74K1qVOXvcLU1uKjfpYY3zGU 8fByGnL3tcIauVLC84sHSFkhda52ylPooRB0aNLhSTxj+gOo6DCzClbaR6xaINMXmfwI UsF7pOXsq2v1eAZNbTe97pQPjcP+E6O7WXWxCxFDryFwKX9AX490a8gBKiI2Q7WJVP6+ siOg3s/wukUjLrP37kvgZfSxOiqORY3Il+nWOY+LcNAtb9Twcynu0xAe8oppk2ciakO6 Q4fanCH8u7MJRPqBY+RxH7UPGCHzdkdPEG2gKimxrcgWQDIEhwIB4y5kyQrPxlGKf5ld MVzA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=/RpLcUhBBevKbytYCWGtrTKK2QJ7H0yRjZbgAHKPtH0=; fh=rQfnWcsBshBExpO+4PXf2II4sMwmFTCq7qZS2A3t8OU=; b=PH/NkzquDVDSSp09D0L3tfimlg0CFHlsKqTll2a3opDl2s8lK+pAdXotu1Cfe/FOXH naTajk5ZHQ475baJixxxkhB8chMYGaEMdYOFVLkBaBtMm+J0fA8cUY5erct/Tlwb4YMd G2UEbSiInLWclxHn7DX6hQOx83LQhBSTzQBdBCpKMTgjO/C6GuJhVNPl+/wLtLw9LcPu k0Y4MT+oht083nDpe9CnOiPoFfi8BkDx9EnszAkIOn13vfoIXmVPrlXN6Sd44HHOFuI5 i9BJorOYieucZ5EaEyXYfhKBcKG8E1BMv+UJOrshFk6VDmBnqlnwc5wicH/nnUFZMqQZ MOSA==; darn=ilbers.de ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=QL+hXV+k; spf=pass (google.com: domain of fm-1324425-20241023125208b3d902c3b9fd8d598a-en2mbc@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1324425-20241023125208b3d902c3b9fd8d598a-en2MBc@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1729687931; x=1730292731; darn=ilbers.de; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=/RpLcUhBBevKbytYCWGtrTKK2QJ7H0yRjZbgAHKPtH0=; b=nM8uEe9zS66lI15oApPhZwViklo7N7CGn3XFdTXyPt+JYfjPLfGwTw6Uy6WPWTN7ZP dEHa4pbzxhB/V6q5ZJvr3dv4bdphoQ/OqtjX64ZJVztqMiPjwpKRorSh6dRMJB8V5Pe2 kI4lyqAOnDRV6ICSBGju2yUiNN7DjSmvQlV4FIBljYKEf7xEYoTDnXY43jY9fFR5mxUa 1qB04ZmOId37fJEjGdnT06CvWyEvPXX/CvkSsaAL5sLbYpg7dJPrJVmctpXjBtM1XJ4l NSRp8oQsISGV18auH4zcS/LnyKRtTfHD8GK8q62AYQswRQ2DeOFi7Y7TNq6K3brvpEC/ 4LZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729687931; x=1730292731; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=/RpLcUhBBevKbytYCWGtrTKK2QJ7H0yRjZbgAHKPtH0=; b=KDHlun/rzNefo8+UW80U5IY4oTHJS+SJyN23EmyT3lX+zdDrmeuvcJGc42kUVHMdxc SDKvJRTbZUXoBYGm609kLHDd7/iTTLcKgACW5xOl4fkfMYYwFWb5MIXJce6jI0p/808p x+m1aZr36gdRJLswJnxxenMc5UiOoqPB2msk8DrVMlFooJfqJfqgX7qAlFvL6OtmZQ+l gMOFWhk8xdyWYLTG0rg5VAx1J/ajLw3aZ/3IPbIBgvdKo5JyardvHeMIYkl50+KB53rW q+/RLg8dPTkVzev9wPsICP/iljDZqwBV018qESyqiO1TEdxeIYv2O6Ye1AMU8QiuyjTC SXpg== X-Forwarded-Encrypted: i=2; AJvYcCUMzhD71qfkOTGWDMH0wwkeOiz0gnqpqqLE/mhCr7jTvA9AbMvw7GNyTIzXyD/5J/a84ZBv@ilbers.de X-Gm-Message-State: AOJu0YzDuz7YZViYU06ULqPLgryJR2BrmokoQ489RVWXLjnj38q71npZ WAPEKenYGG/zmXHoOOfcW6EJqIoskRoxE/1XEMhKdJuuFXpZ+hxn X-Google-Smtp-Source: AGHT+IHdCosWJEY6mWERthcGR/XbTAgu0xi0sdTUrt9OP2ouGZjoLG3oDquln9ms5kN9iFelRXfs2Q== X-Received: by 2002:a05:6e02:190d:b0:3a0:a385:911d with SMTP id e9e14a558f8ab-3a4d5826967mr27388675ab.0.1729687931330; Wed, 23 Oct 2024 05:52:11 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6e02:b4e:b0:3a3:6ada:9a4d with SMTP id e9e14a558f8ab-3a3e4b0bf39ls31536305ab.2.-pod-prod-09-us; Wed, 23 Oct 2024 05:52:10 -0700 (PDT) X-Received: by 2002:a05:6602:15d1:b0:83a:c4e1:7d69 with SMTP id ca18e2360f4ac-83af614d24bmr281745439f.1.1729687930494; Wed, 23 Oct 2024 05:52:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729687930; cv=none; d=google.com; s=arc-20240605; b=N8lYOjTFOpRU9B5Qe7DNbe4thz/XCaeddz4vtjuM7zZvWehV3GDBWne0cI6HgaW4ge 72O5ITsp81IHgT5MR5sm0gN35zvqBHnZglu52Goo3q4U7JWbDDUPy35mnGVaSCvolc/J IgoX5G2rfxXGISqDeVmzQYXNc7Mlo0v0iWWY6keCNWtd9mAWWOVKJDCoXaEIUZ9Za1RI lbeQZVIyGRm4bXFVLwJ4pi8voVwAxI2h54AG1fYo5lWWwlvGH6zQwqXFlaYMXZxpqaK0 LzBKuNUQodwewJAoIHwnbrqhlPgdhvsToE78Hj3UBfcOzWZaKZTMEKqBCioAqJNOzG5k g8Ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=dAXdeYUkG2BFJ6P25f4TsZxnA03hKxf/bOfLWF/Tn6E=; fh=7w8uPGiMToa9ZVDAMG2h4OTikUm4uxVmIZ1hUqaFJ54=; b=A+1lKifbcquGyCXH3EZXiHQONdu8h2oyP6w0qU2cd/gSvcISuexg4QEa/X9ZRMlbsp wjL4o2heyZV8aCPdIQ+U+7RKNFUwysIkmKm3jjo++A7psD58ST6KNxd7C6nfu7eAPKHE j3X0IoS0W5UO6di32Hwm66AMLT1CXmLhfF4A5SoeCXuZKYPt4+2yeob39RyfOqzry296 nzCZd3Z2wIbPY/zY8vO12VxafMjrkeUpwwPSuEAFAh4Vxzuz02SWmzRMX6OoQ//6Nwic 5JNnUS4AIDV4XFeZIPsEIbiHgm8EvZWXDfSqC886zU2ztkKqubPD1v/5OknAbA5AukVx cETw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=QL+hXV+k; spf=pass (google.com: domain of fm-1324425-20241023125208b3d902c3b9fd8d598a-en2mbc@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1324425-20241023125208b3d902c3b9fd8d598a-en2MBc@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net. [185.136.64.226]) by gmr-mx.google.com with ESMTPS id 8926c6da1cb9f-4dc2a594a33si317044173.4.2024.10.23.05.52.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Oct 2024 05:52:10 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1324425-20241023125208b3d902c3b9fd8d598a-en2mbc@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) client-ip=185.136.64.226; Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 20241023125208b3d902c3b9fd8d598a for ; Wed, 23 Oct 2024 14:52:08 +0200 From: "srinuvasan.a via isar-users" To: isar-users@googlegroups.com Cc: cedric.hombourger@siemens.com, jan.kiszka@siemens.com, srinuvasan Subject: [PATCH v2 2/2] linux-custom: Add a provision to support CONFIG_LOCALVERSION_AUTO Date: Wed, 23 Oct 2024 18:23:07 +0530 Message-Id: <20241023125307.1402533-2-srinuvasan.a@siemens.com> In-Reply-To: <20241023125307.1402533-1-srinuvasan.a@siemens.com> References: <3a6be839-a3a9-4b0f-970a-29ea3509b8a7@siemens.com> <20241023125307.1402533-1-srinuvasan.a@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1324425:519-21489:flowmailer X-Original-Sender: srinuvasan.a@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=QL+hXV+k; spf=pass (google.com: domain of fm-1324425-20241023125208b3d902c3b9fd8d598a-en2mbc@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1324425-20241023125208b3d902c3b9fd8d598a-en2MBc@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: srinuvasan.a@siemens.com Reply-To: srinuvasan.a@siemens.com Content-Type: text/plain; charset="UTF-8" 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=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,T_SPF_TEMPERROR 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: hmfM9wAEjJR/ From: srinuvasan This change might be useful for downstream layers to set the CONFIG_LOCALVERSION_AUTO in their base defconfig to append the version automatically to kernel release. Presently ISAR doesn't have this support, hence add this provision. Here we try to find the CONFIG_LOCALVERSION_AUTO availability and .git present during build the kernel package, unfortunately we are not getting the .git directory in the dpkg_build stage even if we are fetching the git repo, this is due to sbuild always uses the sources (dsc) file to build the package, when we generate the dsc file it create the tar ball without .git, hence during dpkg_build stage it is not possible to get the latest commit HEAD value using "git rev-parse --verify HEAD" To solve this issue we have base .config and .git available in the do_dpkg_source stage, here we try to find the latest commit and write them into .scmversion file, later during the kernel build package stage we are calling the kernelrelease target to set the localversion, this setlocalversion script handle the availability of .scmversion file and append the string accordingly to the kernelrelease. Added qemuamd64-cip BSP to demonstrate this feature. Signed-off-by: srinuvasan --- meta-isar/recipes-kernel/linux/files/x86_64_defconfig | 2 +- .../linux/files/debian/isar/version.cfg.tmpl | 1 - meta/recipes-kernel/linux/linux-custom.inc | 11 +++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/meta-isar/recipes-kernel/linux/files/x86_64_defconfig b/meta-isar/recipes-kernel/linux/files/x86_64_defconfig index f3bafe00..c27a5a61 100644 --- a/meta-isar/recipes-kernel/linux/files/x86_64_defconfig +++ b/meta-isar/recipes-kernel/linux/files/x86_64_defconfig @@ -1,6 +1,6 @@ # Copy of linux/arch/x86/configs/x86_64_defconfig for demonstration purposes -# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_LOCALVERSION_AUTO=y CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y CONFIG_BSD_PROCESS_ACCT=y diff --git a/meta/recipes-kernel/linux/files/debian/isar/version.cfg.tmpl b/meta/recipes-kernel/linux/files/debian/isar/version.cfg.tmpl index 17effe52..1ab699f5 100644 --- a/meta/recipes-kernel/linux/files/debian/isar/version.cfg.tmpl +++ b/meta/recipes-kernel/linux/files/debian/isar/version.cfg.tmpl @@ -1,2 +1 @@ CONFIG_LOCALVERSION="${LINUX_VERSION_EXTENSION}" -# CONFIG_LOCALVERSION_AUTO is not set diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc index 0f23d6f0..04c3fdb6 100644 --- a/meta/recipes-kernel/linux/linux-custom.inc +++ b/meta/recipes-kernel/linux/linux-custom.inc @@ -296,6 +296,17 @@ EOF done } +get_localversion_auto() { + if grep -q "^CONFIG_LOCALVERSION_AUTO=y" ${S}/${KERNEL_BUILD_DIR}/.config; then + cd ${S} + if (git rev-parse --git-dir >/dev/null 2>&1) && + head=$(git rev-parse --verify --short HEAD 2>/dev/null); then + echo "-g${head}" >${S}/.scmversion + fi + fi +} + do_dpkg_source:prepend() { dpkg_configure_kernel + get_localversion_auto } -- 2.39.5 -- You received this message because you are subscribed to the Google Groups "isar-users" group. To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/isar-users/20241023125307.1402533-2-srinuvasan.a%40siemens.com.