From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6652310799425470464 X-Received: by 2002:a50:a5f1:: with SMTP id b46mr1477529edc.12.1548861938774; Wed, 30 Jan 2019 07:25:38 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:1fd4:: with SMTP id e20ls547704ejt.4.gmail; Wed, 30 Jan 2019 07:25:38 -0800 (PST) X-Google-Smtp-Source: ALg8bN536sNMML61TFXmMZvoTxKx7s9GeJgYpg6jue81mqxjT83hb/tqROX93mHfGcxuM3cdJuNt X-Received: by 2002:a17:906:443:: with SMTP id e3-v6mr1396851eja.1.1548861938373; Wed, 30 Jan 2019 07:25:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548861938; cv=none; d=google.com; s=arc-20160816; b=hsD6Y4yCqhQHJV5NYlTTX+jJRNXuh3rsGpJ8sD55vYJo2pO5OWE8To0O7vUKRw7BSt jJiQ99DupFBxQCQYBAf6XY/y4iH34Vf2qYzaNkgl6l0vTRgO7mY7Xzc6SiAufmkE24XM DkKr/fjUrzWvb88xy9Goy/TPM/sPA9PbJAxeqDTXR6bU5r6BNq/nB2qyxicQhf5klxGc 27on2IDUByhZEhFHYwJ7mm6sgkyGO0227c3cCE77RLNOK/DTKCKES02GDaWow61p6gkT 2bU3JyXa08kQQKkL5wGD3ZIQbR4f571BoY4Q0cLyw3ygFk55dVxl7002+YoCdFSZX80S nb1Q== 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:subject:cc:to:from:date; bh=1+KCCPkwbFR+r4lTUcAY/qbqPgCQl41SuXKVUW48ld0=; b=BYBrGgq2tPDNzDUHYTX8NZTqg3W9W9ugaIyubXBmTQqSJkpy+uk5ClCQZJX1VbeMjU 74kE3K+HQGA9NRUWIT+OahBo4zFMLlrtH+aid0Kk1G4kCNhdJ+ztz8CNITPq5Rba/P9O kQkmWx7K6z+G/YFNids0cAmkqVuQtT03KcotrzmuurgfmP0CNC6fpgoo7K+Vilk9DPRu 5D9QXnRxJxGrpAjYEMbuzQ3o4nTyYGoRM2WAIDVgUyux5TvgKlrmY/PmxLZj1IVLzdR5 uRKWFSKiOQO4/FBOwSqmLjLtKUuPeewygilQ/0mI8qTrxToIUoCTEz8/TZ6er/4YdnQj KS7A== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id i17si99203edg.2.2019.01.30.07.25.38 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Jan 2019 07:25:38 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id x0UFPbZG008890 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 30 Jan 2019 16:25:37 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.68.203]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x0UFPa46016262; Wed, 30 Jan 2019 16:25:36 +0100 Date: Wed, 30 Jan 2019 16:25:36 +0100 From: Henning Schild To: Cc: Jan Kiszka , Claudius Heine Subject: Re: [PATCH] meta: change apt source fetcher to hook into SRC_URI Message-ID: <20190130162536.4be88f48@md1za8fc.ad001.siemens.net> In-Reply-To: <20190130152321.26792-1-henning.schild@siemens.com> References: <20190130152321.26792-1-henning.schild@siemens.com> X-Mailer: Claws Mail 3.15.0-dirty (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: zzSKFuX657x8 This applies on top of the apt-get source series and gets the interface "right". I can later fold it in or we keep the order, please let me know what you think. Maybe it should be "apt://" ... i actually guess so. Henning On Wed, 30 Jan 2019 16:23:21 +0100 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"