From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 13 Jan 2025 09:06:50 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-ed1-f55.google.com (mail-ed1-f55.google.com [209.85.208.55]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 50D86n19014863 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 13 Jan 2025 09:06:49 +0100 Received: by mail-ed1-f55.google.com with SMTP id 4fb4d7f45d1cf-5d3dbddb891sf5778579a12.0 for ; Mon, 13 Jan 2025 00:06:49 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1736755604; cv=pass; d=google.com; s=arc-20240605; b=Bd+b7iNinml/pXGIGwZrzjxnVCQld6/z6wzptUNcvJEoN4KNdNZyTW9vfnakPQw03h US7Chen9W+p5ppQuADMNBdd9Zo+zGUSjL0hgptXZhiZSxJthbiw5zt17cdm2d4Tlbwcx EQPwnZl5byhq0TnWFdNOzStos6vEVucd5CdumzuR24MxbTJch4JeEYnlJAtvg/lshrHl kafGO174Ha/8CSKfCu8FOtcYwXkPUYLrlyF5TFJR176vlP0P4sBdomoo+nACdU9eD13A Hv0+HqwGwej0/xwMwPHJ9FsEFIiBG+DmmlNt9OamPQDB3KuFS3M5qhY2M3DnbNsxoDe2 6pJw== 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=yTXPYNbcKRrYlZ48BU5DOVZROkZteAc6OnLk62gMfm4=; fh=8l4fJ5Tjr9A+jwyeDEp2qVumPFx0Ez8UY4nIwLkGeb8=; b=jBulNzV0/g6pPQ+a+C8UOUD3hRS0bAz/zAISfslQ6LfOO7hv3tXpjt3QnuDXOUx8Ha L4mTmLCcyRwFooFbVkzMgOF0QZaKOC/jLTUE8pUn7xwzhGKCUx+cfUvPGKfHB6FwhGu9 YpWHerGEeGQrQwVgYx4M/g1WETCZEuEW+zg+toxzm8E++rWGv4jogiO/247eQpMMVV+g x65H/dtYG4Z47GZzJTd+kYCUp1wI5QVvkPJj7yIjCFrqdp8mu3fwD9O2iudAEekMb949 KaFMF5y0l6TZaVLGsWEgBq2X2LAbpU0eg2hwVVVOrGa8f6bEXZXofneAOHzauzGrg0NR 7ZAg==; darn=ilbers.de ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=FFKUhwS8; spf=pass (google.com: domain of fm-1328317-202501130806377daf4fba3282593f97-8czhje@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-1328317-202501130806377daf4fba3282593f97-8czHjE@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=1736755604; x=1737360404; darn=ilbers.de; 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=yTXPYNbcKRrYlZ48BU5DOVZROkZteAc6OnLk62gMfm4=; b=X1LLM5xjNWKlB5baFmLGAeZsG0kBd6jywK/6bPkUA2YmJQKLTeTaMxhGVzaFOdxz0Z MaWq5YNweZDXcG3nmpx8aPw93EQoZdXlFQs67DPSiCi0VUaP1iLCoWWGeqbg/4ISWnmr vutV/Rrtfk+fUx6tI0xwFSoNGrmOMjA/OA/6PQ4zQD8Mf2Vjt0N+CbKFyHMoySFVYUNF m44bLj+mJsH/YJdaieFle8dpbeLsjkoUX07vbm2Bt58tTq0r0/XdURdLCQHofEz6Gocq RrSRe215sBZWg2OhxQbK5gJyksFFjS7ddOZJSRfaY/7tCsG8ySYbq2aj2117RTb1OwKg EMjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736755604; x=1737360404; 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=yTXPYNbcKRrYlZ48BU5DOVZROkZteAc6OnLk62gMfm4=; b=BRfdMyv3uYVknlSNB/y008gVIqF8I+YJGwx5sYarrITOSoPpGKd+3BOC1145fOzR7Q giPfczoylEXyRO7whg0Shohps8AzxfFxYfaJT1848Rm/GVQLHnrRNJ8/KN9zIzqUVlpF OU4PlWm7881+PLueKjGDHSN/IzM5S4OfkXnXFZZvglL6pQ5NjMM3/piCR7PbM6bIO+at hFjs6RSkMdBgwk2X4mttiEEAFPWCcSLxyY29HPRCIJTZESvsvDMlZW/N6im84uclElHT lZRs0/CtBDMbJcBpw1yQIOz0YKTwb3ZleKAjtfB1b95wfLZV/HdUOzEv1C1Y3POvyYVv TvZg== X-Forwarded-Encrypted: i=2; AJvYcCVRbsUWri5Jsfu6C42fR9EBClrAEUzQPekJWX/EZkWWkI7PG+FmP1Dih4bei3pyJuLoNQfP@ilbers.de X-Gm-Message-State: AOJu0YzuRfARmBFGCJjahpWvoV6BcrjMHgLT24B3cuS3hhHTb4SaIOwm CCIlif2OZU1K/kGbDkPPaa2Kz0sReb/mB5oNLPkWQw0OLCgUkpt+ X-Google-Smtp-Source: AGHT+IFG/vnuHR+zwx2PRDcp/oVMzjB6VJdPvQK/RMSSKGiAXvHMG9QI6jFXbrq4nfhnFiK44Kj2xA== X-Received: by 2002:a05:6402:4402:b0:5d8:17da:dcf0 with SMTP id 4fb4d7f45d1cf-5d98a249feamr13334154a12.4.1736755601075; Mon, 13 Jan 2025 00:06:41 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a50:8acd:0:b0:5d3:ce70:f232 with SMTP id 4fb4d7f45d1cf-5d9c1f235efls192172a12.2.-pod-prod-00-eu; Mon, 13 Jan 2025 00:06:39 -0800 (PST) X-Received: by 2002:a05:6402:26ca:b0:5d4:1d34:99cf with SMTP id 4fb4d7f45d1cf-5d98a830a06mr14779904a12.16.1736755598870; Mon, 13 Jan 2025 00:06:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1736755598; cv=none; d=google.com; s=arc-20240605; b=Wfor6O4xa0A1l0lBl9MunmlslhR+6ZToESyuGZh3aYMk7EeYQ9tpuQyxAC6QMPmIxs S9O8EELwK5skPyqxARmxneOuN2UHusY5cKg/KfARldvRrZ9I1+SMC2+DbvX7lgDjFE1Z oxNL/e0BcpAUoV2asgrlpPXWcmjnfHxDG4m0KXUV9JEy9ffIPkmFfYkjMWN8y6u65GFI hC4sMU2S7tfcFo4NW7co3w99g37kZ14nZgVEHFnarKlZiN8Bnoggu824FPn0rTmwowgI xlF1hO6ic1thdrNlYUcfy+7w6P/4XvA+Ft0xEa5uNJ8hnnBp437s5WshzOsOHtB62Suc ceWA== 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=OCL4pY3SrjJlbCBOZ+cft76sY0Q+4dUFTxZGMW87JAk=; fh=oA3z3ipAEfMEprG1GAkYQgX7HeFj14A13x5U3QirAJc=; b=SkEGMYChPoMFpAKq0oRxxBHht8KRXAvpS3l3eSukBeRA18XiKySjGJ3Cq504h62sru 4VZQiesjxmAYc3GfL84A+MT4ZC/nwerA6+obqO0hNHd36wR3jUbbuHdIaLJqSAhQNLHj 3GBvmzF4CJSPLXtgy633YQ61AMns710IEyZduzdNBKp1DyWd3w20Ag6BsR1KhN8DIUUu nkXRdgwoE7VCgb1JnAU0fPD00Cb8QZFIyr1U8LMJ0FqVwCpy+O6BLke5452jJubziAVE 3odMMPEK+7et9hGixEiLwQc0SiSV56OL9VNPu555meOuFReoEcC7V/iq3sOF6GwD5uAX 8aQw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=FFKUhwS8; spf=pass (google.com: domain of fm-1328317-202501130806377daf4fba3282593f97-8czhje@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-1328317-202501130806377daf4fba3282593f97-8czHjE@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net. [185.136.64.227]) by gmr-mx.google.com with ESMTPS id 4fb4d7f45d1cf-5d990479252si210062a12.5.2025.01.13.00.06.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Jan 2025 00:06:38 -0800 (PST) Received-SPF: pass (google.com: domain of fm-1328317-202501130806377daf4fba3282593f97-8czhje@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) client-ip=185.136.64.227; Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 202501130806377daf4fba3282593f97 for ; Mon, 13 Jan 2025 09:06:38 +0100 From: "'Arulpandiyan Vadivel' via isar-users" To: isar-users@googlegroups.com Cc: cedric.hombourger@siemens.com, srikanth.krishnakar@siemens.com, Arulpandiyan Vadivel Subject: [PATCH V2] linux-custom: support to add linux-libc-dev package with kernel name Date: Mon, 13 Jan 2025 13:37:53 +0530 Message-Id: <20250113080753.72286-1-arulpandiyan.vadivel@siemens.com> In-Reply-To: <8b5a84a18e2a506ad199c7c034d18dd83d5b3f3d.camel@siemens.com> References: <8b5a84a18e2a506ad199c7c034d18dd83d5b3f3d.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=FFKUhwS8; spf=pass (google.com: domain of fm-1328317-202501130806377daf4fba3282593f97-8czhje@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-1328317-202501130806377daf4fba3282593f97-8czHjE@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 Content-Type: text/plain; charset="UTF-8" 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-TUID: PKvpf6KDMRyT 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 --- 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 \ -- 2.39.5 -- You received this message because you are subscribed to the Google Groups "isar-users" group. To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com. To view this discussion visit https://groups.google.com/d/msgid/isar-users/20250113080753.72286-1-arulpandiyan.vadivel%40siemens.com.