From patchwork Fri Jan 17 18:02:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arulpandiyan Vadivel X-Patchwork-Id: 4013 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 17 Jan 2025 19:00:42 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f59.google.com (mail-wm1-f59.google.com [209.85.128.59]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 50HI0f3u007721 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 17 Jan 2025 19:00:41 +0100 Received: by mail-wm1-f59.google.com with SMTP id 5b1f17b1804b1-4362153dcd6sf12040595e9.2 for ; Fri, 17 Jan 2025 10:00:41 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1737136836; cv=pass; d=google.com; s=arc-20240605; b=kfPp2bpDPHQeVyJZrd0Sa6h7jmj4+2Rum9A2iEIpJLYJuUDFJj+Vn8o+5VE2vWHsi4 LANdSYHVgvsj4STJgyoRVwPRPwCpn4rA6IXZqRqtNiMWtZh4Uu1/WaxxLtME5QHgJFzY /VgEWQ2X2RxuB7+SSwgXvxlwnH89gy7aurPVkXc/I1oXxPVL4QUr7IYRnfsUn2Jn+bSt GsX+ChedCQZ0PouzuVEdrq/FqSf106GI2UDXtf9umvfVw2i8n9adm70o7FNsMksEVqe8 mVOivqeC8a1PLSfHCAkjqwcK6Ule2yaIOeUNwUv8E0ZwTTxfIArOajxQQTv1O2av0wkl nj1w== 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=B89CJzeP/GCibVqToT84K3CscJ/P/CzRXZrYZedNRdo=; fh=9jYCmsnupc/9NBXWYFBqp/AFZzNSI5VQUdLCuLV/nbY=; b=jEIeN7lwyoJeoxv75c1XUaFk9DZUFrFEgFo6yFWUdNVdFNJFg+y6a/TdhzOj/XWIXM XVWUAExOgPT76qqgD+ZasWpLnTx/RRkhxNY7vvv4RsN4A+KMUn3NXB6gMEp0g5Lovh61 dRZkhAqqJY2J4E266BKfzxjmMEVDzJhvnHc9NUeAYe0MOrKcQFqwSEiNhQQcgBaLc+KE ru4oYd3XYa5Um9arnfzY7IWIOSz6M5W7rWAggrYySb2mhb0PLMFGX20x6NoSuxAa8Im5 IDdoOzavhAbXkAgeQVibxbU1OjDrDcu9CcL2sx+PDyO/7O3bmZnqsWjPU5QvM1KYV9LN S54A==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=YZAYERbV; spf=pass (google.com: domain of fm-1328317-20250117180032ed36efe4c698c1a1d9-1z2vys@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-1328317-20250117180032ed36efe4c698c1a1d9-1Z2VyS@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=1737136836; x=1737741636; darn=isar-build.org; 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=B89CJzeP/GCibVqToT84K3CscJ/P/CzRXZrYZedNRdo=; b=LDRsEvdw3Oz4Wp6IFlFsMUkaOPHKAiE2sFolUZ1rd8olu3oX9MTEosszOpF0V5Xhy7 ugVw2Tmykb8DbEsCUzYAM+Jn79lzZNapPDQUyKTQONnrhPoqwTgVfVnslsTYuuCbWIxa D7py4D4Jm2xD4FyWh0nM0uhXRz1s6jmwO/wiv7rydNg2TpTrdjvAne3TQP/UnkJKHA4S qxYOvVPAerlLvpBndhOUzS474/Fw11c/vCAQ8SGQNpTkTzmcj0WeTQeWNl/6n/6Mqa4X yTs2pLIWUK97VyyvEQ1vfDbGpFAV5RcXxuXzmNB0Z4z91DnDE+1+lUYloWy5zqM2sE4d 7G6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737136836; x=1737741636; 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=B89CJzeP/GCibVqToT84K3CscJ/P/CzRXZrYZedNRdo=; b=P/jzkq3PaZPoTfMST7GAcngHJQDhnPhatP082nRYz4suYGI1cV/EMDNfAwLz/wnjI8 XNVThrVksqM3WHQlFpnItRPsRnCRVW4PIyWnU+HwTOxmRIcmDxwhuyw2p2pKhe/fAolR tB7qNGsaP035vXzAScwf9DQVO8mRN4bYJC+JPcE55wTy8iwrVb4rhZ68r1oUg5JuqMLu fVrOHRcYB3Qhx7U0NpZglvUy8aC+dbhlPPWPvQCWyC2UWiNKg/p61jReICUcswb8TeuC YhZ1JW+MKQR6CxVAVHvPyBLPW6qWTSr0oiDZFbPqDqRKSmcUV8rKTiruQ3xnHv5fjROU 5FAA== X-Forwarded-Encrypted: i=2; AJvYcCWnl1p9yE29w30RqN/GzsvG7rMelaos8pTZOSuGC8YmCXZwSGKSWRL3PfV3Ynk+I+ADDahLjUM=@isar-build.org X-Gm-Message-State: AOJu0YzxSO2PWuOlCH75gj9q5DH4qEuUkzScrFwkipBTuc0YEgpzmE3s e/mKkzfhPaFWdn8epFGmL8rClK11e/uxC5IJPMoqhwrPSE6X64DG X-Google-Smtp-Source: AGHT+IHVm4uuwBbBuYrGlNWABqAjCiwiZyRGMEtLw0+8a3SVLcTRgUu9TBoU44uXpHF18HMnzeRMGw== X-Received: by 2002:a05:600c:1ca7:b0:431:44fe:fd9f with SMTP id 5b1f17b1804b1-4389142776dmr37375495e9.23.1737136835174; Fri, 17 Jan 2025 10:00:35 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:22c9:b0:434:9332:de65 with SMTP id 5b1f17b1804b1-4388ab1ad6fls12576835e9.0.-pod-prod-06-eu; Fri, 17 Jan 2025 10:00:33 -0800 (PST) X-Received: by 2002:a05:600c:3b02:b0:431:54d9:da57 with SMTP id 5b1f17b1804b1-4389144d5a1mr38943035e9.30.1737136832847; Fri, 17 Jan 2025 10:00:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1737136832; cv=none; d=google.com; s=arc-20240605; b=PHyfHxt0fqZ/jbRRwSrNo3xRLAQBHdM4JK44UAMaPGNeajKfvfuQsq/agBqwwJT65e a78AFUoD9yhqnJJAmWfIEw7OuQMVNRqsh7cepFnTdTxpIp2144rltlnqBhwJTY8v6RYQ eMpoNyjZZt0A3oH4OxuSvA8ejWCjqdJDOldt3A6jS+5D3kPPy1ZlPtMsDETg+WLBKK+W 0BTvPEPPH31IxheaTNznMyR6zivVXnIV8cNAobTLiEu8cereq/aon1+U8fxlXhYlmXQq /S8i/YBDpA/0G/GxmWyPBjQO/CYJXwag0l3J/C0oYt65dKoLnHAMFPtooeIzEm1KGUHq HLqg== 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=FUbCW7rVDExfqSHAW7A+csqTx7u9HYGFh9fMpegUsPg=; fh=oA3z3ipAEfMEprG1GAkYQgX7HeFj14A13x5U3QirAJc=; b=UuaN2Q2QLpSjTF7Hy4aHRGn9b7/WCG69kPYIuzwLWJVFk2rxe4taG8QYW+wZqNx/s5 OPIVp6VDsmjhSgo1PLjwDuj4uRUyOnR3xlCpHQcliI6zUYsiBsQzOcHOX00VvAh+jfRV jLIrwF6/kGuY9Zay2H2Ij/GYE6mI2dDGtCfRrGudMbqFtJZHCd2y8gNkixmwRE8ESMDH 6d9xPHPKPF3A6EKb7RLaEo5z7CCDPVWpbJE8APQziOtosn7VNqJ6hwR6idOtEhARrPwf f5Pq94VSBzOsEGNzvWwzl3tz3feTl+4lz+m3cCYFz+qn3naKRMSWsgWR2oAfEm5qqJhQ qiLQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=YZAYERbV; spf=pass (google.com: domain of fm-1328317-20250117180032ed36efe4c698c1a1d9-1z2vys@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-1328317-20250117180032ed36efe4c698c1a1d9-1Z2VyS@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net. [185.136.65.227]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-43890407cf9si475605e9.1.2025.01.17.10.00.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Jan 2025 10:00:32 -0800 (PST) Received-SPF: pass (google.com: domain of fm-1328317-20250117180032ed36efe4c698c1a1d9-1z2vys@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) client-ip=185.136.65.227; Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 20250117180032ed36efe4c698c1a1d9 for ; Fri, 17 Jan 2025 19:00:32 +0100 X-Patchwork-Original-From: "'Arulpandiyan Vadivel' via isar-users" From: Arulpandiyan Vadivel To: isar-users@googlegroups.com Cc: cedric.hombourger@siemens.com, srikanth.krishnakar@siemens.com, Arulpandiyan Vadivel Subject: [PATCH V4] linux-custom: support to add linux-libc-dev package with kernel name Date: Fri, 17 Jan 2025 23:32:07 +0530 Message-Id: <20250117180207.90250-1-arulpandiyan.vadivel@siemens.com> In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1328317:519-21489:flowmailer X-Original-Sender: arulpandiyan.vadivel@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=YZAYERbV; spf=pass (google.com: domain of fm-1328317-20250117180032ed36efe4c698c1a1d9-1z2vys@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-1328317-20250117180032ed36efe4c698c1a1d9-1Z2VyS@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Arulpandiyan Vadivel Reply-To: Arulpandiyan Vadivel 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,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?= Debian and Ubuntu use unified kernel headers and a single linux-libc-dev package is shipped. In contrast, Isar may build multiple kernel variants with different versions and/or patches and their packages but linux-libc-dev are suffixed with -${KERNEL_NAME_PROVIDED}: this allows each variant to exist in isar-apt (reprepro may not have more than one version of a given package for a given suite). Apply the same suffix to linux-libc-dev / linux-libc-dev-${DISTRO_ARCH}-cross and a Provides: clause. Signed-off-by: Arulpandiyan Vadivel --- Changes since v3 - Updated commit message to include cross packages - Added an entry in RECIPE_API_CHANGELOG.md - updated doc/custom_kernel.md documentation Changes since v2 - Updated commit message as suggested - Added KERNEL_NAME_PROVIDED for cross packages of linux-libc-dev as well --- RECIPE-API-CHANGELOG.md | 12 ++++++++++++ doc/custom_kernel.md | 4 ++-- meta/recipes-kernel/linux/files/debian/control.tmpl | 10 +++++++--- .../linux/files/debian/isar/install.tmpl | 2 +- meta/recipes-kernel/linux/linux-custom.inc | 2 ++ 5 files changed, 24 insertions(+), 6 deletions(-) diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index f310553a..64c0f34a 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -702,3 +702,15 @@ enable cross-compilation. Otherwize ISAR_CROSS_COMPILE = "0" now should be set in local.conf to disable cross-compilation for all the recipes. Sample local.conf from meta-isar used by isar-init-build-env is also changed to enable cross-compilation by default. + +### Enable linux-libc-dev package with KERNEL_NAME + +By default linux-libc-dev and linux-libc-dev-${DISTRO_ARCH}-cross package +was generated for architecture it builds for. + +This change helps to generate the `linux-libc-dev-${KERNEL_NAME}` and +`linux-libc-dev-${DISTRO_ARCH}-cross-${KERNEL_NAME}`. +For example, If `KERNEL_NAME` is configured as `foo` for arm64, now +`linux-libc-dev-foo` and `linux-libc-dev-arm64-cross-foo` package will be +generated. This will help to have multiple versions of linux-libc-dev packages +available for respective bsps in apt feeds. diff --git a/doc/custom_kernel.md b/doc/custom_kernel.md index ce5f1bf7..2dca577c 100644 --- a/doc/custom_kernel.md +++ b/doc/custom_kernel.md @@ -51,9 +51,9 @@ The linux-custom recipe provides support for: Only the `host` specific package is built automatically at cross builds. - 10. Produce a `linux-libc-dev` package to support user-land builds + 10. Produce a `linux-libc-dev-${KERNEL_NAME}` package to support user-land builds - 11. Only build/ship the `linux-libc-dev` package if instructed to + 11. Only build/ship the `linux-libc-dev-${KERNEL_NAME}` package if instructed to (`KERNEL_LIBC_DEV_DEPLOY` equals to `"1"`) 12. Support both native and cross compiles (`ISAR_CROSS_COMPILE`) diff --git a/meta/recipes-kernel/linux/files/debian/control.tmpl b/meta/recipes-kernel/linux/files/debian/control.tmpl index ec0da1ab..a79b86c4 100644 --- a/meta/recipes-kernel/linux/files/debian/control.tmpl +++ b/meta/recipes-kernel/linux/files/debian/control.tmpl @@ -22,19 +22,23 @@ Description: ${KERNEL_NAME_PROVIDED} Linux kernel headers for @KR@ . This is useful for people who need to build external modules -Package: linux-libc-dev +Package: linux-libc-dev-${KERNEL_NAME_PROVIDED} Build-Profiles: Section: devel -Provides: linux-kernel-headers +Conflicts: linux-libc-dev +Provides: linux-libc-dev +Replaces: linux-libc-dev Architecture: ${KERNEL_LIBC_DEV_ARCH} Description: Linux support headers for userspace development This package provides userspaces headers from the Linux kernel. These headers are used by the installed headers for GNU glibc and other system libraries. -Package: linux-libc-dev-${DISTRO_ARCH}-cross +Package: linux-libc-dev-${DISTRO_ARCH}-cross-${KERNEL_NAME_PROVIDED} Build-Profiles: Section: devel +Conflicts: linux-kernel-headers-${DISTRO_ARCH}-cross Provides: linux-kernel-headers-${DISTRO_ARCH}-cross +Replaces: linux-kernel-headers-${DISTRO_ARCH}-cross Architecture: all Description: Linux Kernel Headers for development (for cross-compiling) This package provides headers from the Linux kernel. These headers diff --git a/meta/recipes-kernel/linux/files/debian/isar/install.tmpl b/meta/recipes-kernel/linux/files/debian/isar/install.tmpl index 6d742f02..290a7d56 100644 --- a/meta/recipes-kernel/linux/files/debian/isar/install.tmpl +++ b/meta/recipes-kernel/linux/files/debian/isar/install.tmpl @@ -248,7 +248,7 @@ install_headers() { if dpkg --compare-versions "${krel}" "lt" "5.4.24"; then headers_check fi - [ -z ${kern_pkgs["linux-libc-dev"]} ] || libc_headers + [ -z ${kern_pkgs["linux-libc-dev-${KERNEL_NAME_PROVIDED}"]} ] || libc_headers kernel_headers } diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc index 77700a5d..4f68f4cd 100644 --- a/meta/recipes-kernel/linux/linux-custom.inc +++ b/meta/recipes-kernel/linux/linux-custom.inc @@ -152,7 +152,9 @@ RECIPE_PROVIDES = " \ linux-image-${KERNEL_NAME_PROVIDED} \ linux-headers-${KERNEL_NAME_PROVIDED} \ linux-libc-dev \ + linux-libc-dev-${KERNEL_NAME_PROVIDED} \ linux-libc-dev-${DISTRO_ARCH}-cross \ + linux-libc-dev-${DISTRO_ARCH}-cross-${KERNEL_NAME_PROVIDED} \ linux-image-${KERNEL_NAME_PROVIDED}-dbg \ linux-kbuild-${KERNEL_NAME_PROVIDED} \ ${BPN}-pseudo-native \