From patchwork Tue Jan 21 09:47:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vadivel, Arulpandiyan" X-Patchwork-Id: 4016 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 21 Jan 2025 10:46:08 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f56.google.com (mail-wm1-f56.google.com [209.85.128.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 50L9k7K6025722 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 21 Jan 2025 10:46:07 +0100 Received: by mail-wm1-f56.google.com with SMTP id 5b1f17b1804b1-43625ceae52sf29215815e9.0 for ; Tue, 21 Jan 2025 01:46:07 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1737452761; cv=pass; d=google.com; s=arc-20240605; b=L49ZtOcKUd5Mx/0eCi8jTEORKdxMEqgndsKrVqZ2fSqHs8kCFTUpCBquwxts4IyN8W YZv71AAV4d7bpH4UUaBue6zk+dXhscSVFdRQY93E3t5hnm76FfJvNjR/SrBUAeZbr9nK KCVA+JGw1D91GQ0C7bcsc3M8RwoKOEvhn+1YHnvxsvjvxg68pzwyJjUxETjyjPw+zgya UjOraKg55UjPBYEOZ+teaDQs+pZP7pTxzpNV4S7h4fwB4T1HYGHN1+ALOKiIAnubf3HR /gydkynkK2n31sHjZP+vUFcXuyt9uA2my6eBCMt4kPXeSiKu0TGT1u92TzoStlvJfStL SavQ== 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=5+Sxmk/5nvo2N5IsbR/JnBYjpxkqS/L04aaFLyzXbCI=; fh=MpiRyUyksHgMXjpk2RjKbXzymk+a0SvrNud5SPnwQkw=; b=C60XoxnkRIvku66GUWc386FjMBWkC8PdaL6HdZcAo77lMyV97ZKR+IfasNiol2+HrL uERYp6Gv+sJfHLbyXidFtSUTvVccwOtW8hrGScJRO/DHFWIDa6VKb9WdSBOxjo3NFFR6 ugaEZcj79wFfZ0pL5Kp2bLF8Dviw8/Orz14vAkjK4kdURXOEJMtAEuwpqQrIW78LkOhM d4hF+wsUjQ5v51SjKnCFfFTDxfWw0szKsRt2R8SxoBC3PUgqaXRP1mYmgWjtStjPd3sG K4spR615CoCx6ngotRLauxxsHGdWtevZ1P2Y/gdmeMNl/lgX8qtOP5W1luw59KQ+HbPi tc9g==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=F9eQLquD; spf=pass (google.com: domain of fm-1328317-202501210945572353215951a6940678-vfvxby@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1328317-202501210945572353215951a6940678-vFvxbY@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=1737452761; x=1738057561; 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=5+Sxmk/5nvo2N5IsbR/JnBYjpxkqS/L04aaFLyzXbCI=; b=BE5q1Wsqe6YgarvWX4+O44vv+PazFKqT43oYMLQXmVag1zaIcOPZqWjlu+pbRItw3R 5/wxkHExz/u6k4t4XHuyh5arz9q8XGmzwPN8bP4wFXWZdrFjKO4QvAGKG2Xj9YPfaTPU mc92P51uF+fJYgmyVMRr7ZvsTMZQX1oNlSlOpV8QdKTcoktXe9Nn05crQSXzCgFSH0KD i3FjeZOiB66yPom6m4Rx+SXMNo5MD6g7rg4tl5o/b9pNKgkFZOdUJZp5ID/vokJQx4NS zCYneysgQ2Z1SnBX51MA0yzp4hzgfOz6rOuTNIBA8LGpfrp/G0teWqTNVUo0FXOwdGgU 9bLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737452761; x=1738057561; 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=5+Sxmk/5nvo2N5IsbR/JnBYjpxkqS/L04aaFLyzXbCI=; b=pkCOFebhnjMBVmMModtIXyohJLDRVo0o6ED08I2PJi3rsWm+sLbk/97vupy/vgN6qc SpRMP+nYExdU+GH0eqXLqGA0i2U1aktayGjp/Pbw824amR72lQGc9tO4+YrbKRAV4yMR OGtdZWBcu9Xpw7rppmri1JbYTZ1TMkEs0AmAFbOLxX/7Og9I8HN0iHCeclDGP1jG8xWD ZfWbYwbTVrJyNzhwC2DmJ7G7jMjHTxKOU9NrFKlkGnw4TcvMZzqFjxGAw9Gc56fyLkUT /xvFtKUwd3xR0Xs1bKKP1FtyERJGjWe3e4c3W1/Kw9ylMSE21wD9DRr72W1w77b6hpao zbaw== X-Forwarded-Encrypted: i=2; AJvYcCXXJpUUwLfmVRoNycwuEvcnjdpXRbc+j5fPIX9WE3IH1Ye5G+ZVgmpEvgcJjJTA5/8GOTfExRk=@isar-build.org X-Gm-Message-State: AOJu0Yyh7AQNLl9/NcS4yNrgDx1RvqMoqEg0W7CevMjpMLsBqDsUSVrJ anwpe4NnbFAfHvcrMDmaFluIlpVibBCbkfbsHUFMYHoGTCyFZdCY X-Google-Smtp-Source: AGHT+IG79Z+CSkf74M8U4eUHg7sZK0DCOGh6UrznBWnMBObdU7Fi28EByYhwqpplxZM2JRr+22z1jw== X-Received: by 2002:a5d:6d06:0:b0:38a:418e:1177 with SMTP id ffacd0b85a97d-38bf565531dmr14969661f8f.11.1737452760572; Tue, 21 Jan 2025 01:46:00 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6000:c8b:b0:386:35de:28fc with SMTP id ffacd0b85a97d-38beaf4dd58ls573174f8f.1.-pod-prod-08-eu; Tue, 21 Jan 2025 01:45:58 -0800 (PST) X-Received: by 2002:a05:600c:4687:b0:435:b064:7dce with SMTP id 5b1f17b1804b1-438913f2df1mr154683585e9.18.1737452758353; Tue, 21 Jan 2025 01:45:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1737452758; cv=none; d=google.com; s=arc-20240605; b=fU3ajhnE0NzOgsJKzAWCSTBFWyNX+NbiHJzgszV7C2pnyRTU/PT8n+8NIQNTU5ELOI FZr/yLD+dCY8DZT5SvF+SpKrV9DFRT5twU2W1t87DboTWXSA9KN84vC48b7zG5c//eVr WoKV1hd14SLdlNG3lpRAObF5pVxC4L/5hSM41S4KXgjYTIEgOSurPvK6nm9OvlFqXEgN 8RmRwS6FkKzSIDAxgAqCecCHigPnwSHTXZwFPJCiTxxN8l7CBEg7e0V7YAZg+HUPzUUI Gp/TWYVOC5ngwb2uEDFPrpcnIZ5MF6qQjqLqF6S1yviFiW9PJlA9S/eeEsvZSpQy5MmC d0Kg== 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=AmShwSqMvrKG4jBt7sIS360VKZPdOEjJV/qp9abDBPo=; fh=oA3z3ipAEfMEprG1GAkYQgX7HeFj14A13x5U3QirAJc=; b=CKA4o9U514nV5kL4jJnuz3tbk+FuCb9LLcDVi9uoiTOOIFAucztQ737SFj5JXmWK4t pJEblltGlVR5VPp5hffldQiDNkQSiOg7iI6cTk/UU7/yivHaLC/NH6lSsnU49Kka+/VB zuhCve+qowawDVTB5IKVhI7a0/CZGz0ixmc3E5OlRpRb2+jYHXAippk+KitkPp+6Qp8z EQRHPoHn8MsBTDn8ERsWq+9zUGWl3l25mYykixkY4mK0/nsQTV/U/TmmSCQYKYUtQSB+ uxTaX10ShPwcuiVrHZCJq/Kce4X4QIEWWMdieQ9zhEjpx2oxUfZUXP3LyaldurLt+J1l wKTQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=F9eQLquD; spf=pass (google.com: domain of fm-1328317-202501210945572353215951a6940678-vfvxby@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1328317-202501210945572353215951a6940678-vFvxbY@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 5b1f17b1804b1-437c166380csi3239625e9.1.2025.01.21.01.45.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Jan 2025 01:45:58 -0800 (PST) Received-SPF: pass (google.com: domain of fm-1328317-202501210945572353215951a6940678-vfvxby@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 202501210945572353215951a6940678 for ; Tue, 21 Jan 2025 10:45:57 +0100 X-Patchwork-Original-From: "'Arulpandiyan Vadivel' via isar-users" From: "Vadivel, Arulpandiyan" To: isar-users@googlegroups.com Cc: cedric.hombourger@siemens.com, srikanth.krishnakar@siemens.com, Arulpandiyan Vadivel Subject: [PATCH] linux-custom: support to add linux-libc-dev package with kernel name Date: Tue, 21 Jan 2025 15:17:36 +0530 Message-Id: <20250121094736.99179-1-arulpandiyan.vadivel@siemens.com> In-Reply-To: <20250117180207.90250-1-arulpandiyan.vadivel@siemens.com> References: <20250117180207.90250-1-arulpandiyan.vadivel@siemens.com> 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=fm2 header.b=F9eQLquD; spf=pass (google.com: domain of fm-1328317-202501210945572353215951a6940678-vfvxby@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1328317-202501210945572353215951a6940678-vFvxbY@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 Signed-off-by: Arulpandiyan Vadivel --- Changes since v4 - Updated KERNEL_PKG_LIBC_HEADERS path with KERNEL_NAME_PROVIDED Changes since v3 - Updated commit message to include cross packages - 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/common.tmpl | 2 +- .../linux/files/debian/isar/install.tmpl | 2 +- meta/recipes-kernel/linux/linux-custom.inc | 2 ++ 6 files changed, 25 insertions(+), 7 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/common.tmpl b/meta/recipes-kernel/linux/files/debian/isar/common.tmpl index f9cc2f02..b004214f 100644 --- a/meta/recipes-kernel/linux/files/debian/isar/common.tmpl +++ b/meta/recipes-kernel/linux/files/debian/isar/common.tmpl @@ -8,7 +8,7 @@ set -e ARCH=${KERNEL_ARCH} KERNEL_PKG_IMAGE=linux-image-${KERNEL_NAME_PROVIDED} KERNEL_PKG_KERN_HEADERS=linux-headers-${KERNEL_NAME_PROVIDED} -KERNEL_PKG_LIBC_HEADERS=linux-libc-dev +KERNEL_PKG_LIBC_HEADERS=linux-libc-dev-${KERNEL_NAME_PROVIDED} KERNEL_PKG_LIBC_HEADERS_CROSS=linux-libc-dev-${DISTRO_ARCH}-cross KERNEL_PKG_KERN_KBUILD=linux-kbuild-${KERNEL_NAME_PROVIDED} KERNEL_PKG_KERN_KBUILD_CROSS=${KERNEL_PKG_KERN_KBUILD}-${DISTRO_ARCH}-cross 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 \