From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7366946388798603264 X-Received: by 2002:a05:6000:d82:b0:351:bc37:c688 with SMTP id ffacd0b85a97d-351bc37c6acmr987222f8f.46.1715573872490; Sun, 12 May 2024 21:17:52 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:6d8f:0:b0:350:3288:860d with SMTP id ffacd0b85a97d-3503288874cls1858268f8f.2.-pod-prod-05-eu; Sun, 12 May 2024 21:17:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGOq6wgUjWzhV1XEXR/CPzEZfwTl51KtwP78/ar4Toj6nUlosUoj9lKJgjQhsLwEp6LIRkW X-Received: by 2002:a5d:6982:0:b0:346:bc1b:4e7c with SMTP id ffacd0b85a97d-3504a73e009mr7043655f8f.35.1715573870225; Sun, 12 May 2024 21:17:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715573870; cv=none; d=google.com; s=arc-20160816; b=Nww+xbtGBysMvlCMhZsQ7QLGweYTgW3M7mWCgsUN8rNSOj49f63zWvJBEExbjwkWIA Ch/6ohCNrdSblym6AwUR0WwPqjeuYZVk+fNBri+k/j0zLhA7YKaUEgIilcYVWgiQVN6x DsjYSJ8Y/25AV80r/lEy/HJI6lpFRe8eYAjs5MPCAxsuoGIlsw/sjjAypcLwYlU2m1ee 5PSlG4wVVebS9R1CarFcjQRMmSlZu6dHJPhzQRwqbw4ScGGP1HMZQ1YeUMAGPWrHk2l8 9caXmXE6Zr+uTHvEfXw3oXzLGgjfPOC8EbQIVLCFUagIzi9RNU0Ci/dFLDOLAiLEG/TK zRQg== 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=D7Kv6jnzMz9uOammiXn8cK36RJICDPy0FxwttYecVcY=; fh=qxj0qH++O2CSqXuHk1zmqR74UpYndUvoWfavR7y1BqY=; b=j3iM2zntas2V1Hr6UViHDOj6RtUzL1hKDhZU/6KLjpIpqEYDmHJylEi+bws5BwaPUn I1OWvZMj36VEtC3VvjryaDjilMcK5oIgqnCH70ENav1VJr4xtjSIq5/2sRAGY1LeNUEL y1hv/4A1h9jW9UM7u2MePEt39oPo2n+GY/83LS5+9hlwpj7YwmgXWuH4Cwm2zAou9q08 rWkCjJsNjBChcbuZjw6G89CGVdlG2kU7/hdK1TDI9yg4G301j0xqIlTZmnI/hUHv/sNV G8qTJobAPR1IeEYuk7Cu44JIyuNacOge6I4mBqNU7UtuVyiWonStcz6I6UhP8bkGMWCh sW9A==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="idlPeM/Y"; spf=pass (google.com: domain of fm-526363-202405130417495260c19a4ccfc0b9c6-z741qa@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-526363-202405130417495260c19a4ccfc0b9c6-z741QA@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: 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 5b1f17b1804b1-41fdfe566easi5052775e9.1.2024.05.12.21.17.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 12 May 2024 21:17:50 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-526363-202405130417495260c19a4ccfc0b9c6-z741qa@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) client-ip=185.136.64.225; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="idlPeM/Y"; spf=pass (google.com: domain of fm-526363-202405130417495260c19a4ccfc0b9c6-z741qa@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-526363-202405130417495260c19a4ccfc0b9c6-z741QA@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 202405130417495260c19a4ccfc0b9c6 for ; Mon, 13 May 2024 06:17:49 +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=D7Kv6jnzMz9uOammiXn8cK36RJICDPy0FxwttYecVcY=; b=idlPeM/YFVq4dnw0qOUI91SzEa0KYlzEIPp/hJoPEtfbHfE51lze++RugNrX6zjF3F/FCM gAgTnm1yBkGdbAanBTCPDbu+93v+3QcWD+4FOBV4V+fvTQQGpMfD9jBetT7ruhgogsq0Ehgp ZAmHaTay2KAs0w25Nut2nuox8ZP4k=; From: Adriaan Schmidt To: isar-users@googlegroups.com Cc: jan.kiszka@siemens.com, stefan-koch@siemens.com, Adriaan Schmidt Subject: [PATCH v3 1/3] module.inc: fix kbuild dependency Date: Mon, 13 May 2024 06:17:45 +0200 Message-Id: <20240513041747.774666-2-adriaan.schmidt@siemens.com> In-Reply-To: <20240513041747.774666-1-adriaan.schmidt@siemens.com> References: <20240513041747.774666-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: 1iJpBImSv+av 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 | 3 ++- meta/recipes-kernel/linux/linux-custom.inc | 3 --- meta/recipes-kernel/linux/linux-distro.bb | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) 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