From patchwork Mon May 13 04:17:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 3546 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 13 May 2024 06:18:00 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wr1-f56.google.com (mail-wr1-f56.google.com [209.85.221.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 44D4Hx3N023526 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 13 May 2024 06:18:00 +0200 Received: by mail-wr1-f56.google.com with SMTP id ffacd0b85a97d-34eb54c888csf3148355f8f.3 for ; Sun, 12 May 2024 21:18:00 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1715573873; cv=pass; d=google.com; s=arc-20160816; b=MGea0zvBZv14CnAsVpiorkkN57wpm1mnfV3nX26z4K2rHU7HqzE/sPhspZFPfMaVhl Wuu4US/KBHfEqRgxSQcEXGKgUeCxnDabbDghj4uHRaRh/9XKr+VoJdSo/cFcgJA8Mtpt X+VuvBHKv+IP4tVP0jU8u7k5Jp6vhhlJ6Qg1aW6Qh+FaAFltMyZHdtViRGZ/D7QxWpQR 5OjAy3RXsG6h4/woerh+kyM8tQwDB2qbYMRbM5W+pDLzb6Um5oFJ+vQ+fZJjnAYpzkEG eVFDjoTpxq1JwNGSxPMCF4ZY+T0mIrLTQEc4Ui271t1h52XFGjBPSAlmLcXDe8iq2hNm wTyg== 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=VCKMeYftmB6DZfmCmo87+waHbnTWh6to7FO0Uij10O0=; fh=KDG92ecGuAOQgQMICUiILMZZgnWFdjh+Y2rzO65jNss=; b=kzbl//f3ryWNOuV5q3aQNMWBPR1Ige2ZmRebuIjpBjQmngmH8c5hkkdNDDXROG4fmp HygqLf/sch2qHNPjtNBLIbKaypd+yMT9cO2aII/2XxJ8OLE70NiuiPMsDpTTXK739b6E wYblLXBsRhMrNVcr+L+A8GLUEgpp6WvWLXDhtJ5PfbKDGLiOAOxvP4l9cRZfik77Z7AS gwdd3EErS2381o9G8vA+LsPdmc22fLQGV/w4JF49lSGnht8U769Qy003+b+vlo+cN8nj 0k/eM9KyxxW9r4w37i1DHwlDCEAC8wA6LRoNdSlkey5HEGZ5hK2M8kqP/JiwcZbKpepf 3THA==; darn=isar-build.org ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1715573873; x=1716178673; 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=VCKMeYftmB6DZfmCmo87+waHbnTWh6to7FO0Uij10O0=; b=jm2sgywOAlVN/GUJDeZto9BFWvkDlQPNLSl13rUo2iK7j1L/XPcEYPueAPy2ju8Ejg 2AHhRqJQQHsmoAT4T68YppEG0HKqSe8p8f9HnRJZljP4a1jaSThfOeNAKZWG5fQWnEos 3E7nqqNlOKvYbSAhtQQmiZbwXNObXtQ26g+ZPtgglC7/aoZelgKQ1AW4flgcwXClNtrl fqR7AaWfTPEqiGf6hS3cqAgl2UE2qorn1+cGC/vKw9zPlo6cAGCA4tFrQPlurrOy7vCy TiaklxQNbX3TNfdrpDeJDf5hjSpSh3w54mLqDHVL/MH1BjTQLdmtp+T7J6jsxAOhG8Fp 2K2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715573873; x=1716178673; 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=VCKMeYftmB6DZfmCmo87+waHbnTWh6to7FO0Uij10O0=; b=LdtbgiePdsrmpxnynyp7Vn4qB/76yZKuH9rnOnR65SfDV1l9gerNcpjdcAHpEQtOCN 9PbRUZdF4uYjqb0dXPTZC8ojSi1kHIehWPXYXFoku8DuaGk5rZAatbOvMSLIcvdZsNA+ s/laxB1urm70kdm+n8IF93Ud9gPXn1/QY1H9gR3fEiJhUUx3up2wPjdlQO9iJtsI/R/H VP2ca39qBLmKWPpfgOxIKGq49YLmiNWo2IjhNLDqAGN0fsvWSULtRYj6k3ekSRX5sfQR Cdi5TrnXWVHVFAqsIwbrgOeLtb+bL09QOHt+Jnae8LYDdlk9oai45ZlaVyBDfk1NqjJ7 g9kw== X-Forwarded-Encrypted: i=2; AJvYcCXYQlX04nLgMQZ+NNjcBDoAcrWK7PLo8wOlafJJkYetJTcpk1MJXFWZ8NK28JjEyNoBe5XCD9y0fmlBczXmU7vqziZuQ0o= X-Gm-Message-State: AOJu0YwjsSk4rRwSyuTqELLMZFIpaMK5JXgSFdKIUWAxOpPa0lt2hKQu 6Sujs0ZlJPS6mjggFAIzNyzYhDFKvq8o032anq3Nri+i68RxGeWT X-Google-Smtp-Source: AGHT+IHShD+UcwxlE0LHZYY8CKbiukgnHULgf6KK/i3MJkTRA1e8JJic9dAuEyxI0hrC9B9/wn8YtA== X-Received: by 2002:a5d:6e87:0:b0:34d:a9ff:7ebf with SMTP id ffacd0b85a97d-3504a73725bmr7671861f8f.22.1715573872409; 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-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 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; Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 202405130417495260c19a4ccfc0b9c6 for ; Mon, 13 May 2024 06:17:49 +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 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 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="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 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 | 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'):