From patchwork Fri Jan 17 17:59:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arulpandiyan Vadivel X-Patchwork-Id: 4012 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:58:09 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f187.google.com (mail-lj1-f187.google.com [209.85.208.187]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 50HHw8D3007628 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 17 Jan 2025 18:58:08 +0100 Received: by mail-lj1-f187.google.com with SMTP id 38308e7fff4ca-30220a23430sf12663591fa.3 for ; Fri, 17 Jan 2025 09:58:08 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1737136683; cv=pass; d=google.com; s=arc-20240605; b=PSfxhn/Au+lQpYC7pJZiL0W5RKDUz+cIDicJCotsd+/S0iNTCwaBpYFXWqcFUjKtFh q5r7LnAm/GC4LylcOU2HYstrYp3rsetzHKmebGvvAUUgaesJHcKkWXRjjtKl6gM0EUpv QyVsEyh6vjKCCyxCzwVXp1kOTq7khioxUStlHHfYrUgsVPimMhe4F2niSDl6/wDelQ8U HUkGOPl9QxCY5BSpl3HgIKkZ81fUx7Yf1hdSTU1dj3RkO25kXXJZIIWJVTMuar0x9F1M ulUibpCiWgc510fuiu4PAuq3nM43ZgoGZM7iNkT8Gj/VfYX6vLOM3XTeQAVCloq5RVOA Jfaw== 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=L3kDi8BFAUU804E5LJh2maEFiScjx/hdwfsCddoetQo=; fh=AZ7xvajrfKY1bvm5QKIlZRDvgVZOIB+aDHd++qTSCjo=; b=KB7bKIpp/4WFdqDRCbxmC9aPu7FCJGFFYcIUxFGtb5azvjq9tafYRTll6nJHw8rHJG mSOc7/+FXJFFuhishjIGc3PpcwXGoGYCjGvTSLM0uUG8Bkt7uneZMK1DEOHUbcsY4dIi D/5Zzjv2u4gPA5iqBdTn4+AhimFSmUTrMPrfpT4M9/KhwDJlubk8p3/FeTFaIURY1cPu 7dNOS1BFn4znKIrW3QblpgJYQrkImI4mJlvdrC7z3pjCcRkRAgrgrE8kOHH3VR8mPb+l lUen/1vhELTFl7cvXiPkSSNf1fqntebU/CYffe9I7vwd1l0Kgn5T3gzKSMVb/K2YIKsp mEOA==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=i2ceDWR3; spf=pass (google.com: domain of fm-1328317-20250117175757eb58413e8f17a5dd6b-anpcs5@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1328317-20250117175757eb58413e8f17a5dd6b-AnpcS5@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=1737136683; x=1737741483; 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=L3kDi8BFAUU804E5LJh2maEFiScjx/hdwfsCddoetQo=; b=ClP0Ektw0beZ1tlRebiwrj36YCk2mxWRvO9XloXUiMjsnSx2GiDOEObNMGmwrsOsVI RYk/zjwnvnQkyx/SMkHAbC4OnFQT4qIytYlYKe+/78z/fRcZC5vuSv+pmQUYlU3nKWHj 3qynBCq629XkowO9TiPN7PVImt8GvKqdCDvxZu/bBwxQyeVYVx6j2I9HBqGGF8hg//EC yo3RFjrK/9cfpSJA0maMYsMYGqMDduex2JnBbS4KpMrr3tfl+zzKgCqo0dENQ6KLMCPh Umq/kyvlmfTbQOIe5SnZ7NfjtAWE9tcB82IfgFNL5LGoj3MJMkXmlbVT4JDjdJeup8Yq +ufw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737136683; x=1737741483; 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=L3kDi8BFAUU804E5LJh2maEFiScjx/hdwfsCddoetQo=; b=XbsU3iZOm3qtpThBh89d9jvzlvTmZgTyLEzJahGIq3mKTUHUavtJSPfw+D6GB6mwJi NFrTxbAmJVRacixEN2ix0pxh922eOelq9urJ9+hDyCPf0gFyrLmffOCInvJ7Vz7g7per vr3jA6+NAdEBgkAI5UQgFKcMh2TSyGJrlEIC3Mnp1OAu31HiXM7TPBb46lzj3mMEgZSX 6W1WOcqnP37822zTBlunyQcpGz6olMVhv58c/aWNC+CGPDF0Llh0qAcVSdU0rJpY1cML zTcQjLqtt8qYySDi5kKKGf8jcCLFI75Ch0bwQz4tUrvIMa4GMKwuSd1qUS9/tulc52/9 xzuA== X-Forwarded-Encrypted: i=2; AJvYcCWDKLef29AUMJQVELOBAZmWNXeAhklTH0oXgzd7DCGJlrTK6SWBzjydt0F33/N3IJ4JRRoeMw0=@isar-build.org X-Gm-Message-State: AOJu0Ywl2B2uTjYP4KAYiKGq0U0JSq/oqlArWqLQrGoIsV+QdE0IQGVT icW3KLQUPK3cZMaiKpcGR6pVM0Oz8ha6Vq6KYC0w34+LrG2IlklV X-Google-Smtp-Source: AGHT+IHdDv78PTbsiEvo32dnOEvc3n/gnitHOxeCEF1AWS+FLU3P+tlCU4EVkM3WlQzA+d1x8hRm9A== X-Received: by 2002:a05:651c:2109:b0:300:31db:a770 with SMTP id 38308e7fff4ca-3072cb0378emr15681291fa.26.1737136681324; Fri, 17 Jan 2025 09:58:01 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:893:b0:300:32f7:d886 with SMTP id 38308e7fff4ca-30637d06031ls787451fa.0.-pod-prod-06-eu; Fri, 17 Jan 2025 09:57:59 -0800 (PST) X-Received: by 2002:a05:6512:ac7:b0:542:2934:71a7 with SMTP id 2adb3069b0e04-5439c24626amr1283324e87.15.1737136678793; Fri, 17 Jan 2025 09:57:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1737136678; cv=none; d=google.com; s=arc-20240605; b=FERbqZzqdymBoNPkH5yTyG3XLcYHxr127eTfEaXvOcy8uZmeHt1gJHg7zgdsByF8YF Xs6hWH2mgT5jilySiO6iKNV0R4ZyyheZGRRiFLNHJdJvRQwfbSS6Fpu8ZRqe7FxCtxBN MJRuBGNSejq5LugGngF26T0UsLpUMLSWYY320kT3YHquJQL5niku0j+VsMgEKTANTqcG ctWmla+et1WWTMXHQVGv9vJ9+3RicuzPmfUf63rIgWdiyQKbZZOGItI2C3J7mp5oxEuF LW/jmjEsA6XI0qX1WI6lZYM9v2Gqrh+WXd5cOwdfYw0p1abgKAi8acqi+EtpHbKj0Twu Tq+g== 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=83wEn7G8LQgRww/4B493B+SVQQZyZv/MAqdN1V5YS1Y=; fh=oA3z3ipAEfMEprG1GAkYQgX7HeFj14A13x5U3QirAJc=; b=dSL/Z+ETzM3VQ5kwqqk1CpWfz1In412Rln5ImvOFCWjYMbEnTI3x44RGaN8On8cRrt IGFHIwuR8XhwejobPtlq/R1x3mqTv3+LAjOxAi0rYuVxvR13XuasQjDbMfrrL9Q+n+Yd iCnRt6Y8UEObkfwk6lTeYV/XP3308OM/oKyrN4kzpIBxAXdkYsG4h66LTQxAP5Byrfda NQfmaiZeRufwHZ3+D2jh6/MA+kcvR76O3YHkXU8brg8uRVmsiuoKU4f+yOvjNPodT7PT lwk3VD7059dZgbIt9m4e2qACFCRyElCeV1s+W5Txw1ps+miuvlu7DZ2g0WhC0HuwL9CA MDGg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=i2ceDWR3; spf=pass (google.com: domain of fm-1328317-20250117175757eb58413e8f17a5dd6b-anpcs5@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1328317-20250117175757eb58413e8f17a5dd6b-AnpcS5@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 38308e7fff4ca-3072a4a1c52si465561fa.6.2025.01.17.09.57.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Jan 2025 09:57:58 -0800 (PST) Received-SPF: pass (google.com: domain of fm-1328317-20250117175757eb58413e8f17a5dd6b-anpcs5@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 20250117175757eb58413e8f17a5dd6b for ; Fri, 17 Jan 2025 18:57:57 +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:29:35 +0530 Message-Id: <20250117175935.90086-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=i2ceDWR3; spf=pass (google.com: domain of fm-1328317-20250117175757eb58413e8f17a5dd6b-anpcs5@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-1328317-20250117175757eb58413e8f17a5dd6b-AnpcS5@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..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 \