From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6652310799425470464 X-Received: by 2002:a2e:9a59:: with SMTP id k25-v6mr818746ljj.0.1548861805343; Wed, 30 Jan 2019 07:23:25 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:8ec8:: with SMTP id e8-v6ls374566ljl.5.gmail; Wed, 30 Jan 2019 07:23:24 -0800 (PST) X-Google-Smtp-Source: AHgI3IbiXR46odNykX6K6p98FbrPwQwR19Rtg2ZK1pbEaS9H7jB0CuIJsYsJX/Igo4DpshIdi7Xi X-Received: by 2002:a2e:6c0c:: with SMTP id h12-v6mr821093ljc.9.1548861804844; Wed, 30 Jan 2019 07:23:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548861804; cv=none; d=google.com; s=arc-20160816; b=pBp9jCaglkYaNp9REOokg0/Mi7YgDexhthvLZsPfHiZ0DvEM/fLivTxlJih8XJhnLi 9XjHZyuQGC7qIX9Ze0+PGJa1fC968DB6QBpc2cgen7Njji+B4yi3svn/ogoLiOLrUs2k O4R3p/Yg5655G3fS/1q3ncEFj+yNuLfl6712vx0YLXuoppphegaVI1LegJ9ipyZj+pqX jgmvgOkZVtO2NUwS5PviQ/ijOccd4u5422CumCQ+fo7q1iD5yRhXuGRXNuyqGQiPeYUt EqEeX1Ivwct5rj8fpnkyHeSVOcujNnaBtx86Otr0pqqEC4eI9vONeH+pA0gX5HqNXXHB Davg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=JY4iWGLxE982ID8xjK69FKSFU2XXGFBSNQsKrUCAY9I=; b=JmRHU+P/jIpPc8Germ2cSTYIFabe5KXR2TScUypay3WgOAGYW3gO1AXppw2iXkiGa8 OfpzY6KULrItQFrn4dWBbZZqE3V2NbP6WMtEPjXRPkf43z5WNYw++/Z51BDMM+bXDtMf vBJAmJkuLGBWie+dfvWYbZeCsFLnkar1nns1P4IWhC0TDl+ERGGE4BeQjh3fHVmNluME WuV+jiTDBKPfLtNWa8CEM5wWnTKPjscK0Ug0EzMbz2/SSzOhRe+ObxQER+EFVGrqG30a JsnWo/W42sDvQzo6Krr566jB+jMbtGqqXCGE9ja51oOhg14DsBNbkfy8Wk59L9tnYbUG adyg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id 134si54546lfa.1.2019.01.30.07.23.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Jan 2019 07:23:24 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id x0UFNMnl027572 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 30 Jan 2019 16:23:23 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.68.203]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x0UFNLL1007209; Wed, 30 Jan 2019 16:23:21 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Jan Kiszka , Claudius Heine , Henning Schild Subject: [PATCH] meta: change apt source fetcher to hook into SRC_URI Date: Wed, 30 Jan 2019 16:23:21 +0100 Message-Id: <20190130152321.26792-1-henning.schild@siemens.com> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: eDkpxGkrylEK From: Henning Schild This patch allows users to use "debian://" URIs in SRC_URI and cleans up the interface for recipes. Signed-off-by: Henning Schild --- meta-isar/recipes-app/hello/hello.inc | 2 +- meta/classes/base.bbclass | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/meta-isar/recipes-app/hello/hello.inc b/meta-isar/recipes-app/hello/hello.inc index 3976b15..ceab7a2 100644 --- a/meta-isar/recipes-app/hello/hello.inc +++ b/meta-isar/recipes-app/hello/hello.inc @@ -3,7 +3,7 @@ inherit dpkg # this will fetch and unpack the sources from upstream debian -SRC_APT = "${PN}" +SRC_URI = "debian://${PN}=${PV}" MAINTAINER = "Your name here " CHANGELOG_V = "${PV}-99+isar" diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index d4082de..9885fdc 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -96,6 +96,26 @@ python() { + ws + "root_cleandirs\n") } +# filter out all "debian://" URIs out of SRC_URI and stick them into SRC_APT +# this makes for a nicer user interface +python() { + src_uri = (d.getVar('SRC_URI', True) or "").split() + if len(src_uri) == 0: + return + + prefix = "debian://" + new_src_uri = [] + deb_src_uri = [] + for u in src_uri: + if u.startswith(prefix): + deb_src_uri.append(u[len(prefix):]) + else: + new_src_uri.append(u) + + d.setVar('SRC_URI', ' '.join(new_src_uri)) + d.prependVar('SRC_APT', ' '.join(deb_src_uri)) +} + do_fetch[dirs] = "${DL_DIR}" do_fetch[file-checksums] = "${@bb.fetch.get_checksum_file_list(d)}" do_fetch[vardeps] += "SRCREV" -- 2.19.2