From: Henning Schild <henning.schild@siemens.com>
To: isar-users@googlegroups.com
Cc: Jan Kiszka <jan.kiszka@siemens.com>, Claudius Heine <ch@denx.de>,
Henning Schild <henning.schild@siemens.com>
Subject: [PATCH] meta: change apt source fetcher to hook into SRC_URI
Date: Wed, 30 Jan 2019 16:23:21 +0100 [thread overview]
Message-ID: <20190130152321.26792-1-henning.schild@siemens.com> (raw)
From: Henning Schild <henning.schild@siemens.com>
This patch allows users to use "debian://" 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 | 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 <you@domain.com>"
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
next reply other threads:[~2019-01-30 15:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-30 15:23 Henning Schild [this message]
2019-01-30 15:25 ` Henning Schild
2019-01-30 15:26 ` Jan Kiszka
2019-01-31 14:19 ` Henning Schild
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=20190130152321.26792-1-henning.schild@siemens.com \
--to=henning.schild@siemens.com \
--cc=ch@denx.de \
--cc=isar-users@googlegroups.com \
--cc=jan.kiszka@siemens.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