From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6652310799425470464 X-Received: by 2002:ac2:4150:: with SMTP id c16mr739068lfi.2.1548861966998; Wed, 30 Jan 2019 07:26:06 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:ee0d:: with SMTP id g13ls280362lfb.7.gmail; Wed, 30 Jan 2019 07:26:06 -0800 (PST) X-Google-Smtp-Source: AHgI3Iad8wCr2xr5hjNjpSbTcDhLJeRDRXchgkBsMzhseVR7qpL3tAk+ANjxArWvei8Mi48nb/q1 X-Received: by 2002:ac2:4150:: with SMTP id c16mr739064lfi.2.1548861966382; Wed, 30 Jan 2019 07:26:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548861966; cv=none; d=google.com; s=arc-20160816; b=kZPutt4203EeNUSKiYgGJDcUkGAtAXJ1bSV3q+gWNT2p42QpH6UkD1RvhYD4mu81rF pyztmPv2KpuLjwxpplkSe818DMw8q1/exG/incdB720UOcAOyND3ZglWq8t1Gt1tdNKw 2gvAzra3k9CZ/Hv6631XOIBvhY6I5xFb5IA2H9bDH8J2pHnJ+ubaqi92dUoPn3ah1rom viwC+vRE6Pci3NT9oc0zFdjNl49GSi1S+/iZyioTW6h53SXtMYI/fl6EOuI4F0I8gR/G BKQt41y9yitO3xmEhmxYh9D/trVlb3F7sDHupfWvlyiwrrV4L3EZrm0wvxE5V97t4LGF E7xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:cc:to:subject; bh=fvp+TUEvjwODhR6hHgItu9Yb5zKpg3gjwTKUaHqqjTw=; b=YsMRXrGMJP9OcA8icZA3cTBI5P/R6/E43+cKMoA6sKyfsLco2kCGNp2s7AZnxQrgNi pElm3HbaSIEwKseoqDvLF6UhVJvDwkt8XfNlZmRA5fJmd/z0TxfO1DygmBgOgAcx6MYP nM2Q6PLhhuPBcSYrUNFv31/zSEqydnHZaECE2X+hwhq0k43EIIm7tNC+xJnxDEQkKd+r E6vej+JNF5yYx/tdcs1X3Cq8T4aOfxM0sxAqRmkObot+kTQXMsg6gHRxOzXXZ91aps1h DMHqkMBvhr/Gw3Wcp1FvoFDLAci5+PNqjL1mthKAo7tlM3w1qj4Q2WNYrKziY2eDUVUp A+vw== 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 Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id q10-v6si90075lji.4.2019.01.30.07.26.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Jan 2019 07:26:06 -0800 (PST) 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 Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id x0UFQ5Qx005494 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 30 Jan 2019 16:26:05 +0100 Received: from [139.25.68.37] (md1q0hnc.ad001.siemens.net [139.25.68.37] (may be forged)) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x0UFQ3YF014686; Wed, 30 Jan 2019 16:26:03 +0100 Subject: Re: [PATCH] meta: change apt source fetcher to hook into SRC_URI To: Henning Schild , isar-users@googlegroups.com Cc: Claudius Heine References: <20190130152321.26792-1-henning.schild@siemens.com> From: Jan Kiszka Message-ID: Date: Wed, 30 Jan 2019 16:26:03 +0100 User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 In-Reply-To: <20190130152321.26792-1-henning.schild@siemens.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: 3XhC6Q66zwpV On 30.01.19 16:23, Henning Schild wrote: > 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" > Interesting approach... However, shouldn't we call it "apt://" to address also Debian-derived distros? Jan -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux