From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7000667036615442432 X-Received: by 2002:a7b:c4c2:: with SMTP id g2mr2696147wmk.134.1629969812115; Thu, 26 Aug 2021 02:23:32 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:a50c:: with SMTP id i12ls1110557wrb.0.gmail; Thu, 26 Aug 2021 02:23:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz3LrdArgus9caUrwaTTdqzzs/1SNZFu80O/vSPugqfpPIHPbQ3MbOnHEAgOy9u/kj42pWV X-Received: by 2002:a5d:5642:: with SMTP id j2mr2697951wrw.264.1629969811112; Thu, 26 Aug 2021 02:23:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629969811; cv=none; d=google.com; s=arc-20160816; b=t2DWcsUk+AaJobm34AX08LpjnD6zIbrD6Nm0ShqHaXKrhP6noxiTQSmvvU2tahLe8M zf0ESMEFTuPZJy/B67I0P9/kl/7T/XlZvr80bslB+KGpgKHJvECD1nejEo9wHaa+YOmL IeCNGcLC4pmYtUQXAVUb+TqfzcnmPYxjjT7C4ArdYgVydyeAVCWB/fxUXvzQ/0nfnF2u ZeiIQxKQtQyOFwD6eGVkwNgqFRn6bvN8siSseGku1cpyJmZZWqAUCbit8/lOMhCYfFCt dYJCdtEUSUmZ69y8bjs76f4OGsw+W3Be13UlqYrR3+qo9hBVLFtLBd3t9X9qpis460C5 KnpA== 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=fxWWSy3tDkEalUNxPcYOLApOoTLSvyY9buiBZZ3xU+U=; b=M8r7Emou/fuhDSwUDm0pd9BY+iXIlLho6F+UrbbJdMZL6fiku5VQWlECdiaReJtTqi VyvdVoPajFYLiP6LvOp36WK92TBSza7hLBku5wzBxdqI0X4cA5VPMAW0qySuIrgIHLKW 2sVzAJGj/ommWCFTf6J5W5TbuYf3uuzMvE1LmT1jhJTCESKX00imLU71wJxzc9BrLBuO 94EeR4u+bA1ufBxMHBypaq0OwTMNfgT2njEkq66q+Rh+pNGbEK3ZoVEdYj+tvK+9Cek3 LqX5tTcFT0Gs+65h4yPu2sfHoS3KDT4PImPAiJnGZUorW/OjHdn6+YxC6JgHoyDyMZ2T JIAg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id i4si141456wrc.3.2021.08.26.02.23.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Aug 2021 02:23:31 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 17Q9NU8F024438 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 26 Aug 2021 11:23:30 +0200 Received: from md1f2u6c.ad001.siemens.net ([167.87.32.3]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 17Q9NT71029232; Thu, 26 Aug 2021 11:23:30 +0200 From: Jan Kiszka To: isar-users Cc: Henning Schild Subject: [PATCH 1/2] base: Move SRC_ATP extraction/filtering to dpkg-base class Date: Thu, 26 Aug 2021 11:23:28 +0200 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: bwmEqQuE6PPO From: Jan Kiszka apt:// SRC_URI entries only make sense for dpkg recipes. So move the filtering over so that any attempt to use it for other types or recipes is detected early and that related code is located in the same classes.s Drop redundant expand=True from getVar at this chance. It's default. Signed-off-by: Jan Kiszka --- meta/classes/base.bbclass | 19 ------------------- meta/classes/dpkg-base.bbclass | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index b7de921..72d4cc0 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -138,25 +138,6 @@ def isar_export_proxies(d): return bb.utils.export_proxies(d) -# filter out all "apt://" URIs out of SRC_URI and stick them into SRC_APT -python() { - src_uri = (d.getVar('SRC_URI', True) or "").split() - if len(src_uri) == 0: - return - - 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', ' '.join(new_src_uri)) - d.prependVar('SRC_APT', ' '.join(src_apt)) -} - do_fetch[dirs] = "${DL_DIR}" do_fetch[file-checksums] = "${@bb.fetch.get_checksum_file_list(d)}" do_fetch[vardeps] += "SRCREV" diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 8286168..1cac68b 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -73,6 +73,25 @@ addtask patch after do_adjust_git before do_dpkg_build SRC_APT ?= "" +# filter out all "apt://" URIs out of SRC_URI and stick them into SRC_APT +python() { + src_uri = (d.getVar('SRC_URI') or "").split() + if len(src_uri) == 0: + return + + 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', ' '.join(new_src_uri)) + d.prependVar('SRC_APT', ' '.join(src_apt)) +} + fetch_apt() { sudo -E chroot ${BUILDCHROOT_DIR} /usr/bin/apt-get update \ -o Dir::Etc::SourceList="sources.list.d/isar-apt.list" \ -- 2.31.1