From patchwork Fri Jan 17 17:37:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arulpandiyan Vadivel X-Patchwork-Id: 4011 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 18:35:49 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wr1-f61.google.com (mail-wr1-f61.google.com [209.85.221.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 50HHZlNB007340 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 17 Jan 2025 18:35:47 +0100 Received: by mail-wr1-f61.google.com with SMTP id ffacd0b85a97d-385d52591d6sf987583f8f.1 for ; Fri, 17 Jan 2025 09:35:47 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1737135342; cv=pass; d=google.com; s=arc-20240605; b=CjYa16qGT0PzmC1loFd9GEhWcAw3NsFFbKhS2BJclgxR4ddYp5DJxwSJbYPrYn0v4o nIgG75DGkyzoTM/9DMKyu1+dc/GzVCl5/9JeewBdpkEqRD8bm79Mm6elMxEmDiVzV4YV BNShi9vRpEAAxcgklEm6uyUQYYxyXQdPv7MhqGbsSuc+L/ulsL/z5KkxKICBraCHi6Kc JRsO6IY3ufFIk5fQC8ifFMh0NBDyEVzfESOxTZ31y7xDJzu2p7hzBlngmL6yvPHKIbLo KkxRxlVWH01DVvosz00bzTyOftcIb/heNMN/5PPoO53lk0Zk+INB7iabLGKevTBqzoW6 bBJg== 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=rGvDlDY9RIRJcJrgjnTVVu+AXRQNUie9Kp+m+bgr3ww=; fh=DiU/LCBo7pNsBiPKAgmi+E1EqLx7RpNgebI8+E7oj2s=; b=OFsm81GCKUgaou4tg7kql9h2Gmwo2bS7jWeNTrWUX9g6PvwNiVtUS7SYWd19K94NQO qCvr7xBSzw8YZL1w4uZek2hCjNwjqTgpGMg9DskUr7YCAmBzS1yTsN65bhJXbiMwydH9 3BrWJkIsXGg9/6EF5P3IFu2yOna/+l2SePGxPQYeB6ONT97JTol1voTSE7IiZVc1tWzs tLdyN058SjfRwA02cyuVorhNpz8ONZk5kQnCjSbhrtENYe5kqm+3w1mjMSNINC3r8F3Q wFndYjZGsBD3Yu9ZhlSetPTrw3OmmGHSy95uBJshBgQ1nD2C3/a5yQQqUWAhMqrqLADr RI4g==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=b0kKWMU3; spf=pass (google.com: domain of fm-1328317-20250117173538e8cbc8a8f9ac6b21dc-7s0sjh@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-1328317-20250117173538e8cbc8a8f9ac6b21dc-7S0SjH@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=1737135342; x=1737740142; 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=rGvDlDY9RIRJcJrgjnTVVu+AXRQNUie9Kp+m+bgr3ww=; b=MNY8eQkbsDp3SFP+0DLGSN+iGjyMQl3cOCNvL7446vmDlgnZnmpBd3uPJ0pWHubZpw WE/1S5Byq46zf2Sfo3WjOgtiLOpOMC9pnUtybJMhviQjGB+BeDjx5dughXS3gjuv8XsW j5FB94gqiBXCsorMBNGVr32yrBw7JnSz/N/IcDJtO+E9pkd++IPdaL1bZF/1+gJC6aXz ++DUHjx+aQxcfMad4dRIEbL/QUy/6I0VyElevb3JOOO2Fg6RMiE0R4qsy1P3RLaPEW2Q R/PLdP8bswaFiKK0P0Ve2N7I74oDFsygMUUd2raL9M2rizOAjpILzUzVccler9rpck1X w7Yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737135342; x=1737740142; 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=rGvDlDY9RIRJcJrgjnTVVu+AXRQNUie9Kp+m+bgr3ww=; b=cATaLIXpWdJyZCzAOxS/24FJe87QSeqj8eV5+hRrALl9f6BY3HIp97NUoecARxmGIu kuLqlLicKl59BPW4dHTJe+f4A8ecBeahQequQs4bXBVA+HxP+o7bR8AXPZC1m7DZqDD5 MeuZr6KzHkDioUBmZpmbrjjyvPQmKxNYeBqvf8k6tJF7+CJG/YfPyzv/iK83XB5B9AeF RoJ5GdgXBYIn0tlo1GkRBeoLAZZg95iflk22HbBYiv9r4lmwnPRVHOlC+0Qng4IZAPXi RzVyxiriYWjVohRWThq7aaO2FMMU+uX3TR0u4hyJ1GtSCr6sH9YHlTbmz0Ievd7+rInf k/rg== X-Forwarded-Encrypted: i=2; AJvYcCVovS7Jyglv7hpxMu/vwQ60V/Oc7olSWhuGiheKfdAP2N6NLrhGxUyki8Whfmc4T5m6cWaYsYo=@isar-build.org X-Gm-Message-State: AOJu0Yxqx5CKe3NeiVe7A+JLo+6UzSWrRV4DjqpuZjgHBrwTDwCPSpbH PfEGACo1bFmikpA4+I2pTGaCWkJKld/MPP0zoh26BMHtNv+MmbUC X-Google-Smtp-Source: AGHT+IEPtdRYjLY+jmhiS9mzNnL6utbI5XnzTMlwKAsPLr+2AcEMzom3wB2hA4IV+qkdCJJOXrMTWQ== X-Received: by 2002:a5d:5e03:0:b0:386:3c93:70ff with SMTP id ffacd0b85a97d-38bec4fb69emr7727758f8f.8.1737135341242; Fri, 17 Jan 2025 09:35:41 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:6b07:b0:436:f132:b02a with SMTP id 5b1f17b1804b1-437c664d90fls12380085e9.1.-pod-prod-00-eu-canary; Fri, 17 Jan 2025 09:35:39 -0800 (PST) X-Received: by 2002:a05:600c:35cf:b0:434:f1bd:1e40 with SMTP id 5b1f17b1804b1-438918c6162mr30279115e9.6.1737135338975; Fri, 17 Jan 2025 09:35:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1737135338; cv=none; d=google.com; s=arc-20240605; b=jznfDDsHhiDdqhaEODj2etFx/y4qH8sugo2YVuD9ozoeh9cUOM1XqzqXeLp0ccscJY jHbdhT2xxep3zf27xSlWe1kHSosReTu15lvZsWtvq3dYgE1VNOTJkjtYn6uP7NMvvOzl bT/6urbTSTYjlvrNHHIiynf0QwY4BHgNDnJyDLFalJeUDSZdCz4bHRtKYTecK0wV8fSg I6gXuFnAwsnz8ySPN2gFrCFCJn9TWbQcpKe62sPrGQNveuh04AmFUJ6fF4rOYSasu+Xv 0VThV62z2I/Hl5yisZ8l6uM3XxQWR3om1M59OcpNHEs2omq3wETmajVa4N2llsEFPtLQ Hspw== 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=H94nhK6eMfdxzKW6lJqoIJ2GnA4p8wV8XKoPbOSO2ME=; fh=oA3z3ipAEfMEprG1GAkYQgX7HeFj14A13x5U3QirAJc=; b=HSdMeBNjX+2sRZ4Zf4UcLiGClLHhRw+oK+lSTiuoBH0PYeeZX0KB5MIPNtHgDfm7xK 5J82JxkubVmY/+XE0Sd9Fwh2ohYqVWqTzGoevFnyBhGv+r99q/7EUkP517Hgprj9Olfr 2JuKeFnZOLBkuVoAYB6QLZu84ZM3vvhAlSwqd7HPEE8igCOX1IB9hYYnLaujmd5UP8UI n4EHJNAO83Wv557wbYob5RSiF0QOCBS2LirJeORjQcdbG8prczAPs1zHn19gcMKzTqUS HD5Lw3agzwIRsF5P63qHPdSu7oKf8GH3AkugfnE0ftQeWzbtApXHKqwECYU7haaPk47t 7gTQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=b0kKWMU3; spf=pass (google.com: domain of fm-1328317-20250117173538e8cbc8a8f9ac6b21dc-7s0sjh@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-1328317-20250117173538e8cbc8a8f9ac6b21dc-7S0SjH@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-437c0f0317dsi4012385e9.0.2025.01.17.09.35.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Jan 2025 09:35:38 -0800 (PST) Received-SPF: pass (google.com: domain of fm-1328317-20250117173538e8cbc8a8f9ac6b21dc-7s0sjh@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 20250117173538e8cbc8a8f9ac6b21dc for ; Fri, 17 Jan 2025 18:35:38 +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 V3] linux-custom: support to add linux-libc-dev package with kernel name Date: Fri, 17 Jan 2025 23:07:15 +0530 Message-Id: <20250117173715.89204-1-arulpandiyan.vadivel@siemens.com> In-Reply-To: <073e7edb-8033-43b1-9124-247bb3350671@siemens.com> References: <073e7edb-8033-43b1-9124-247bb3350671@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=fm1 header.b=b0kKWMU3; spf=pass (google.com: domain of fm-1328317-20250117173538e8cbc8a8f9ac6b21dc-7s0sjh@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-1328317-20250117173538e8cbc8a8f9ac6b21dc-7S0SjH@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 --- 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..5d470c94 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_PROVIDED + +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_PROVIDED}` and +`linux-libc-dev-cross-${KERNEL_NAME_PROVIDED}`. +For example, If `KERNEL_NAME_PROVIDED` 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..ade4ad7a 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_PROVIDED}` 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_PROVIDED}` 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 \