From patchwork Fri May 10 10:36:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 3542 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 10 May 2024 12:37:07 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-ed1-f63.google.com (mail-ed1-f63.google.com [209.85.208.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 44AAb6fx010055 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 10 May 2024 12:37:06 +0200 Received: by mail-ed1-f63.google.com with SMTP id 4fb4d7f45d1cf-572d0cb1ffbsf1337003a12.0 for ; Fri, 10 May 2024 03:37:06 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1715337421; cv=pass; d=google.com; s=arc-20160816; b=LeLNPvJXNtvHXAzqu5Kj/t5gGPtUO8eLj8yFFuD22X1KC0/YKGbO96x3R1RC+pZUDX j7QuP/LB9u8YOpaNgUsjG7a69ItPMYTnfKw2cnFl0R1bAn2ETK9kLhVP6sYs3rKYtLt4 +hriz9lRnSF9IvuiGbLDOLstwexY8Qcv51CtsJINyLuHqO2EskILxcLwjDui+DnRpQIe TEtANoNCGg80ETQMqNcB9WKcSPc6tgmkuMdD23sHIDkFaK06mz9Mix37EZr6gSJcnaAa xRWWUyViop6BhA58Ft3hWU6W+6PAarLgCeIS+/lBF+txq+VIVZIXbH/lGQCwJfSI6Mio RC+g== 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=kkq9X0KSql7a5Q/hFqYfTYVdMJ8mGEY4O2xYu/oMLz0=; fh=RnriGDfr2EZvTwvdboqDY8e9I1TpCeWFIsPAB9nKtQU=; b=tqeYgch/x3mioCyXeG54a8PHA7RTQCRaC2iSPXhfe595JzEw14oYTPSRjomppobAIV G7Qr/+WsC8szXfa3O4PkBZqbehfe7EEbvxx4cGVY1HQU1II3YuF/7VVBgdP1RpnG9C/0 qbIEValzVQzEiJaoq1FuVXkisgKGyjuED7LAnL7KnX/blxmHNMsdJZEGr2k0lxIuWay5 kVpqgnux48UZIrbw/u0L3ikxnxFV2A8gPc1mHMfyTzYmKIsicDC0GTkNCBHZQ7npinG/ EycmAWBaohZSEov20vbtk94TpkyYgiWZZn4+BP0VB/cMubYce6LcokBaPM7dBX4qwNwx wLLA==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=FyLsV2ek; spf=pass (google.com: domain of fm-526363-202405101036588c6ad7053be51bca7b-m87lu5@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-526363-202405101036588c6ad7053be51bca7b-M87lU5@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=1715337421; x=1715942221; 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=kkq9X0KSql7a5Q/hFqYfTYVdMJ8mGEY4O2xYu/oMLz0=; b=DtIEct8OUP1DEdXea6ynPeq3ZuoEAuAZwz9+TbnCt5+3UnMRfTSjlbJCEcl8YPO8R9 DXMkHZd5yuYKfrB35k+gkuMnQP7AD1sX3eI8RJc4y7XORqALEo4PvDHYDjNZpCESYwhw wHiEjdjx8vvQIebdENJ/QG7QapnRZTo1VykIqic3ELANQAOpEG8VwF7NqGrNa/x8SycR Mp/uHid43ASlT4NaQszVF0YF/SQFOuf1epKG1Z1TI+PPpklJ8KTaISmJlc7Unwe14OSJ IVKL7evtPMlDQuir1mQsexZ9EX9iLh5Iy/zGZ/Khw74hCyoc67vz3uTJjDhjkQQAV0bj FPng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715337421; x=1715942221; 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=kkq9X0KSql7a5Q/hFqYfTYVdMJ8mGEY4O2xYu/oMLz0=; b=oBmmjbZYz039Hoc7GY5ryBp/Ef1fZB1daZ++rWwHCQUlwKRuUbPofdFsjfAMLwP4yT gnLFmbBQXdmhGfpXbC+04ObzLQrsamUvBEBd+gbCOzytyRHyGAZ4AtxeCafdxyqr4XCq kFJc/BSknkTv4fOrol6yZkIChrqTA3dARuPB8q0+85PUrhk5CsrQS/9yB8vr+1s92/0/ UYlr4B5uoqQyMAjM0KESYLTpCB/BArw/6ncRqV9ptzT/xgnjmgv6bWqQjKkbq1FUenLM FDoCYu6OBQzQwWCMd8XM5CX+/sIVmbniaPj/Bp88w/VgzfszZxTThUf6jdL1glGEo0Zt kg9w== X-Forwarded-Encrypted: i=2; AJvYcCUmVqroiYV2ov5b96Ks5IjKtCEDTYLcJJeWh4EMNV5QPityw4WCc+cbhzj36z0kuQUu3q/JLAZnSH1lEixBYsF0Lmfup4E= X-Gm-Message-State: AOJu0Yw1YGR2F0UQglW9u2p6m9Drqxs2MKu1djJjswFDUubAMAdE71uB pNxd1Q1xqkUzEsWwltO3sRHeuz/4DKoUezuKA6svIbWuu8QHAqKd X-Google-Smtp-Source: AGHT+IFOuKuK4lcfgqUHzA/5cVY6C3RELHR4WOMODokYoVDQ+ZXiNiPG5Be24q4vt1dh/YYBfmhfhg== X-Received: by 2002:a50:ee86:0:b0:573:4f61:ca9c with SMTP id 4fb4d7f45d1cf-5734f61cafemr1177508a12.4.1715337420803; Fri, 10 May 2024 03:37:00 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:43c4:b0:572:3b0d:1694 with SMTP id 4fb4d7f45d1cf-573332e9c46ls8003a12.2.-pod-prod-01-eu; Fri, 10 May 2024 03:36:59 -0700 (PDT) X-Received: by 2002:a50:aada:0:b0:572:7b08:d497 with SMTP id 4fb4d7f45d1cf-5734d5c17acmr1471065a12.17.1715337418668; Fri, 10 May 2024 03:36:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715337418; cv=none; d=google.com; s=arc-20160816; b=HQKYz1IwDt7f4QWk/HogNDJICDIwH3zpaeBHIuCDnb56Ca2G/luB31HeqbdiljZOqy 2kwc43FfuQyTQUSOMpDxI6SFhiGxzuP9K7kN1WshAHmtSjtioROrZ9vH8YHs2Y14A8vk nTkR1SKW3rMSq+IrjUao6Ou6wVLjyH1KB+XtR3tCnf8b5jLr4V1vEgnrMvIQaIguU205 NzSoVadE1siYlC9QFRtCgIDnHBbrPfE0eJD+RFdzxEthBoVHbS1HjIQg218mZFWeJ0rb zaF4vtzPoaUwfWkUV5kcUiYKheQDf8Rgn+o+p/nCmU89QL2y7OLqtn98tHyn0Pvsml5H UcOg== 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=zFYva5G8P843Vbh2b/VgJDMY5eRTZN1Oav0/g2FBqc8=; fh=qxj0qH++O2CSqXuHk1zmqR74UpYndUvoWfavR7y1BqY=; b=hWB9CF54wo1C/XjEjgf2sZxLBHyRu5RcEF2VU8+mxto/jyQo358RU1cvQOkSFiDEZA ModIGoEXF0uDYNKKa/H65biOv9c389R8PEijYw8wBn2K35TKX+C4v3X7B5OTkyyVKzdL lEC51GEezcHNgHEn0cRcj+VtJ9hsh6TdkFxDXP/vpteZXnR/tD+oMcxn0hxIJYNi+CI7 KFhj0BsoDqYlezglP1IEoZ6tf3q24K4DBPih/XS3GkwL9yj/rhNkzkySEBDzYt/dfT/O dXlbnKqsQUQbbwWSsmNricH18VQhpvKHaYkmZgcR4cuhN5Qn+agtOiMPHQcICXklbryt Z9Rw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=FyLsV2ek; spf=pass (google.com: domain of fm-526363-202405101036588c6ad7053be51bca7b-m87lu5@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-526363-202405101036588c6ad7053be51bca7b-M87lU5@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net. [185.136.64.228]) by gmr-mx.google.com with ESMTPS id 4fb4d7f45d1cf-5733c34ea9fsi161581a12.5.2024.05.10.03.36.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 May 2024 03:36:58 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-526363-202405101036588c6ad7053be51bca7b-m87lu5@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) client-ip=185.136.64.228; Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 202405101036588c6ad7053be51bca7b for ; Fri, 10 May 2024 12:36:58 +0200 X-Patchwork-Original-From: "'Adriaan Schmidt' via isar-users" From: "Schmidt, Adriaan" To: isar-users@googlegroups.com Cc: jan.kiszka@siemens.com, stefan-koch@siemens.com, Adriaan Schmidt Subject: [PATCH v2 1/3] module.inc: fix kbuild dependency Date: Fri, 10 May 2024 12:36:51 +0200 Message-Id: <20240510103653.3364162-2-adriaan.schmidt@siemens.com> In-Reply-To: <20240510103653.3364162-1-adriaan.schmidt@siemens.com> References: <20240510103653.3364162-1-adriaan.schmidt@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-526363:519-21489:flowmailer X-Original-Sender: adriaan.schmidt@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=FyLsV2ek; spf=pass (google.com: domain of fm-526363-202405101036588c6ad7053be51bca7b-m87lu5@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-526363-202405101036588c6ad7053be51bca7b-M87lU5@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Adriaan Schmidt Reply-To: Adriaan Schmidt 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?= This achieves two things: * Module builds explicitly depend on linux-kbuild-* as build dependency. Previously we only had an implicit RDEPENDS in linux-custom, which is not sufficient. For linux-distro, this means we need to PROVIDE linux-kbuild. * Remove the unconditional building of native kbuild when it is not needed, i.e. when we're not actually cross-building a module Signed-off-by: Adriaan Schmidt --- meta-isar/recipes-kernel/example-module/example-module.bb | 2 ++ meta/recipes-kernel/linux-module/module.inc | 3 ++- meta/recipes-kernel/linux/linux-custom.inc | 3 --- meta/recipes-kernel/linux/linux-distro.bb | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/meta-isar/recipes-kernel/example-module/example-module.bb b/meta-isar/recipes-kernel/example-module/example-module.bb index 22f3cc47..d486470d 100644 --- a/meta-isar/recipes-kernel/example-module/example-module.bb +++ b/meta-isar/recipes-kernel/example-module/example-module.bb @@ -12,3 +12,5 @@ SRC_URI += "file://src" S = "${WORKDIR}/src" AUTOLOAD = "example-module" + +ISAR_CROSS_COMPILE = "0" \ No newline at end of file diff --git a/meta/recipes-kernel/linux-module/module.inc b/meta/recipes-kernel/linux-module/module.inc index eddbf177..1cca9cfb 100644 --- a/meta/recipes-kernel/linux-module/module.inc +++ b/meta/recipes-kernel/linux-module/module.inc @@ -17,7 +17,8 @@ PN .= "-${KERNEL_NAME}" KERNEL_IMAGE_PKG ??= "linux-image-${KERNEL_NAME}" KERNEL_HEADERS_PKG ??= "linux-headers-${KERNEL_NAME}" -DEPENDS += "${KERNEL_HEADERS_PKG}" +KERNEL_KBUILD_PKG ??= "linux-kbuild-${KERNEL_NAME}" +DEPENDS += "${KERNEL_HEADERS_PKG} ${KERNEL_KBUILD_PKG}-native" DEBIAN_BUILD_DEPENDS = "${KERNEL_HEADERS_PKG}" SIGNATURE_KEYFILE ??= "" diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc index 0d222332..35c61187 100644 --- a/meta/recipes-kernel/linux/linux-custom.inc +++ b/meta/recipes-kernel/linux/linux-custom.inc @@ -148,9 +148,6 @@ PROVIDES += "${RECIPE_PROVIDES}" # Append build profiles DEB_BUILD_PROFILES += "${BUILD_PROFILES}" -# Add dependency to build -kbuildtarget and -native automatically -RDEPENDS:append:cross-profile = " ${BPN}-native" - def get_kernel_arch(d): distro_arch = d.getVar("DISTRO_ARCH") if distro_arch in ["amd64", "i386"]: diff --git a/meta/recipes-kernel/linux/linux-distro.bb b/meta/recipes-kernel/linux/linux-distro.bb index bc43528c..13b8dc7e 100644 --- a/meta/recipes-kernel/linux/linux-distro.bb +++ b/meta/recipes-kernel/linux/linux-distro.bb @@ -10,6 +10,7 @@ python() { for kernel in distro_kernels.split(): d.appendVar('PROVIDES', ' linux-image-' + kernel) d.appendVar('PROVIDES', ' linux-headers-' + kernel) + d.appendVar('PROVIDES', ' linux-kbuild-' + kernel) if d.getVar('KERNEL_IMAGE_PKG'): d.appendVar('PROVIDES', ' ' + d.getVar('KERNEL_IMAGE_PKG')) if d.getVar('KERNEL_HEADERS_PKG'):