From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7336105500565569536 X-Received: by 2002:a19:5f51:0:b0:511:81ed:1a53 with SMTP id a17-20020a195f51000000b0051181ed1a53mr2755713lfj.42.1708070172843; Thu, 15 Feb 2024 23:56:12 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:138d:b0:511:4864:dd3d with SMTP id fc13-20020a056512138d00b005114864dd3dls43624lfb.0.-pod-prod-07-eu; Thu, 15 Feb 2024 23:56:11 -0800 (PST) X-Google-Smtp-Source: AGHT+IEGRutSTkzTVhdmpjbhsf/R9ppUfX2HgHCXxpglUSNQ+HLqa5RkTflkBGyL6QN9FgsSRMJA X-Received: by 2002:a05:6512:1589:b0:511:a803:c952 with SMTP id bp9-20020a056512158900b00511a803c952mr3751138lfb.0.1708070170974; Thu, 15 Feb 2024 23:56:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708070170; cv=none; d=google.com; s=arc-20160816; b=Xb+Cxk4RiE1TesYy0LKsGENWFBCNaeFmV6lbiKvsK0pORvnZhwzVhFxKGL0Z4Ziw6P DeqWoOetCxEUmK5ksuIlXFKZE5c5KzsfPv5bbGlakx+rf5RuJG6wy8UB+kDr2LsXpJDR 5U3cUOkj7ZmGbaHFEULuNrdbvoJfcVC4On0LLk4DSNepnWwSReM5VrYpccmpmKh4u0EP UIMRmZm0WLxmHbP3kb1g2XdyR0e8H3FPYvKiqXOCcwcDZv7WcGneUbEfXH0G5zhBQX4j nANnlXsTN3jUDzuRXFp0zwwPG3LEPQtstKkY8iQrREmIhnDuoOng3181lNTIXKZCbgM8 iAfw== 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=GGwGTwR6hLzSmo0UpvaOOIehe1EcGjvDPfLfkrUUyi0=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=nQN44+SwL4F1IprMYUDXfYG5Ud29OCGFjC3eOduohYU6zOcS76hfGESXJObgVoOm4n FNp30z6JeuLbSP9rIzo4Hfnm+04Er5dV6pz67ZU9bI4L4egUHJV7yc9eEKGDswpVQba+ vuiCXZgiLuntp9Emt4PnC91isifmIJR4p9yetvRMFM3L91ou5peJgG4XXtwlcLIYc3J4 E8mtE8hYS9Crs2PE0sinBeunAPGee+WyA5OsvlPlgd20Uk2ggyKrJgHJ/eaCiCkqmwR2 9PzOJyh/hZ9uk0w8hQKPAgFPE3kYSYFBR8sYm0n/wjmmBbqsAgvgypS+X4TaGxc1Vg81 eBHw==; 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 y21-20020a199155000000b00511503f9ab5si206833lfj.13.2024.02.15.23.56.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 Feb 2024 23:56:10 -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 41G7u1SD032162 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 16 Feb 2024 08:56:09 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH 2/3] dpkg-base: Fix SRC_URI:remove ignoring Date: Fri, 16 Feb 2024 09:55:51 +0200 Message-Id: <20240216075552.3468218-3-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: RViahofT9MBG Current SRC_APT filling code results in loosing SRC_URI:remove values. Remove setting SRC_URI value in prior to remove apt:// items with additional variables. Signed-off-by: Anton Mikanovich --- meta/classes/dpkg-base.bbclass | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index a8263046..5f88c805 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -87,15 +87,12 @@ python() { src_uri = (d.getVar('SRC_URI', False) or "").split() prefix = "apt://" - new_src_uri = [] src_apt = [] for u in src_uri: if u.startswith(prefix): src_apt.append(u[len(prefix) :]) - else: - new_src_uri.append(u) + d.setVar('SRC_URI:remove', u) - d.setVar('SRC_URI', ' '.join(new_src_uri)) d.prependVar('SRC_APT', ' '.join(src_apt)) if len(d.getVar('SRC_APT').strip()) > 0: -- 2.34.1