From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7286543990069919744 X-Received: by 2002:a05:600c:2146:b0:401:daf2:2735 with SMTP id v6-20020a05600c214600b00401daf22735mr7414720wml.31.1696606506429; Fri, 06 Oct 2023 08:35:06 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:3c8c:b0:404:7eae:e6cf with SMTP id bg12-20020a05600c3c8c00b004047eaee6cfls1198927wmb.2.-pod-prod-05-eu; Fri, 06 Oct 2023 08:35:04 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGdLwsJvQHL3xSa3enDX3o0VZJ1F0cCI8GzI1QRvmEVNtNBB2vfMcP2/2B8c3DV88bXhJhN X-Received: by 2002:a5d:470a:0:b0:321:4ab6:9b28 with SMTP id y10-20020a5d470a000000b003214ab69b28mr7577173wrq.16.1696606504330; Fri, 06 Oct 2023 08:35:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696606504; cv=none; d=google.com; s=arc-20160816; b=bFQKYn8NQUXCFQoJegnN3/n+HQ4xrx6JXCQwTjUsy/EBWhlS548OVkeJZDD7Uy6gqh 3c6rmFgBrZvzhhrzi8U1tCYpsGfqUf0Q3bvCWh/88JltbRix7B+Xy/5VgQC2rGMzijrF V3dZhN+bc2OGfFS+CuWUhO9cVIecYay6O8jCtZiKvS/XgtKD+0QDDfrcedYOeLKWjzxY fxbzy9UsuiSlb+5TYHXYCM4Nf33ptEpKwOpRvV8nS2sFnLix7Lr7uBEiGzYAtHux5j7Y gSfIZDeZAJg9TYX4oq1zmGX9OneGN09gG52LV0W5kgkJRicYLB+w8GRbirCJWdCUp4EJ 1xSg== 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=sKo79afTPAHma6bc+HbgmCLq3XsAaIqPe5mgkqo6v96F+WyXwJ2enS4ZMQs7N0ipus zGwcMTlhfaSpXxXs1prD2R+pQ9Ix1u77DfgQ2MfnGKm+MqSOifhRPHtxyktLvpYYRU1C P2CjSEvDeBVrfyo0uVWGkH8nNofIdUpqVF6UKizSr2uVuYDaNFCUWoBwXuF9zOD/pmic Fy57sJGtHCAn2KztBM2SYisXDios0zOJdYDpt9zslb19WYbra8+HfbBw4U/1FCxSl4id e8UxenLELoaaqkghBNZ30EycrLtgS2Ulgb7FxSs8bO/jvPLhk67ToZ70u7dk3cCCDFeR J7hg== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=gWuTnpkL; spf=pass (google.com: domain of fm-294854-20231006153503ef100c172a236ae03e-ktzwaw@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-20231006153503ef100c172a236ae03e-kTzWAW@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net. [185.136.65.226]) by gmr-mx.google.com with ESMTPS id h12-20020a05600016cc00b003233224954esi83721wrf.6.2023.10.06.08.35.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Oct 2023 08:35:04 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-20231006153503ef100c172a236ae03e-ktzwaw@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=gWuTnpkL; spf=pass (google.com: domain of fm-294854-20231006153503ef100c172a236ae03e-ktzwaw@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-20231006153503ef100c172a236ae03e-kTzWAW@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 20231006153503ef100c172a236ae03e for ; Fri, 06 Oct 2023 17:35: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=gWuTnpkLOVbicSBImx+nOnViaOg9SkZycljKWq8Id3yUcfYis4R7AsfSAC0+utbGkykh2w qOeTY5LgZ6BZlnuaPp+OiURt9vYl3/KJv9RCCA60r3/zUBrQ+PYizM3C6t1xgN5jHK8hLYN/ doUTeRIz+gDX6YJLpk1TeGLLLStYQ=; From: Jan Kiszka To: isar-users Cc: Adriaan Schmidt , Felix Moessbauer , Uladzimir Bely , Cedric Hombourger Subject: [PATCH v2 4/9] multiarch: Downgrade native dependencies when building in emulated environment Date: Fri, 6 Oct 2023 17:34:57 +0200 Message-Id: <7719e411f270ffa38eef3cf8eb363223b53e43d5.1696606502.git.jan.kiszka@siemens.com> 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: bsIUqBHkTLHY 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