From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7286543990069919744 X-Received: by 2002:a2e:8488:0:b0:2b6:cff1:cd1c with SMTP id b8-20020a2e8488000000b002b6cff1cd1cmr18309209ljh.34.1697087810121; Wed, 11 Oct 2023 22:16:50 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:1510:b0:2b9:b171:d776 with SMTP id e16-20020a05651c151000b002b9b171d776ls392249ljf.2.-pod-prod-04-eu; Wed, 11 Oct 2023 22:16:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG4J1zpVJegM2fDGbu067ipxVZoS+f7G/gTb7+9caYcIQXmuOlulayAaXXPp2hfVPAV4h2M X-Received: by 2002:a2e:2c19:0:b0:2bc:db70:b563 with SMTP id s25-20020a2e2c19000000b002bcdb70b563mr17885658ljs.32.1697087808195; Wed, 11 Oct 2023 22:16:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697087808; cv=none; d=google.com; s=arc-20160816; b=y/CNdER3RqNxpvo6k9UH9AG03qoXlTc1bBHarw3Rof5NXaiWPIN3QpKoKXx9wwZ1Ax ahN3VFNd7804Ce7rr63aRPNuQW8sRYGRgWzH6A7vH57Kvlvy87vYtkYGAVNkJcSI9g+6 EDDjayJL1EwDkw6BDtwAGkrvxGSAQsqtZRrrCRwReA84HiyvzPhJJlxxbUexZ8Vewq4l GWP+4J3ZDPp9xBCAjia3c6KK7WOfZWJXF6N/HQ4audH6Sy/LnEN9eo/AOB9Ysb5x9tyU Q8IC1LCipsHCDje/YpjtpxcK7kKI9Ln8pWzBSWBU1JJZO9oZ9Q5cifkq9v8G8a9ZjXnw 5mMg== 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=oMwV7fLMNO6+b1+J7DgRaIeS6HOdhYK0IzT7NJ4piPQ=; b=ngFYhwsUEjd6apTUk+RJTt3Dwsto5m+cqGTVSJIMRs00lBnzVKevpZtLWTyyqkZWJs cOU7UVfkXfXEFCnEMlU9XivOfN8LP7W5qtSGuzJuOd21U4UqyEOQTZUL0j4+L6GcALky 4CgUvNVn88o8LBQPA3gKBTUGvJGY3fZhXQWw6QU7jpO+gz6s+cojDR6cGMqQIMnIC/yi HC+luQLKrKBBBzVWa8MYqclV1vMo0k8DQe+xhuXWPzELKG6HaEBPJNaGzhix3WAx1Tsa xbzQeQoIvsNhisutvDQ/tUDrQKDSrGah/kPNoB75sOVXHMt+wGkjE/3TGvZgIMAi39u8 kL1w== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=fTKSdy6Q; spf=pass (google.com: domain of fm-294854-20231012051648b9f271efc1d23eb24b-5jp3z5@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-20231012051648b9f271efc1d23eb24b-5jP3z5@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net. [185.136.65.225]) by gmr-mx.google.com with ESMTPS id m7-20020a2e8707000000b002c12145a0cbsi656926lji.7.2023.10.11.22.16.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Oct 2023 22:16:48 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-20231012051648b9f271efc1d23eb24b-5jp3z5@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) client-ip=185.136.65.225; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=fTKSdy6Q; spf=pass (google.com: domain of fm-294854-20231012051648b9f271efc1d23eb24b-5jp3z5@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-20231012051648b9f271efc1d23eb24b-5jP3z5@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 20231012051648b9f271efc1d23eb24b for ; Thu, 12 Oct 2023 07:16:48 +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=fTKSdy6QHVzfmO3rsTTFatRgSPYUDKjfjT5dqv1XI0sLbl/ZoqDtg/ykCP6ne19J/8Wgwi Z5FXDKxoaTz2wB9vwHYucQiIQ6qZuZpJigERbKPSfJBBvHqgJ4QOnzQ8lA4FrR/97zEm5aEf hCinvLDxCgiW6IDYfq5D2KHQYreoE=; From: Jan Kiszka To: isar-users Cc: Adriaan Schmidt , Felix Moessbauer , Uladzimir Bely , Cedric Hombourger Subject: [PATCH v3 4/9] multiarch: Downgrade native dependencies when building in emulated environment Date: Thu, 12 Oct 2023 07:16:40 +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: PGQLxAgWjxlF 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