From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 20 Aug 2025 14:42:14 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f57.google.com (mail-lf1-f57.google.com [209.85.167.57]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 57KCgDDU030253 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 20 Aug 2025 14:42:13 +0200 Received: by mail-lf1-f57.google.com with SMTP id 2adb3069b0e04-55ce50a248esf3432758e87.0 for ; Wed, 20 Aug 2025 05:42:13 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1755693728; cv=pass; d=google.com; s=arc-20240605; b=XTa1s1lDxcwymalWtwqPfZ5KXR1R8B0q9dRQT7ni7iUR/fa5Lm6B+k7ej+9bI97pHt uBLadVoa+cIjDs1RxPZZ1TesHdHpHVetrlPN3eSpea7Fk2YmtvXCwA+G+CGKGt1m/Rsk PRjzV7NwdwgW2WuAzk30uBLp2WvwxlYRB5J1g7Kp1VRacSu5b4HtWbvfl6jcZIaI1Wc2 QpZiKhXRFG2AgRaKCHG3zMD3vyFVEjTPZiNwtuJsy8znor55Vb1GKi2hB5MoCsMGKGBT AkpiEBQYbGC7RH9AkwUNhsBYQ7TsjqOos6D+ade4P1v05/DUhRNLKBxfb7/nBc7p6yvh QqOg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=ub87eTgQIJktMdK9yD0YmwvKgpOfdV+PiUHFgS6ezqQ=; fh=iZm/7KpRKD6ATUdCNgXcYq2PgQLkifjjCQlz6LATUW4=; b=MkxlA4a2p/Z3CskCH6AdZGB9IueocTrdmHSEQ5oBrUBf2s5PwAK8mgRL1ZqzLlqKGt DD8esYw6xuluBkEMUArkt4wNvGF51PzqVTqF5QH7o0CeYs5p9f2Nc0eL2w5osBi/CN8i CQt0c5lMw+6MaOs89PxKMBkwE8MNLk8O0T9ToJE8vdGagQMzhTq0xXFM1CdBGkyAtWzj h4YuTBpzwr3+emnAojg63S9BPezxrTfZNcnso9qjSx1SblFw06iY+X0+8DBP18HOYQr+ OR3VTt9lSAwvmPh/tcmkatVfuOO5yAPaVgQuRRp8ybYPt+pZLLkyC51yqYCr2qwQwReD zBBA==; darn=ilbers.de ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=a+q1jVp+; spf=pass (google.com: domain of fm-1321639-2025082012420189e0e330f2f82afc06-oxxehb@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-1321639-2025082012420189e0e330f2f82afc06-OXXehb@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=1755693728; x=1756298528; darn=ilbers.de; 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=ub87eTgQIJktMdK9yD0YmwvKgpOfdV+PiUHFgS6ezqQ=; b=jYM6ANedxKumKtZmK3JC6xqrE0BBjN5vI/u29mhyh54qDlvu39imDY3gSBz2x/56nD YoHXUJ0Wj/Yo8d43OjX1XiHp4XhbRy0LJxCp9Lb06Q7So7kYOhSPpTfEWBjXY3JQQL7y 6gzH1ldpDtDKHuw2EI0xoAih5XwluGuST2oeYESw6V8i6WP+rPEThQ3pLHK8Qd6EU4kq l4KjPO8qRCa8BHHYv8qSR8ncGAl/nhr4NaqbS0/NjlFRA8Ip/r/lCs9Lt0QX+BKW9yVd fSP5VBOZ73FWqxdOFGOuYKT2s2JpoXFP4mF9hLzgNDYHo0kwy0ojVJYfGYe8AEsu9tgl M1XA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755693728; x=1756298528; 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=ub87eTgQIJktMdK9yD0YmwvKgpOfdV+PiUHFgS6ezqQ=; b=LktMgoS/KBjc7CqJ8kE3LbNtlBve8LxDrkIMXfGf9lTFWVJlzj8Ek8kteta3q555a4 g600sHeiy17+nN5AgN1TcGVhY42+6fNFl99xtZZ0ItHZ0wLka/NtR98o/oS7Cd0sLpsw l+wBcEAr60JhrkqNwKbVvD8lEHJal1Y2bTNV1eHuKzLduxIAosnv95Ybm5fH9JKsbi6N wSOem5EEnl8c+p+zP+k8CyXuTMATGrBdpgGyiCApW4LP72DUIEJRsNcc/YDl1og4oez8 mCk0HDs+3otZq6ub+eNto9vJLAtbSv6XleZEZDU1SPYr5ElYZCj37zH04UAhKOUGVass YFTw== X-Forwarded-Encrypted: i=2; AJvYcCUMtpB04IfsR/YyX24RLvfadBxHXAAEP5612unF90iL3qn0viWaw0iDcgTZoO3hPZde984M@ilbers.de X-Gm-Message-State: AOJu0Yx6Z4KHisg8sh6mMzyExFacW/yU4mDuG999RQdrOGyTBCJOX5Js rxzN2CJrpG4126QC7eRpRpXT5SLds7k41JY9b0ehB5dqdul7q3DwPvNM X-Google-Smtp-Source: AGHT+IFAaNGiCHw2sJ5hSB3d7z2OjYIgNMUUuxNn7GSNGiX+QDVTezlGJrtyCX5MdXnwL1QA31cRmg== X-Received: by 2002:ac2:4cb1:0:b0:55b:760d:c2f5 with SMTP id 2adb3069b0e04-55e06bd3618mr640509e87.33.1755693727153; Wed, 20 Aug 2025 05:42:07 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=AZMbMZctvPrA5YlZH/2+WKyOSfFqOaPfuasQz/sZ6NGoMpTpEw== Received: by 2002:a05:6512:b8d:b0:553:d125:e081 with SMTP id 2adb3069b0e04-55ce4b34b69ls2111798e87.2.-pod-prod-03-eu; Wed, 20 Aug 2025 05:42:03 -0700 (PDT) X-Received: by 2002:a05:6512:6ca:b0:55b:81cb:9e5d with SMTP id 2adb3069b0e04-55e06c210c0mr771871e87.52.1755693722848; Wed, 20 Aug 2025 05:42:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1755693722; cv=none; d=google.com; s=arc-20240605; b=bTSx+ldO1ZK5IGIyzkAEYgUFtw75A07ONkuV4ma4igxa/N+6Ry50a4FQn6x9Gwwaeo fW1dMFdEzj7CkdRNezr9CfHyWK98sqcsKDT+kLKeQzfdDKW9mAxFYMOMtFcAdRpPlNpO nZjVmjLL0yPB/0LyEfE2uTKVqLHEDw6d6o9kQQT1nen80s+fDna+R+XHxHSF9qdR3iO3 y05Xrh8kJ80EcNvjxk7KV3XBLzBy4bUoSBVwzmefC2n4rgvkM82+Ujm7bqJrGbBc0R/q 3/dYg1wpBWny22bRts4H2nHCHf2gCdZYIKSAwf2n1ahmqzyd0FpA1KzsqwkTyINEfNEL PecA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=5PWWcyG+0NPK7I1rF9dK5uV4fADyqmdwuy2XT4rc0Tg=; fh=9W54SAuVNVfrUAv2wiLSiKfHy84Glsc+UnTBkn/gxws=; b=clwz400RksaPxQs4BvC+CXSJf1AWOu6BpE0TxPFartDwrGLc7TI3XYREEJG81RicIt ycqkDbrLtFD1t8ZfjYhB3/ObCEboDZ+y8R3l6FqOgE/A+mcAL0RyylSDJG0aP+dii2ZB kRhhXFhZPjd9feEZycP8GMTsxPCOhewmiHp3T+OAnEy/wolEB4BDRLKpyJWWMtZAidQ0 h5KvLRnUrcJ5D7K5ekvjoi7FcxZNZPZsSbvMZL3XGHoDh8Vps13N83ymmJc9HjEyHxqF rNGEXa9nHiu2Txj2LnYswM3blrOWGICdh7BlOG1O+EknudBLamV84mDYEFxOiqmAQEqW xPIw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=a+q1jVp+; spf=pass (google.com: domain of fm-1321639-2025082012420189e0e330f2f82afc06-oxxehb@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-1321639-2025082012420189e0e330f2f82afc06-OXXehb@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net. [185.136.64.227]) by gmr-mx.google.com with ESMTPS id 38308e7fff4ca-3340a383a53si2785341fa.1.2025.08.20.05.42.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Aug 2025 05:42:02 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1321639-2025082012420189e0e330f2f82afc06-oxxehb@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) client-ip=185.136.64.227; Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 2025082012420189e0e330f2f82afc06 for ; Wed, 20 Aug 2025 14:42:01 +0200 From: "'Felix Moessbauer' via isar-users" To: isar-users@googlegroups.com Cc: jan.kiszka@siemens.com, cedric.hombourger@siemens.com, adriaan.schmidt@siemens.com, christoph.steiger@siemens.com, Felix Moessbauer Subject: [PATCH 2/2] handle DPKG_ARCH=all case for transitive deps Date: Wed, 20 Aug 2025 14:41:40 +0200 Message-ID: <20250820124140.281190-3-felix.moessbauer@siemens.com> In-Reply-To: <20250820124140.281190-1-felix.moessbauer@siemens.com> References: <20250820124140.281190-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1321639:519-21489:flowmailer X-Original-Sender: felix.moessbauer@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=a+q1jVp+; spf=pass (google.com: domain of fm-1321639-2025082012420189e0e330f2f82afc06-oxxehb@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-1321639-2025082012420189e0e330f2f82afc06-OXXehb@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Felix Moessbauer Reply-To: Felix Moessbauer Content-Type: text/plain; charset="UTF-8" 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=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,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-TUID: 6pHWSL5IIdvI Arch=all packages might build depend on other arch=all packages, hence we need to correctly model the dependency chain. Otherwise the transitive dependencies are built for the distro arch instead of the native arch. We implement this by dispatching the non-native variant of DPKG_ARCH=all packages to the -native variant by adding a dependency. We further replace the non-native do_deploy_dep task with a noop to preserve the dependency chain. Co-developed-by: Adriaan Schmidt Signed-off-by: Felix Moessbauer --- meta/classes/multiarch.bbclass | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/meta/classes/multiarch.bbclass b/meta/classes/multiarch.bbclass index babdfbd4..c2bba21f 100644 --- a/meta/classes/multiarch.bbclass +++ b/meta/classes/multiarch.bbclass @@ -29,7 +29,11 @@ python() { d.appendVar('BBCLASSEXTEND', ' compat') # build native separately only when it differs from the target variant - if not archIsAll and archDiffers: + # We must not short-circuit for DPKG_ARCH=all packages, as they might + # have transitive dependencies which need to be built for -native. + # This special handling for DPKG_ARCH=all packages is left to the + # multiarch_virtclass_handler + if archDiffers: d.appendVar('BBCLASSEXTEND', ' native') else: extend_provides(pn, 'native', d) @@ -86,6 +90,8 @@ python multiarch_virtclass_handler() { d.setVar(var, ' '.join(multiarch_var)) pn = e.data.getVar('PN') + archDiffers = d.getVar('HOST_ARCH') != d.getVar('DISTRO_ARCH') + archIsAll = d.getVar('DPKG_ARCH') == 'all' if pn.endswith('-compat'): e.data.setVar('BPN', pn[:-len('-compat')]) e.data.appendVar('OVERRIDES', ':class-compat') @@ -96,6 +102,16 @@ python multiarch_virtclass_handler() { e.data.appendVar('OVERRIDES', ':class-native') fixup_pn_in_vars(e.data) fixup_depends('-native', e.data) + elif archIsAll and archDiffers: + # Arch=all packages might build depend on other arch=all packages, + # hence we need to correctly model the dependency chain. + # We implement this by dispatching the non-native variant to the -native + # variant by adding a dependency. We further replace the non-native + # do_deploy_dep task with a noop to preserve the dependency chain. + e.data.setVar('do_deploy_deb', '') + bb.build.deltask('deploy_deb', e.data) + bb.build.addtask('deploy_deb', 'do_build', '', e.data) + e.data.setVarFlag('do_deploy_deb', 'depends', f'{pn}-native:do_deploy_deb') } addhandler multiarch_virtclass_handler multiarch_virtclass_handler[eventmask] = "bb.event.RecipePreFinalise" -- 2.50.1 -- You received this message because you are subscribed to the Google Groups "isar-users" group. To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com. To view this discussion visit https://groups.google.com/d/msgid/isar-users/20250820124140.281190-3-felix.moessbauer%40siemens.com.