From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7286543990069919744 X-Received: by 2002:a19:a414:0:b0:502:a55b:c2d7 with SMTP id q20-20020a19a414000000b00502a55bc2d7mr5383809lfc.60.1696530727809; Thu, 05 Oct 2023 11:32:07 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:5b46:0:b0:503:c44:8e88 with SMTP id i6-20020ac25b46000000b005030c448e88ls699233lfp.0.-pod-prod-08-eu; Thu, 05 Oct 2023 11:32:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFpobUy7aOsZ0cjIx5W+zlI847Um7jpxd9c905D+8QHaAb/FE+I4tWPqtwU1S9nwQdOoqOW X-Received: by 2002:a05:6512:ac8:b0:503:654:cf27 with SMTP id n8-20020a0565120ac800b005030654cf27mr6241927lfu.28.1696530725592; Thu, 05 Oct 2023 11:32:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696530725; cv=none; d=google.com; s=arc-20160816; b=x+DNPbziTVPB4owYzAcwdLcnP7ewFt0LeyWYrmzaWeB/7taIzKsiGKkf3n787Sp/84 f11tUp1iL4Ziw52ogCzd5M87oG3g9TlJOFuRVzhMCw5qTFwOai43HrNT/nnqqJPkCfi4 AWhOy8GJsE5a7JQ08W5Xr4/tHEI0Ra//Xd+Vwz1Lh7PyfaA2VJc5y+KXJMR/Gw2WgAYS FwBNvtHiMcexZ0tXlp+UTryzxZFPPyb4i6DRGWdkwaYUk6al3mESDJGMSDItQqN6cMz6 Kq49yDSQSGiDmcP/pg6Ddy43KqLw4syfTXphym5+zbWffgjGOkxv9gG+Gx7yP5Eu8y07 c+vQ== 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=HKsuZSLVxyLpyU/KLRBFhHGgQN3YHJOSSPnWacGV0JM=; fh=yRqbW8O3aFmOjK/UFxR7KoBHXIp/B4yCBNXRNY5QpV8=; b=j6+84QyzHnEyifxuvVgKeGnSs7pNNtaLKtC9AJq5iGlOeIDjKIWZ2nlIWoSCtKkRBa KU4TF+WHFWug3MGnWaxH19s3PHnVLiHns3Mmev8ystwf5k5rQ0tgzl2HZf9NPvCrZN0B WF7OvgRJTVEv3H8rLfTIZZsF2rlja2DxRTI0NypTLZljSTzvRphpLtR7Wmm2d6gk4gI7 ZE2G5MsGvqWtS0QDF5wYPvqabYQXODEePm6W1fM3qcTnOvAObv8mxab4dykyShmAWe+V 7IRhhvKuMcyuu59nK+ikThHjEfnKPmI06ScxcqqX47vC6dlLQUse2DHtDSTZvr3hhILv NrKQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=EJixKH+U; spf=pass (google.com: domain of fm-294854-202310051832043f4a9e66bfca498d0c-fo0mer@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-294854-202310051832043f4a9e66bfca498d0c-fO0MeR@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net. [185.136.65.227]) by gmr-mx.google.com with ESMTPS id j14-20020a056512344e00b0050338083127si128384lfr.12.2023.10.05.11.32.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Oct 2023 11:32:05 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-202310051832043f4a9e66bfca498d0c-fo0mer@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) client-ip=185.136.65.227; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=EJixKH+U; spf=pass (google.com: domain of fm-294854-202310051832043f4a9e66bfca498d0c-fo0mer@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-294854-202310051832043f4a9e66bfca498d0c-fO0MeR@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 202310051832043f4a9e66bfca498d0c for ; Thu, 05 Oct 2023 20:32:04 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=HKsuZSLVxyLpyU/KLRBFhHGgQN3YHJOSSPnWacGV0JM=; b=EJixKH+UoUM4qxnsdm5Ilyd3faLQ2KvEp3rgnKkF5LChKB/7WCtu2DTpR4NLZsmQ6V2mlA h3ZtkIuDG7LgzyVb2+7sUWzaJIM5S5JWtRa8/mKpmG8bqCNDxJqSKUV3DmhpXbVXwArwkHjn YxASM5gqPOx18rNYeJ3vsGP4MCkzs=; From: Jan Kiszka To: isar-users Cc: Adriaan Schmidt , Felix Moessbauer , Uladzimir Bely Subject: [PATCH 2/7] multiarch: Downgrade native dependencies when building in emulated environment Date: Thu, 5 Oct 2023 20:31:58 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-TUID: 6mtBcEOBnwG3 From: Jan Kiszka When a package that has -native build dependencies is forced into non-cross building using qemu-user (ie. build arch != distro arch), its dependency installation will generally fail. That is because somedep-native will build somedep for the builder arch, not for the distro arch that is needed during native builds. Address that automatically by downgrading any such recipe dependency by stripping for '-native'. Signed-off-by: Jan Kiszka --- meta/classes/multiarch.bbclass | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/meta/classes/multiarch.bbclass b/meta/classes/multiarch.bbclass index c1846ab0..48cec9ab 100644 --- a/meta/classes/multiarch.bbclass +++ b/meta/classes/multiarch.bbclass @@ -21,6 +21,18 @@ python() { d.appendVar('PROVIDES', f' {pn}-native') else: d.appendVar('BBCLASSEXTEND', ' native') + + # drop own -native build dependencies at recipe level if building natively + # and not for the builder architecture + depends = d.getVar('DEPENDS') + if depends is not None and d.getVar('HOST_ARCH') != d.getVar('DISTRO_ARCH') \ + and d.getVar('ISAR_CROSS_COMPILE') != '1': + new_deps = [] + for dep in depends.split(): + if dep.endswith('-native'): + dep = dep[:-7] + new_deps.append(dep) + d.setVar('DEPENDS', ' '.join(new_deps)) } python multiarch_virtclass_handler() { -- 2.35.3