public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: Henning Schild <henning.schild@siemens.com>
To: isar-users@googlegroups.com
Cc: Henning Schild <henning.schild@siemens.com>
Subject: [PATCHv4 7/9] meta: change apt source fetcher to hook into SRC_URI
Date: Thu, 31 Jan 2019 17:42:42 +0100	[thread overview]
Message-ID: <20190131164244.9169-8-henning.schild@siemens.com> (raw)
In-Reply-To: <20190131164244.9169-1-henning.schild@siemens.com>

From: Henning Schild <henning.schild@siemens.com>

This patch allows users to use "apt://" URIs in SRC_URI and cleans up
the interface for recipes.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 meta-isar/recipes-app/hello/hello.inc |  2 +-
 meta/classes/base.bbclass             | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/meta-isar/recipes-app/hello/hello.inc b/meta-isar/recipes-app/hello/hello.inc
index 815211b..747b96b 100644
--- a/meta-isar/recipes-app/hello/hello.inc
+++ b/meta-isar/recipes-app/hello/hello.inc
@@ -6,7 +6,7 @@
 inherit dpkg
 
 # this will fetch and unpack the sources from upstream debian
-SRC_APT = "${PN}"
+SRC_URI = "apt://${PN}=${PV}"
 
 MAINTAINER = "isar-users <isar-users@googlegroups.com>"
 CHANGELOG_V = "${PV}-99+isar"
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index d4082de..6ca93bf 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -96,6 +96,25 @@ python() {
                                   + ws + "root_cleandirs\n")
 }
 
+# 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"
-- 
2.19.2


  parent reply	other threads:[~2019-01-31 16:42 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-31 16:42 [PATCHv4 0/9] apt-get source support Henning Schild
2019-01-31 16:42 ` [PATCHv4 1/9] conf: add deb-src entries to all our distro configs Henning Schild
2019-01-31 16:42 ` [PATCHv4 2/9] dpkg-base: introduce an "apt-get source" fetch/unpack step Henning Schild
2019-01-31 16:42 ` [PATCHv4 3/9] meta: move debianization code into a class and into dpkg-base Henning Schild
2019-01-31 16:42 ` [PATCHv4 4/9] debianize: allow changlog version change Henning Schild
2019-01-31 16:42 ` [PATCHv4 5/9] meta-isar/recipes-app: add upstream hello rebuild example Henning Schild
2019-01-31 16:42 ` [PATCHv4 6/9] local.conf: enable rebuilding "hello" for all distros Henning Schild
2019-01-31 16:42 ` Henning Schild [this message]
2019-01-31 16:42 ` [PATCHv4 8/9] doc: document "apt://" fetch/unpack feature Henning Schild
2019-01-31 16:42 ` [PATCHv4 9/9] ci: remove "hello" from the offline build, it fails Henning Schild
2019-02-04 17:33   ` Maxim Yu. Osipov
2019-02-04 17:37     ` Jan Kiszka
2019-02-05  9:49       ` Maxim Yu. Osipov
2019-02-05 18:18         ` Henning Schild
2019-01-31 16:46 ` [PATCHv4 0/9] apt-get source support Henning Schild
2019-02-05 10:42 ` Maxim Yu. Osipov
2019-02-06  9:24   ` Henning Schild
2019-02-06  9:46     ` Maxim Yu. Osipov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190131164244.9169-8-henning.schild@siemens.com \
    --to=henning.schild@siemens.com \
    --cc=isar-users@googlegroups.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox