From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7366946388798603264 X-Received: by 2002:a50:cd13:0:b0:572:51fb:5571 with SMTP id 4fb4d7f45d1cf-5734d59d65cmr1385544a12.5.1715337420889; 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-Google-Smtp-Source: AGHT+IHVTRhWpqo7IzQkg4ED620r2Q+Gna+k68E/r/ZXnLHKVkp5WYoMJuzfHKREVKljCaNFSsYS 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 Return-Path: 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; 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 Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 202405101036588c6ad7053be51bca7b for ; Fri, 10 May 2024 12:36:58 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=adriaan.schmidt@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=zFYva5G8P843Vbh2b/VgJDMY5eRTZN1Oav0/g2FBqc8=; b=FyLsV2ekRjG/klMUv+lPXzBIxFtaUE739bXRZI90yNCuUlPHsdjy5FURGsHQ7yC09AkNd2 M2fNblNY/+eKlUQeYxmc/EsMZQPe0RfuXTFyVKWxwzlqhXWbCeICotj4dormYHSud5qjbjHt sRlnjYfn7iKuvMNkDttuv16+/x0kI=; From: Adriaan Schmidt 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 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-526363:519-21489:flowmailer X-TUID: eqIz92004qRs 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'): -- 2.39.2