From patchwork Thu May 9 10:34:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 3538 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 09 May 2024 12:34:38 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wr1-f61.google.com (mail-wr1-f61.google.com [209.85.221.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 449AYbeF004676 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 9 May 2024 12:34:37 +0200 Received: by mail-wr1-f61.google.com with SMTP id ffacd0b85a97d-34db1830d7csf354064f8f.1 for ; Thu, 09 May 2024 03:34:37 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1715250872; cv=pass; d=google.com; s=arc-20160816; b=LGyP0VEsPKZDQDfvFkn5hyJqSEKMqn/rvvbkQpCZM3wat4GFleEO09KCcEBzz3BjRf uEqG22dvVZ5V6I0oRIipXuOFTEl9mZs3pkJ610KSJ0t0KAGpGcyzmBWU7fw6SwKtVzGm Q7EdEX833T9lcyow7oCqfSPSFpiH5zBfqBLgRuWAxjZBIbEA+tq8hFUuXzyQ6j7RR1fP gGKT+no3g0G0qiw2NXKsAU5NozuQRwSBYxqA6MpxzvWwrrmOfp2daStydwPVMknauBwA ZFNU1egOeemRnEOOlb084MSLE1/oMacJolzpD04kXw+XjJ4V/2lX7xinrQfqAYLgfO8b hLFA== 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=9BtNZdm9jE2AjeiHsFXD2v9NKUyPiyiOcljHus1QcAs=; fh=mIYgniFE1SMaCSHJaR5tdYNPKD1XLeDWvV/IhrWXMB4=; b=c6gwP3SFGmmzmDHAOyz1DvK5lPR+XTYqeEAEuB4/de+k1k7Cy9qBhdqH+b6Ce5x7hn 6AUcShOg3IMpo1Pr6cy7vZ3TRF1B0xYdQ7CUp6TAJZZmyOzjDSqMDkPOEyK2vNSisBS4 x0iluejG9x/L3TvSts1JGVN9rN48C+bST+rgbnL1RSMd4NkQVHnmik4N0TGhNz2XLW2Y 6WMQs5AxgB/MVe/9AD8hvK04b5/JobIlcE3XWr20uSEIhMgQasVz0OziBUuUbk1Hzi/2 30FuXk3zgpjfaZ4HrY/GaipqlrYY0x2S5gWN/ljmeNOA0FX2IZmVPo+Nu8GXJa83ASVy VJxQ==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=hBAYhxpg; spf=pass (google.com: domain of fm-526363-202405091034284a3e03d13b486de2eb-f4fgem@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-526363-202405091034284a3e03d13b486de2eb-f4FgeM@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=1715250872; x=1715855672; 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=9BtNZdm9jE2AjeiHsFXD2v9NKUyPiyiOcljHus1QcAs=; b=NNR1W8/E/Z5wLBqeE45obJJ+ylT637IxOl9pCZutLyKEqy4nvaGtASjprR7d4TQhIj V3l8/Za4aCuOp1pQvxwTC/zwSfFzB0Xbn1WgLNPEWx1lr8iX8+q5HNlrYxbvt1BDwEd2 eyq2vf87ofKVb6l5jB9lHtUHxEdcrTATXPaYeRD0lchosXq8TAOl11+XmXhc2CmLUEwh ccjpDytTGMHx8swDbZHevukcjfq+ZT472+rDZ6cV9L2Kne4gD4JaKChhc/oV4q1ysUII ApoGDuH4nlijQGCUPn66DYPHsanH2yZ206U62DlsqzCdxGPFuT9BwHA5qizjyQ91FRWR eFug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715250872; x=1715855672; 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=9BtNZdm9jE2AjeiHsFXD2v9NKUyPiyiOcljHus1QcAs=; b=l7ws/0yksiDXf5vjUz1U51I7ma0a7ga1KOVl4TPVFfC4d6sIj62ZdIZHBbEacKmrHY HpBBcVxJoOfF3nBRczII+A7OX3vFonQKFFHFQCoO9tEoN6mA+NosnWL6lzu7dHbL6YNQ nUjNKalwjiytSh5PWuW66C9VczbEE8UDxipFothHW+mzFUnSjz++zDWla6IAci0dOFAb 9UiKxSBSHrfXlVQlUmUvU2cG09gPeV8MnQc1sEcPyyz3L89n2jPMJf/uczfZo0MqKMw9 rOWekJCso25RFU9f3AseJ57VdGa20lFWCZf4Jd9p4iJPgZJA59TguRxHvo0979oneeEm 9+vQ== X-Forwarded-Encrypted: i=2; AJvYcCXlFf44BWEqPhJs+BsGhi8WXC4c8Lu0APaRQ43HJzoXbFzwVM1M39cqfP0WMecM4C/rKLt6Kfb2DJOKd6ImMd3DZOX9b/w= X-Gm-Message-State: AOJu0YyT3oJT7hZflurXPo0mB+P5iXsFt8DBZQPTSAE4R189vGseIReA k8Olr6tP/IFF2vM0nZFBYA4jWUm/y/4tZrHsunEXDVF8vJtTyukt X-Google-Smtp-Source: AGHT+IEBDDqELdwrnZYDsKDpIuqMH0hNEjpPvqlrpYEx7YaS49omN9+6geN/PwwPzhKAvCoKxPqz0A== X-Received: by 2002:a5d:6d44:0:b0:34d:13c9:eb52 with SMTP id ffacd0b85a97d-35017fe1bbbmr1917523f8f.3.1715250871391; Thu, 09 May 2024 03:34:31 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:154c:b0:41b:935:24a7 with SMTP id 5b1f17b1804b1-41f7ab8a9c8ls5228415e9.0.-pod-prod-00-eu-canary; Thu, 09 May 2024 03:34:29 -0700 (PDT) X-Received: by 2002:adf:cd89:0:b0:34d:8ed4:ca3b with SMTP id ffacd0b85a97d-350176fb911mr1814442f8f.0.1715250869369; Thu, 09 May 2024 03:34:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715250869; cv=none; d=google.com; s=arc-20160816; b=MuriSrEsloPPggz0knF6yRgh7UBtiSYJIwoUpPoG1CbRS6uhB0xIRPZKWENHU2oLti hm+9D8lNPRVsYlU0injKwbzXa+fHURbviSy2OtkQmHqqNXVPCVgjiyzKIZdm9mDpBARq dKdzjbfirUSyBo6jr6dd4rAH2fkMBpZ6zDNei2TZ596xWsL0th3TEJR04/lRDt0UOZYO BMd29w78+0VFpeKx6R5Ajkjs91ScdF7L0xoKi164KB3X0jggTlqOxhyYc7HVHVgrj0xI UVO5f/KgnDnHLxX/kED2YUUbRPHKrX0kxJr8t4GApehQtiw+rFj8PXtAS144cF89mKKq obkQ== 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=CHOLXUYKjCPYSecR5vG1qEb+aFadSURsL9V60o7M3Y4=; fh=qxj0qH++O2CSqXuHk1zmqR74UpYndUvoWfavR7y1BqY=; b=xXJdJ4H2KFJQ5ZImf91JCbc9oPBsVUSP/AElJg1Zw6CmqGLrZM3jz/j8MMhfAPOYBD MgQytXMogaUDnDE0KgdpQJr9oiSpYnt70w0Mz1MQmrtbnt+9q3kSHT3iRJ8MiisAI17Q PGGHCwTFJHgbdXic5pZGWD2+6OvIHCrifxZ5TfPvy0HMdZeM3c5QsnhLmEVoK9XurQws eOfY4ShyGkXGm7toyptYQ777mvhE2ublKCjadSN6xZwkeiPm8XL1y5thHtDai6BewMkq 8A3gjyO8rcbRWjZ+C5N444pjhmroWBwZUOpGmLnrL6dyR2/LGeTbOGI749m3uDPGl57D b36w==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=hBAYhxpg; spf=pass (google.com: domain of fm-526363-202405091034284a3e03d13b486de2eb-f4fgem@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-526363-202405091034284a3e03d13b486de2eb-f4FgeM@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 ffacd0b85a97d-3502bd15b58si20077f8f.5.2024.05.09.03.34.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 May 2024 03:34:29 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-526363-202405091034284a3e03d13b486de2eb-f4fgem@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 202405091034284a3e03d13b486de2eb for ; Thu, 09 May 2024 12:34:28 +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 1/3] module.inc: fix kbuild dependency Date: Thu, 9 May 2024 12:34:07 +0200 Message-Id: <20240509103409.2762062-2-adriaan.schmidt@siemens.com> In-Reply-To: <20240509103409.2762062-1-adriaan.schmidt@siemens.com> References: <20240509103409.2762062-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=hBAYhxpg; spf=pass (google.com: domain of fm-526363-202405091034284a3e03d13b486de2eb-f4fgem@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-526363-202405091034284a3e03d13b486de2eb-f4FgeM@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/recipes-kernel/linux-module/module.inc | 5 ++++- meta/recipes-kernel/linux/linux-custom.inc | 3 --- meta/recipes-kernel/linux/linux-distro.bb | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/meta/recipes-kernel/linux-module/module.inc b/meta/recipes-kernel/linux-module/module.inc index eddbf177..7d65c96a 100644 --- a/meta/recipes-kernel/linux-module/module.inc +++ b/meta/recipes-kernel/linux-module/module.inc @@ -17,7 +17,10 @@ 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' if bb.utils.to_boolean(d.getVar('ISAR_CROSS_COMPILE')) else ''}" 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'):