From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7336105500565569536 X-Received: by 2002:aa7:c655:0:b0:561:548e:e4c4 with SMTP id z21-20020aa7c655000000b00561548ee4c4mr3807375edr.19.1708092665422; Fri, 16 Feb 2024 06:11:05 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:448f:b0:561:c6e8:bf02 with SMTP id er15-20020a056402448f00b00561c6e8bf02ls152951edb.2.-pod-prod-03-eu; Fri, 16 Feb 2024 06:11:03 -0800 (PST) X-Google-Smtp-Source: AGHT+IHobQjaseyosnYiiOh815wDSHGXiZ8qCOEj4QTEMmYNq3OQFsPZrLC2f4oiTmhOCRw6Jti5 X-Received: by 2002:a17:906:855:b0:a3c:d5b2:f53 with SMTP id f21-20020a170906085500b00a3cd5b20f53mr3267188ejd.15.1708092663337; Fri, 16 Feb 2024 06:11:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708092663; cv=none; d=google.com; s=arc-20160816; b=QZ04uQXwQK4d5ztRta/7K31GHnxrAuyRJo0sCj8nLBPzxdlvKc5gGsG7DXBR+Tbnez eACWpUB5JIPwupoSWg88KWPhsbcTjnqm1F6PKn1fNRqkldoW+nenLE9cMlNc0ITbW1HL V8rkY5RzNZ3WOszSohgEdW0Gjt/Utkv3efW+rjyCsdG0u9eE3JOsPjo/WD+8zyTOKZt5 8LYZCMCi4ftQBMg8ngn+oP8HXOSCDqvf63WqzmEfKg87IRG53ldMKcm9rpZk0/i2VEDL 17PcypEbjLCtJAppx7QLZKzinbWzHlGmToXNr5kvM+wnRLET9McCsd1iiu/bImZIExa2 WCJw== 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=Owdltl07i97FW4IZMWSKE5nBLURN48FAb7y6DqR7eDE=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=zJc7Jq0WrCzo8CnJF9vQxLxcq2eJtt6GZx/K2AAulHAFJcTIWGaj9FQAcbD90OToyI pEJ9Y2rXDqi2JtPj9maVKYckZ2uOx+rGJvg9JrRsnQ/xTQ+KvKq4DJf9LmUjljTstDS2 HZNJuuaDNH1y+mnQZ5XpEVAH92J13YNYHHG4LHvvMHQ/n8N9zu8B3nPHN7VfCOoEToE2 1atKTUGDR6UF3wX7/VVhVw0oz2v9G2ic9ZaBGUOloNWZaCemYnxUV8xbzZvnAf7mh98h dU2XqM6K6jQ2/X1fqbhn7ziRxe9af7ElC+SpEJaVxIyUfU2CmnJzHkb4pa/BHUW2van9 vRwA==; 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 qf11-20020a1709077f0b00b00a3ddbfe5347si49807ejc.2.2024.02.16.06.11.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 16 Feb 2024 06:11:03 -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 41GEAvi3001330 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 16 Feb 2024 15:11:02 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v2 4/4] multiarch: Fix SRC_URI:remove ignoring Date: Fri, 16 Feb 2024 16:10:51 +0200 Message-Id: <20240216141051.3490109-5-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240216141051.3490109-1-amikan@ilbers.de> References: <20240216141051.3490109-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: +OeV+MnhoxJd 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..b3fc9441 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