From patchwork Tue Jan 14 16:33:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arulpandiyan Vadivel X-Patchwork-Id: 4006 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 14 Jan 2025 17:32:14 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-ed1-f61.google.com (mail-ed1-f61.google.com [209.85.208.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 50EGWDZL022820 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 14 Jan 2025 17:32:14 +0100 Received: by mail-ed1-f61.google.com with SMTP id 4fb4d7f45d1cf-5d9f85752fesf1066033a12.1 for ; Tue, 14 Jan 2025 08:32:13 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1736872328; cv=pass; d=google.com; s=arc-20240605; b=RoYWMol8HGRoG+5XXBky126FBAeHIssuFwN//Ayq4GRBibhC9GeAdY0Ppjt1zdtuZB S6JxcFQWIzIgzj0PJjcf5giS/OTcvB5YgDjb/6yNIXJ9mHitE1egjzdhu/Nrf7zpNWVq PeTAwvGP1v4yH+0zlW4iYbLyuTbODsAlckqd6+eCQlR54I7IZ5I8YaLkjhxH4nyNaRBe /eLSEcL7ZsMsrO1JzagkKzRTvNz8GFiyieN8zhECZIsKOu03ihlr5Be8YBpeeaxapvis xuQ4zUDnZKo/52yvUKlix5aXMsflZyLVFnzGnkLdORhXtAOJifx5AaCeqEI0fGmoy+q2 NVsA== 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=9Zu/ZzYSYzWA8hLgeU6DP+eiG5QehKH7Oqt2b+OqpjU=; fh=SbOg7F/Q51UnwIfBbD13oUU12bAJck9pwge8pqgDQqg=; b=WBKcEOmcswONXD2R5P8FMyw6H9+6k4RsIZg7+3jU2gSxAq+RnfSLzX/lK4GMqTXuEO TG3m/7+GXINHjtiIwLkm+Caos8pFPyu/el2RNGg2BdRm79/jmUpMcGP5Dfoxy47uzHGt pHBpZpLG2WPSagWT9/1DrwoOKYvctYuk4CwLCroTXJLvBkpvnrW31IH+0s5trBurjYRn k/gWJSxF83LohPaJqiIYj3qFAs9e/oB+or43ltnvXGv92N04aAkZq6UlwDXWxxzSTQjp YQbmnSEODcbRantzTkH4YYTzCyEmtFD9MUhqqYy1kkal72j98fTY76YGkOzHLMMaRaVb q3oA==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=jsVC8EzZ; spf=pass (google.com: domain of fm-1328317-202501141632044143df6d8e41338bcd-cs18sg@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1328317-202501141632044143df6d8e41338bcd-cS18Sg@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=1736872328; x=1737477128; 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=9Zu/ZzYSYzWA8hLgeU6DP+eiG5QehKH7Oqt2b+OqpjU=; b=ukdO2zFUpWpBI/A2GHcO4Bu4OO80mooi3dU7KscAvJbwLZEtAzD9GpCEYZJk/8K767 IySFFVQI0B2uMY0AVh+n1mtuYctbwLfEmgSAHp3wlNxKZFXAIs0o4w86LLpIXp6omyIf PRIsMs7TRuSj3SyOljCKdeW42TEUa6w05AQimIm+HYVH9qUEWaDMfHqCmHCdxQRZdqz3 6ndm8kxqJU5vREvJFSldfSyvRqWRkDWO5oCt0cojohNoYeIKc5KbTtj2rb4taHE6xVfa YHX3zsVswErYwGKweMTg43KxsGVmo9S8JlJISvgw+Y2OgJuI7fMIdj3i9QE89zR8waPC dzYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736872328; x=1737477128; 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=9Zu/ZzYSYzWA8hLgeU6DP+eiG5QehKH7Oqt2b+OqpjU=; b=nWUctsJOsy3v64EgAKYowwhrGtthjAXvJrar8o6Dx4JV4XhXGbsYI8McpHGqgtJh8g s4gfT9h9TGurcq+u1QWa0ffpSIeWK+nqLRuRmXE8NoKyNpODZcNLZ+m0xndMkcGrumZk 3O24VnabBB9PeSl0e5b3glw5Kj+rwCZmUqSzk4MG8eDCaJYlWxuVx+Q+Z4jS+d6hw0pC A2KbuXGG7t8hNNgqqRPMpzlZxITSqy9+GudVFNe4trdPxrmB5x5sZRwOOJ10+zccUcGp x9SWcGEVxcKVxsDtX9r7aTVTj5TPCR/aFONXNX2+YRuW8RlCPKdwFVbu9Mh8bRuRa6tG jRgw== X-Forwarded-Encrypted: i=2; AJvYcCVdeBY5jkd7CLHJajhK/AFPraBNho52miCPwnKop2bP7uelTFCqkqJLR4Ir1vnx9qVKZgMYTZI=@isar-build.org X-Gm-Message-State: AOJu0YwBrlFcR29IKfoqagnXB1GrOEwN21npW3MCGhQ/uUkc3i7CFEeC wM74u1Zyc8wJM2/UbFOFSmhlOwe/QL/DS+C5MPC4F44bXncdGMcM X-Google-Smtp-Source: AGHT+IG20+eOdLmJMNpne40PnKvZa62+6h7Qmtd8tOQ0ckOfpuf4qGJO6X601/SEuXx4EogxWs//Pg== X-Received: by 2002:a05:6402:13c1:b0:5d0:ea2a:726c with SMTP id 4fb4d7f45d1cf-5d972e069b5mr22443470a12.8.1736872326979; Tue, 14 Jan 2025 08:32:06 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a50:d68a:0:b0:5d3:c489:125 with SMTP id 4fb4d7f45d1cf-5d9ef71dfdfls1167340a12.0.-pod-prod-04-eu; Tue, 14 Jan 2025 08:32:05 -0800 (PST) X-Received: by 2002:a17:907:1b03:b0:aab:eefd:4ceb with SMTP id a640c23a62f3a-ab2ab66d63cmr2686846666b.10.1736872324773; Tue, 14 Jan 2025 08:32:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1736872324; cv=none; d=google.com; s=arc-20240605; b=Y93cbikmjb3FRzTp1OoTjCQloDEjlxp2vMnE8SgTAqOZZcjcQuO7xnUvInRRo+ToXB dZyOmJ1t6xSm0MUJR7/kdLhNikrHTdvJ6jFSAAx4DwISCDj4qtxP5NHlINotvLSeaoHz HCCTsqQL6c5GMyKi8FpaQL2hYikCBZ2CcnKLkFe1Cwkbd44OZBSekDwdn0ZhBEpIZIcb uDi0aBhZEfHXGlH4X+tprQQ94tRYnt2Ei71BWNeSnKf6RH5z55wXxLEdneFRkfYCfKN0 /Thqho7vBJCGZNdB9j6B9KVMYN2SsvibktsZFwJQTEDo6Y13KSC3yuk0AacW4YWebMHN goKA== 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=VgspPqs2ST30jVIgOqNALYClRYIWXMTXI+sHfE26NQ0=; fh=oA3z3ipAEfMEprG1GAkYQgX7HeFj14A13x5U3QirAJc=; b=LzYWeZaUqt9wRcrVUEjy9aRkp3LOD9bRi52fG0MctG80/8DWnkM9EjVh200J/Fe9Fe hl1Xx/nYxMhnRRjKCZ8VfU7Qf9KBqnt1XWZLePmb43e/WwJQNm4q5ZrGEskTb9sXmsaS +SCQ0W5KJkIQpqx+l5fvsjBBox+4Qf/ShqmOOvUmS0CKq697h9nadhocj83WzjL9y/b1 NEGo6MQJslvQJkGHG8oPrfqviw3kP8OZ8DVO+5UEUwwsAcucg4oCi6WwVBzFRDwa2EWY AwcYBGai/AGY4f2D5v59OXV5FHPZk/XWa4F0a0g0GSZbaJSBJloT/ak7u+Tiy3rnCunR OCBw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=jsVC8EzZ; spf=pass (google.com: domain of fm-1328317-202501141632044143df6d8e41338bcd-cs18sg@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1328317-202501141632044143df6d8e41338bcd-cS18Sg@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 a640c23a62f3a-ab2c8cc14e9si31235866b.0.2025.01.14.08.32.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Jan 2025 08:32:04 -0800 (PST) Received-SPF: pass (google.com: domain of fm-1328317-202501141632044143df6d8e41338bcd-cs18sg@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 202501141632044143df6d8e41338bcd for ; Tue, 14 Jan 2025 17:32:04 +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: Tue, 14 Jan 2025 22:03:37 +0530 Message-Id: <20250114163337.77749-1-arulpandiyan.vadivel@siemens.com> In-Reply-To: <9e1dc2deaeefabddb25be2b2246e4a790703d1d6.camel@siemens.com> References: <9e1dc2deaeefabddb25be2b2246e4a790703d1d6.camel@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=jsVC8EzZ; spf=pass (google.com: domain of fm-1328317-202501141632044143df6d8e41338bcd-cs18sg@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1328317-202501141632044143df6d8e41338bcd-cS18Sg@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 and a Provides: clause. Signed-off-by: Arulpandiyan Vadivel --- Changes since v2 - Updated commit message as suggested - Added KERNEL_NAME_PROVIDED for cross packages of linux-libc-dev as well --- doc/custom_kernel.md | 2 +- meta/recipes-kernel/linux/files/debian/control.tmpl | 10 +++++++--- .../recipes-kernel/linux/files/debian/isar/common.tmpl | 4 ++-- .../linux/files/debian/isar/install.tmpl | 2 +- meta/recipes-kernel/linux/linux-custom.inc | 2 ++ 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/doc/custom_kernel.md b/doc/custom_kernel.md index ce5f1bf7..89c7c088 100644 --- a/doc/custom_kernel.md +++ b/doc/custom_kernel.md @@ -51,7 +51,7 @@ 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 (`KERNEL_LIBC_DEV_DEPLOY` equals to `"1"`) diff --git a/meta/recipes-kernel/linux/files/debian/control.tmpl b/meta/recipes-kernel/linux/files/debian/control.tmpl index 04ad0f4f..e440b492 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: any 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 def8480e..b200930c 100644 --- a/meta/recipes-kernel/linux/files/debian/isar/common.tmpl +++ b/meta/recipes-kernel/linux/files/debian/isar/common.tmpl @@ -8,8 +8,8 @@ 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_CROSS=linux-libc-dev-${DISTRO_ARCH}-cross +KERNEL_PKG_LIBC_HEADERS=linux-libc-dev-${KERNEL_NAME_PROVIDED} +KERNEL_PKG_LIBC_HEADERS_CROSS=linux-libc-dev-${DISTRO_ARCH}-cross-${KERNEL_NAME_PROVIDED} 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 0a7bdd66..e1602b9d 100644 --- a/meta/recipes-kernel/linux/files/debian/isar/install.tmpl +++ b/meta/recipes-kernel/linux/files/debian/isar/install.tmpl @@ -225,7 +225,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 bf6c879b..f67bba2b 100644 --- a/meta/recipes-kernel/linux/linux-custom.inc +++ b/meta/recipes-kernel/linux/linux-custom.inc @@ -146,7 +146,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 \