From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7004893869054623744 X-Received: by 2002:a17:906:1f81:: with SMTP id t1mr15131225ejr.510.1630953949410; Mon, 06 Sep 2021 11:45:49 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:35c9:: with SMTP id p9ls3475630ejb.0.gmail; Mon, 06 Sep 2021 11:45:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwl3pJIlUzigEndcXQqs3QwfsDN1KwHD5zNSfGN6wDflX+bA3Qj1O1Fivo3WUmdZlnOQsO1 X-Received: by 2002:a17:906:1b08:: with SMTP id o8mr15199587ejg.21.1630953948320; Mon, 06 Sep 2021 11:45:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630953948; cv=none; d=google.com; s=arc-20160816; b=sK1fi125VmcvFY3cTF4e3ehxpCRX6dj1G3R+hWggq6KKFtDq5QsKXPcf3PXL1dyJsN ocLZ8vLFXx1K9BOppA5I9Ko0ByesJ3rFof34fHtI/CtIxmHtHkVqNBCFKOHKe1/k7gml mBkULwIJ9ebViqVmjl7CQraAUo0dtVNGaO0OVNp/virwDxMu9I1np6I/PFGGjjdQ2smP 7/I2HgEaWVN/KOkgGB4VHnQnSALFWwX81p2j4x0kVtZYZNMRZHg3CJOZOyKuWdmZa6QB T27rvRfUKRchh3MagP3qUzINPtGdIjMuZBR/gWsl13F9zzezTnmge+eisCn1ts6sMwa1 47wA== 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=Ad4RG5KUbTd1CD549kWuGtijST/x14mEbr2hH4hwPlE=; b=SGw+SaBTU69sC+MNONPnMi1TIKhcw/fnM43qIzUgaNG60lQaCVf0DKiqTKttm66/xH uBpV93ykt+Wgq38a/3BtnQMDpYW7gn1z/K5k/X/ez6X60cESqPkWrq1jx1Vu7wsabG2r ASgBRCNumOO4qogSoSa720RV1qrZ+AwTNR36HlvECPRMnRAX0pMV64e7FR97pqqk1YNN DqzlurR4ytYJ2g1cvYtcBfLh/WIT4DvGufrvtcULq+oE6g1f0SjYvL9GzAfbgJgemnFv bzIjCykJEtR5B/0KB3MX8lLE22RV7wkk9P2okP128QJ40q1JyDfxB5TOgvQA2nTHMJcK gPoQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 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 gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id n10si332485eje.0.2021.09.06.11.45.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Sep 2021 11:45:48 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 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 gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 186IjlFK003716 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 6 Sep 2021 20:45:47 +0200 Received: from md1f2u6c.ad001.siemens.net ([167.87.245.242]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 186IjlG0011261; Mon, 6 Sep 2021 20:45:47 +0200 From: Jan Kiszka To: isar-users Cc: Henning Schild Subject: [PATCH v2 1/2] base: Move SRC_APT extraction/filtering to dpkg-base class Date: Mon, 6 Sep 2021 20:45:46 +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: jOJmQrD3dEwj 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 d8c0995..dfa31ff 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)) +} + do_apt_fetch() { if [ -z "${@d.getVar("SRC_APT", True).strip()}" ]; then return 0 -- 2.31.1