From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7366946388798603264 X-Received: by 2002:a05:600c:3b88:b0:419:f4d6:463b with SMTP id 5b1f17b1804b1-41fbcea20b7mr20041535e9.14.1715250871566; 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-Google-Smtp-Source: AGHT+IGMdDfZCNObGcPDencl3WqmjXm0byiG9UureeOIg6v1PoNUp8nB5XW8fjP0moDSiECue+y2 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 Return-Path: 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; 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 Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 202405091034284a3e03d13b486de2eb for ; Thu, 09 May 2024 12:34:28 +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=CHOLXUYKjCPYSecR5vG1qEb+aFadSURsL9V60o7M3Y4=; b=hBAYhxpgQ4WpREHp/WEu/tRfSgRrTQhtwd8W5iTX/tHwz1bEOqK78726iEQg9zMmqdGDOx VMN8sJCsgoHvLj0VU3kqRIIZYf10BuaMdnOBFT2WijcWD1bIYY5/yqaSAW8jJ83d1SbUNMj5 Iqka6FC2FBng7VJ568NmuOGA5JNxs=; From: Adriaan Schmidt 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 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-526363:519-21489:flowmailer X-TUID: wdnYX/P/NVKb 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'): -- 2.39.2