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; Sat, 26 Oct 2024 03:55:05 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-qt1-f187.google.com (mail-qt1-f187.google.com [209.85.160.187]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 49Q1ss5w026533 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sat, 26 Oct 2024 03:54:55 +0200 Received: by mail-qt1-f187.google.com with SMTP id d75a77b69052e-460dd04feecsf45241301cf.0 for ; Fri, 25 Oct 2024 18:54:55 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1729907689; cv=pass; d=google.com; s=arc-20240605; b=AC+zp5lv2gJOdZSnTcCKzdogPwxsfBjkATTuWQ4DlT7Wu692v08pMkO3Jw0pnvhoRE dbKrXawlQYudrX9mnP/gzRRFTics0QZeomzJdvJpil20z0VfN9zxejPj/x825lw6Vm/L AteZwuSR2nKmvlgc0SWBpZO0IAhRAc9yNi/GSITIyO3IvR3Kid4BG90QmW0/xuTNP8EZ 4R3S7cnVpZKbL8HVt8rBuAG5AClmOxf3QYf8S2J/ebI8DNvo5ZMoGdUi6rK8UV/3Xwjb nNojcbifby1HXxP3S7w3BU8o3x7xl+ktstD0yTLBz747Ezpcg3bOTbk991aHSQqErzBA 3wGA== 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=2LAOaDPdEokJplAp0mhZ27GSqt8UyWtrV9Vl58y3VvQ=; fh=Vg5vvCQ02jXEbcYGuJHC/I4X8eWsu3zl52KslEQH61g=; b=OrX+BfnKYYWqfjffVhNu6Yn4GCa4NXlQaED+cd3IxOCBly6dwrKPNHoo42Sy6JGFUQ JJtjZron4JpqyVk5L/hmP777ZPf0SElptSrSBkS09Lg8VE4omHdoQyQRIRC5PoN2oE17 tGemQevBw22xmHAXmPBxxO+oh2UGDVed/sZN/Advug60LIEX9X4us2Odx/eJ0oBtk9ZI QAx67h54qJeuTL45prwAd3eNLDEZ6AeYJ0QzOQoaXx0HGHbd73tXle3euJltBVG3F1p/ gDOVqhWl9oaJrhE+byizZHy+PjA/dqLModqjC5zk+MmFQeTrIl2eUUbIUBpdNmnAYGk3 9h0w==; darn=ilbers.de ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=arSmk1k6; spf=pass (google.com: domain of fm-1324425-202410260154479c4002b1ca89721737-jhhtna@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1324425-202410260154479c4002b1ca89721737-jhHtna@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=1729907689; x=1730512489; 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=2LAOaDPdEokJplAp0mhZ27GSqt8UyWtrV9Vl58y3VvQ=; b=iGX5DhiXmeNG4NDlrT4IBNV36/B6lRe6JmSIipnEF0epMnhh3QM/WV4wLAz8P9Ed8z rKxhe51L63GJ7HId81KpDk+KV0Up+AbUBEtMyFYleX8sc1B1IECAYpBpxmmEq4O0YJEH OqKdpk3htTNMqwr5lMucBlLFmZ9hOs/fuvVmd2VPrUDIZR/Ho9wjqb12TwqT03lmghiu GrOvmbHxjgAtUV8S9JUrgcoOn1WqC84J14hJ/l2EhYDlh+LlOFPyBh1R2zQywHYSEgXi wFCVWoneq0YbCyEgjx0/pXnDSR3pG8UAEm5D+lxCSmlpxsIV20cteKgquC9Zz02Ps95L LzGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729907689; x=1730512489; 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=2LAOaDPdEokJplAp0mhZ27GSqt8UyWtrV9Vl58y3VvQ=; b=NsRrSpq0qK5fkItzVsD2PZVkV2ebdLU/brCRUlAuk+vMUz45qDj9lxamPvc1hfBKoQ Mvk3OcvyC5x1NhEYzSGMhLdwDmRCYlQGJxVlBekf9fRV/sAq9IzI7AKkq/suePL0J+3/ k+y3kXODw1fESsSglLlaxwwugH56eX5HbJY5G2D1OSE69lC71TBRXCChk/PPB9ggpYxU uFfcdF3vnw9CK7MCA5gWAoyCCUAh9ce2ooDp2eEQUXbiwEWR7WDSCRotjLyjbX4sVs4e XAMFMhrFW2y0Fd++9q8sdg2HZdjY+IkW9ONW1vtuh6yHAbUt5NWV4KGLGNjyB0DLtQ0D N2yA== X-Forwarded-Encrypted: i=2; AJvYcCW9SrgOGMIbZt+Bjo3hu7S/Xkt8kXK1/OhBi5snSZmqi4IpQsltm+2eHFydHovn50Kg+6yl@ilbers.de X-Gm-Message-State: AOJu0YwLS5E+4c3bA8CPtwhLZ2lcHM5RVHMUGMH1QnFsh2iUwCu3Dd/d dstG2c8AyoacRU3u4+HpfFMn2eQr0zidxuiIDmMM6gs2g4Smv0Li X-Google-Smtp-Source: AGHT+IFjM1ws2IOUdyGopelZVoZ0WtfC9GuReKraLKd2FPthAC8RCWGeaPjU5OQypx2VdgtrEMJWiQ== X-Received: by 2002:a05:622a:341:b0:458:23e5:1342 with SMTP id d75a77b69052e-4613c1a028emr19169661cf.56.1729907689071; Fri, 25 Oct 2024 18:54:49 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac8:5841:0:b0:45d:920e:ce87 with SMTP id d75a77b69052e-46122b34987ls37715631cf.0.-pod-prod-02-us; Fri, 25 Oct 2024 18:54:48 -0700 (PDT) X-Received: by 2002:a05:620a:3184:b0:7b1:41c8:332a with SMTP id af79cd13be357-7b193f35b68mr212923385a.50.1729907688224; Fri, 25 Oct 2024 18:54:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729907688; cv=none; d=google.com; s=arc-20240605; b=ICBrqMZgPa4JO9xoeGH0fnMkFwZnkrN6yVsj6/YAr8gtaW4OML6KUnY2Rxw9rO3wPV 1XrLVXApDJt3AAmQ7EmR4i4jQWoTiuVdRtJJzWoZXqX7NuTRdhyT+Rlian8OkeHjClm8 RiyOZ/ML1VhS4Ur63rjynGq6mO5eMtjCzqN5yU2AgL/eDoZPlfPknjGMvXLUi5OtOwif alQId1E0u+SgQ4tRv72c39Lyn0O0f4+S/vhgh5B3PQACUQi3eM3ndpiVWpEcwVu0NRaP /nFcqjqeIHkJmyqx8uTdhoktnZOj7CNgqsdWXo7IWmxGw+dglg8dsFOoogeZ1suDyyjn MQ7Q== 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=wQtq+y3PWsB1r+GkrRtU+mv0uh27XMPNPlSRmFOXVPU=; fh=qEmUv7UYYyWiUby6ri6URwndIAhlHli3YTKYU6E217s=; b=gLfzjuIRIQ2kRCXMDxgZCjFGZujl5t0AKn19p0hn4MQlW2p+VUQY9u0wc5EuRzHS18 0CRL7kqrZ2pRqek7JQcuZcCJYZko/gkA1f+bBBcg8Wchdchu8rP+8LEXqmqwxQMLplBN 80q2jKhAjAv0pn49stVd4vTNP/PLVNHuqbiKuqky9boFKlj0ADk4bJFW9Eyl4bEF4ZOe 7xWecL67zzNsW5AeRnIne0JuWW5fmNhxR52j68VRftwNrLexCI2jm5O0Q9zRzQMk+9rL vg/DT6Odn6WJcH4mwmr3WzkZrxKm5QZPNhK8L3Vwrim1jeUNtoa2Me0CXIEyw3OhgrlM trsA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=arSmk1k6; spf=pass (google.com: domain of fm-1324425-202410260154479c4002b1ca89721737-jhhtna@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1324425-202410260154479c4002b1ca89721737-jhHtna@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net. [185.136.64.225]) by gmr-mx.google.com with ESMTPS id af79cd13be357-7b18d282dadsi10329085a.2.2024.10.25.18.54.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Oct 2024 18:54:48 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1324425-202410260154479c4002b1ca89721737-jhhtna@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) client-ip=185.136.64.225; Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 202410260154479c4002b1ca89721737 for ; Sat, 26 Oct 2024 03:54:48 +0200 From: "srinuvasan.a via isar-users" To: isar-users@googlegroups.com Cc: cedric.hombourger@siemens.com, jan.kiszka@siemens.com, ubely@ilbers.de, srinuvasan Subject: [PATCH v4 2/2] linux-custom: Add a provision to support CONFIG_LOCALVERSION_AUTO Date: Sat, 26 Oct 2024 07:25:50 +0530 Message-Id: <20241026015550.1419162-2-srinuvasan.a@siemens.com> In-Reply-To: <20241026015550.1419162-1-srinuvasan.a@siemens.com> References: <19e24d8e7b06465b0553cb95f2985b91466b220d.camel@ilbers.de> <20241026015550.1419162-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=arSmk1k6; spf=pass (google.com: domain of fm-1324425-202410260154479c4002b1ca89721737-jhhtna@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1324425-202410260154479c4002b1ca89721737-jhHtna@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_H3,RCVD_IN_MSPIKE_WL, RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,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-TUID: aWaK8IutMnuT From: srinuvasan This change might be useful for downstream layers to set CONFIG_LOCALVERSION_AUTO in their base defconfig to append the version automatically to the 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 using the sources (dsc) file to build the package, when we generate the dsc file it creates the tar ball without .git, hence during the 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 | 10 ++++++++++ 3 files changed, 11 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..bf6c879b 100644 --- a/meta/recipes-kernel/linux/linux-custom.inc +++ b/meta/recipes-kernel/linux/linux-custom.inc @@ -296,6 +296,16 @@ EOF done } +get_localversion_auto() { + if grep -q "^CONFIG_LOCALVERSION_AUTO=y" ${S}/${KERNEL_BUILD_DIR}/.config; then + cd ${S} + if 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 visit https://groups.google.com/d/msgid/isar-users/20241026015550.1419162-2-srinuvasan.a%40siemens.com.