From patchwork Wed May 15 11:08:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3556 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 15 May 2024 13:08:32 +0200 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 44FB8V3l004230 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 15 May 2024 13:08:31 +0200 Received: by mail-lj1-f187.google.com with SMTP id 38308e7fff4ca-2e30840a08bsf38602781fa.2 for ; Wed, 15 May 2024 04:08:31 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1715771305; cv=pass; d=google.com; s=arc-20160816; b=ofsDCEyFKI19lIYrsKk7/OjhTdEJT4ncAtPYRL2J8gSRcYDHy2TFckZfiTtaftGbOi icQ3TmGBvCOIzi0b/T6Ge0Q3hg87FlweU5fe6e5LpFNRMFdBGvBoUQdxgQB12BEXgPXd u/vRMtMNsj+AncvYbe/QFTGyy4ZcJgiHpD75DEbebFDG856UZNeNGD9tT5X0QN0+ZlPX TpsbxNVqwLRHkQsSU4yvvmC6WMrrgfEM5ndj4AdQzZZs/pUuXqvlPOfhvvCbqFYor0E6 pT7QCLkUjHGMBLtSiuXO2GARTCnQrxzn33jsfbZiainG5iYGLsJ5N0cSTz2nZCt4w3x5 8LLw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=Ynwiddumk8OZQ6dArL5IQTm0z+a4kScHRcaulHXP3R4=; fh=40/UMRQ3b+RphBELVQf99wEuSBxiGTi0ID6ZLZCnAYQ=; b=cYmsg1pzS15ZClh+vL/2uOZbeZRko5co1A22FSRBSgnvPHTSPot4vm24IdzA4rXg43 zwHJbwEevzR4sKTTi/F2+tuO7K9ub+M0lkwCtqROGOy1LgIsDY/YL5bV69ZiXB7hFbc5 lqPga6cQGkXZv012Tk5Na2w0EQTkYef7xT+FYqQLkiIBuyX7q5ArBiHw27Wqc9cgsKT+ KuMTr8prydHDW14lF9PxpqCTGsOJlWA6OKqG7MD0/zPyCQK34hR3FOyqaM1aZuVIKuBU u3Ht6ukS/aQM0NuGHk7DGrTfNhtIAsOeuUL/0b3aRWW+rbauZ2ZJO0ZO4o0nz8e/MX2B sE+w==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=G443UHIW; spf=pass (google.com: domain of fm-294854-20240515110821abf0adb821c6ba3f4b-ue2fj2@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-294854-20240515110821abf0adb821c6ba3f4b-ue2fj2@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=1715771305; x=1716376105; 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=Ynwiddumk8OZQ6dArL5IQTm0z+a4kScHRcaulHXP3R4=; b=XpoHAxUcCSUfGCM5GjITj3Mzw6kSXJyw5g9jEXnLVOrLTr9FO1zzskOUzyDFWHlsll zy0dXWOhneeUyxilf0s2iGbQmF/jVlTB2H/iFJtGgraPufXovXWZzCcKaiA+o3GmHJZv ryPT6zeq1cyjBMptTwfp6tHvcG7RjbGFK0Cme6RwErCkOnkkg+/o6Jtz80CfTFIad59S kFwWR7/KsLXlSFD3tEzp9TKAoyX5jbCq5u8hGasp+vdi46+IJUrm9/59iiC1AIBvpzpa giIYRuYiHRiWDOH8k4BC8tMbtIl+keW43BO9XjQAEEtpiLCJCByou6U4RaOY9uDjMBWb hyJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715771305; x=1716376105; 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=Ynwiddumk8OZQ6dArL5IQTm0z+a4kScHRcaulHXP3R4=; b=HWplT7KaZJeULvJ7z7izR+8FoG/KoZhUMLoch22sBNvKh8zoJuFkrqJFB5OMb42Dbx k+FMjRP+MFzST9+DG+iGVKuBlcLP3KKn4PnCfKsreGyu8UdMwXcuuaJAtuVR+Re8Jm+Y jo15RJtJikhsFAwoUNBO8oVwmTBAzFosduwrSHsPp5hnbsSsF3iKR75z220sYS8YJpNs +Z81DtYiOAxUaT2pmAJYlYraPGnPMGPNaALIg0U0J/smCfTlTmigHam8kvrIGfjBtVzG 44XZwSnud5iU0pYAIWLFOHr1Oqnb1T5pnzq+iFj1RwyFl7yy1T4wgYnZm+vYAaZohRt6 psaQ== X-Forwarded-Encrypted: i=2; AJvYcCV39qQgZGD24OIRYfN5yYdYLm3kP/IiI56EhAtG/XPt25Usa3NDpqtgnRIBOQl2AxLqJuv9VIn6NVMfeoh/NeQVVEMoq5c= X-Gm-Message-State: AOJu0YyFHoxMfwTnCwmeBAE9cJMtu0yBCOnA8e3mer7pWIBdo/xR6J/o jBfzvq8tBJBKBKzmq0hRWhO6DgX0Xtsq6OXkCZtxw1H20f/BEk4F X-Google-Smtp-Source: AGHT+IGnH80LOn1lnsj3qnqdMIvsIGZ7wMwzHXwXWTCppJXhHiIvpG569dC1c7uQvtllY78apa6l4w== X-Received: by 2002:a2e:2c06:0:b0:2de:48ef:c3ce with SMTP id 38308e7fff4ca-2e5204cda22mr91424361fa.49.1715771305050; Wed, 15 May 2024 04:08:25 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:3008:0:b0:2e1:e370:18d4 with SMTP id 38308e7fff4ca-2e4b6e5f873ls3951591fa.2.-pod-prod-01-eu; Wed, 15 May 2024 04:08:23 -0700 (PDT) X-Received: by 2002:a2e:3a07:0:b0:2e1:aa75:6504 with SMTP id 38308e7fff4ca-2e5204cc972mr106722311fa.43.1715771302617; Wed, 15 May 2024 04:08:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715771302; cv=none; d=google.com; s=arc-20160816; b=qqdfOV6dp65v+VRzEgFKGiaTjhHuw0y3mp2Wx9pEXJMbOVkcjQrbgYNreEQM0cbol3 CjpsUnNh1e8DO2UKSkNVnsqadDEw9mMZmat+5rNEWt+Bx2uljKYAUYqlQZ96XS1FMnSI 759gUi1xHVj3q0sfmVKlhueY1P6g0+jIf0gDnSSiCU2fvmcELBQxPPtW6LX1mPl1IYko jI4s52umwn/Fj4n1LnnDrkJZNEl83W9Sig2QUcDfbtnHzBMHD3WA+gRxLJscI+CUPScP ylgRxEQc4wjflhCHZ8VmiBdHtRTe5mgVgYB3zPTZULmmE5M8rSq+6ZmuPb6uibY0FOmp yMvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=DSVmfzOM6TszmHt6WM9uoGsrLM5RpwJqj2tR2PnVEzI=; fh=XGT9su1InluIJlpNbfO5AhdONNgYrcrI0omn79eqbSQ=; b=IWEUB0Rm5asBCFWuA13uiWGs23hNYrQZixIQrmpJ0CWp+pnmkMDfDUKkRs1jixZsOD gEWJzbr1LEeSGSb/vBuLt3wVrTbgyvT/Rkwo/v2puKb4aMuB4kEhleS6WSTGgI7eWICi Zm0v2xS9hBFUaYEyPcsGEEz/lE6lutf9t+9qM/aUskooo4k5EiiLavu/zJCvfpRyDd7e GV1/EFCqCxsYd40P6gKV8SzWAhvWEQvu/XnZQ+rB05kbJl/0Ox+gCUK4H0KFkacviTR/ HsedXRx11LNy5NOubBQ59OEoJoO7knJ4AzzzSKmfselgo9xQdsbEgEXEwWPwRBMJJCwO ZkgQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=G443UHIW; spf=pass (google.com: domain of fm-294854-20240515110821abf0adb821c6ba3f4b-ue2fj2@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-294854-20240515110821abf0adb821c6ba3f4b-ue2fj2@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-2e4d0bbe1bfsi3771831fa.2.2024.05.15.04.08.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 May 2024 04:08:22 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-20240515110821abf0adb821c6ba3f4b-ue2fj2@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 20240515110821abf0adb821c6ba3f4b for ; Wed, 15 May 2024 13:08:22 +0200 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Cc: Felix Moessbauer , stefan-koch@siemens.com, Adriaan Schmidt , Anton Mikanovich Subject: [PATCH v2 2/5] linux-custom: Model cross-built kbuild package separately Date: Wed, 15 May 2024 13:08:16 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=G443UHIW; spf=pass (google.com: domain of fm-294854-20240515110821abf0adb821c6ba3f4b-ue2fj2@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-294854-20240515110821abf0adb821c6ba3f4b-ue2fj2@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Jan Kiszka Reply-To: Jan Kiszka 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=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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?= From: Jan Kiszka Rename to kbuild package containing tools to cross-build modules linux-kbuild---cross. The headers package now depends on either the native kbuild or a cross variant, unconditionally. This allows to have unstable source packages between native and cross and is generally cleaner to describe the cross version. Signed-off-by: Jan Kiszka --- meta/recipes-kernel/linux/files/debian/control.tmpl | 12 +++++++++++- .../linux/files/debian/isar/common.tmpl | 2 ++ .../linux/files/debian/isar/install.tmpl | 6 +++++- meta/recipes-kernel/linux/linux-custom.inc | 5 +---- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/meta/recipes-kernel/linux/files/debian/control.tmpl b/meta/recipes-kernel/linux/files/debian/control.tmpl index 6f8f8afe..e0e932a0 100644 --- a/meta/recipes-kernel/linux/files/debian/control.tmpl +++ b/meta/recipes-kernel/linux/files/debian/control.tmpl @@ -51,9 +51,19 @@ Description: Linux kernel debugging symbols for @KR@ all the necessary debug symbols for the kernel and its modules. Package: linux-kbuild-${KERNEL_NAME_PROVIDED} -Build-Profiles: +Build-Profiles: Architecture: any Depends: ${perl:Depends}, ${shlib:Depends} Description: ${KERNEL_NAME_PROVIDED} Linux kbuild scripts and tools for @KR@ This package provides kernel kbuild scripts and tools for @KR@ This is useful for people who need to build external modules + +Package: linux-kbuild-${KERNEL_NAME_PROVIDED}-${DISTRO_ARCH}-cross +Build-Profiles: +Architecture: any +Multi-Arch: foreign +Depends: ${perl:Depends}, ${shlib:Depends} +Conflicts: linux-kbuild-${KERNEL_NAME_PROVIDED} +Description: ${KERNEL_NAME_PROVIDED} Linux kbuild scripts and tools for @KR@ + This package provides kernel kbuild scripts and tools for @KR@ + This is useful for people who need to build external modules diff --git a/meta/recipes-kernel/linux/files/debian/isar/common.tmpl b/meta/recipes-kernel/linux/files/debian/isar/common.tmpl index e3a1d8a0..86af70c5 100644 --- a/meta/recipes-kernel/linux/files/debian/isar/common.tmpl +++ b/meta/recipes-kernel/linux/files/debian/isar/common.tmpl @@ -11,6 +11,7 @@ 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_KERN_KBUILD=linux-kbuild-${KERNEL_NAME_PROVIDED} +KERNEL_PKG_KERN_KBUILD_CROSS=${KERNEL_PKG_KERN_KBUILD}-${DISTRO_ARCH}-cross # Force creating debian package with valid host arch for -native build # Use a cross build to comply with arch specific kernel defconfigs @@ -32,6 +33,7 @@ deb_kern_hdr_dir=${deb_top_dir}/${KERNEL_PKG_KERN_HEADERS} deb_libc_hdr_dir=${deb_top_dir}/${KERNEL_PKG_LIBC_HEADERS} deb_libc_hdr_cross_dir=${deb_top_dir}/${KERNEL_PKG_LIBC_HEADERS_CROSS} deb_kern_kbuild_dir=${deb_top_dir}/${KERNEL_PKG_KERN_KBUILD} +deb_kern_kbuild_cross_dir=${deb_top_dir}/${KERNEL_PKG_KERN_KBUILD_CROSS} # Array of packages to be generated declare -A kern_pkgs diff --git a/meta/recipes-kernel/linux/files/debian/isar/install.tmpl b/meta/recipes-kernel/linux/files/debian/isar/install.tmpl index 77856aee..00011517 100644 --- a/meta/recipes-kernel/linux/files/debian/isar/install.tmpl +++ b/meta/recipes-kernel/linux/files/debian/isar/install.tmpl @@ -35,7 +35,11 @@ do_install() { if echo "${DEB_BUILD_PROFILES}" | grep -q "kbuild"; then # Install kernel scripts and tools - install_kbuild ${deb_kern_kbuild_dir} + if echo "${DEB_BUILD_PROFILES}" | grep -q "cross"; then + install_kbuild ${deb_kern_kbuild_cross_dir} + else + install_kbuild ${deb_kern_kbuild_dir} + fi fi if echo "${DEB_BUILD_PROFILES}" | grep -q "kernel"; then diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc index 3fd0c6c2..c54c287f 100644 --- a/meta/recipes-kernel/linux/linux-custom.inc +++ b/meta/recipes-kernel/linux/linux-custom.inc @@ -111,9 +111,6 @@ BBCLASSEXTEND:append:cross-profile = " kbuildtarget" # build only kernel with the default variant of the recipe BUILD_PROFILES:cross-profile = "kernel" -# Select correct kbuild package for isar cross-build -HEADERS_DEPENDS:cross-profile = ", linux-kbuild-${KERNEL_NAME_PROVIDED}:${HOST_ARCH} | linux-kbuild-${KERNEL_NAME_PROVIDED}" - # -native: kbuild package for host BUILD_PROFILES:class-native = "kbuild" RECIPE_PROVIDES:class-native = " \ @@ -151,7 +148,7 @@ RECIPE_PROVIDES:remove:cross-profile = " \ linux-kbuild-${KERNEL_NAME_PROVIDED}" # Append headers depends -HEADERS_DEPENDS = ", linux-kbuild-${KERNEL_NAME_PROVIDED}" +HEADERS_DEPENDS = ", linux-kbuild-${KERNEL_NAME_PROVIDED} | linux-kbuild-${KERNEL_NAME_PROVIDED}-${DISTRO_ARCH}-cross" KERNEL_HEADERS_DEBIAN_DEPENDS:append = "${HEADERS_DEPENDS}" # Append provides