From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7336105500565569536 X-Received: by 2002:a05:6512:1024:b0:511:87b7:6d88 with SMTP id r4-20020a056512102400b0051187b76d88mr3044307lfr.32.1708070174034; Thu, 15 Feb 2024 23:56:14 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3c87:b0:511:79ee:feb4 with SMTP id h7-20020a0565123c8700b0051179eefeb4ls259122lfv.0.-pod-prod-04-eu; Thu, 15 Feb 2024 23:56:12 -0800 (PST) X-Google-Smtp-Source: AGHT+IFzXJKawddtw+yYq0d3zAAxbFjVQstw7TPm8aEwgPN+GV/87Pui4g6miK3q2abs7smRukfy X-Received: by 2002:a2e:9217:0:b0:2d0:dfa6:2b3f with SMTP id k23-20020a2e9217000000b002d0dfa62b3fmr3292992ljg.1.1708070171887; Thu, 15 Feb 2024 23:56:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708070171; cv=none; d=google.com; s=arc-20160816; b=mVSg3rbh7O5Jsx2TIcBwZgUpVyEddYxcivpp2kHh48S8jHZ/4GNJeSmc8I/JCW0gVO ucElsG45AIclw3kYT8lpMt0Xyqq/bPmgkBVM51kHyyLqjWZ5YfXdg0ortQy528G2aVTX RtlI0nlYE2+jncUZOMwMRv0V6M+d7tVtGy6WbsBlCaH9EttKB6M6otj8fruXyxXgESFn QCU2GKCa6QmpQyQM/Ew5mqIIipp07oEsL968JyShLwg4fhlR4UimHTHC1emPf82Geboj I6raCTm7X2R0VMXeNeKj1RFPeQx6E1oxSLTIlSztfFjBVWbzlKPgPb1ZZ+88EigNNnDA 8KQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=J/YeFphpjQRkOtjWrCuosaX/ofzthbO6U/I33JtOg1s=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=OZQk98xq2rJbWkFeYIdjruB/3vnBEsnfLyu/6ZC/11xvzD0JSo6JVC98jtpS1ES/AA VxRHBB0BJSgRT91EAIkYCGSUDWYACgbsx86j3nwkO15MhGCWHsAfoDIRm4+z2X8FBJGb 2sVS5hW8PZ3kEYds3yX2xYf3MUFtFPihqgAtXQIszbuLaOu9XHDJZc2Bq5ToXBMtzWmU 6y2aEpyFss9tBoN924UNGIdKArfhHu9YoW/d0iUwKzWaRk6mLdLrRlS5Hq/tCu88qrr+ /JiZuPtyW4Vtwh+nZKMoW6WIokYezkYfE+d35V7tg5Zcj0QvgtWDn2eKQf1YGxjKxTGM cB/g==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id b17-20020a2e8951000000b002d0f87fb1c4si140055ljk.1.2024.02.15.23.56.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 Feb 2024 23:56:11 -0800 (PST) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from user-B660.promwad.corp ([159.148.83.123]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 41G7u1SE032162 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 16 Feb 2024 08:56:10 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH 3/3] multiarch: Fix SRC_URI:remove ignoring Date: Fri, 16 Feb 2024 09:55:52 +0200 Message-Id: <20240216075552.3468218-4-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240216075552.3468218-1-amikan@ilbers.de> References: <20240216075552.3468218-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED 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: lJZfg+G/M+fx Setting SRC_URI right after getVar with expand=False results in loosing SRC_URI:remove values. Rebuild logic to use remove-append approach. Signed-off-by: Anton Mikanovich --- meta/classes/multiarch.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/classes/multiarch.bbclass b/meta/classes/multiarch.bbclass index 48cec9ab..0feb2f76 100644 --- a/meta/classes/multiarch.bbclass +++ b/meta/classes/multiarch.bbclass @@ -49,8 +49,9 @@ python multiarch_virtclass_handler() { vars = 'SRC_URI FILESPATH'.split() for var in vars: v = d.getVar(var, expand=False) - if v is not None: - d.setVar(var, v.replace('${PN}', '${BPN}')) + if v is not None and '${PN}' in v: + d.setVar(var + ':remove', v) + d.appendVar(var, ' ' + v.replace('${PN}', '${BPN}')) # When building compat/native, the corresponding suffix needs to be # propagated to all bitbake dependency definitions. -- 2.34.1