From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6652665106569101312 X-Received: by 2002:a50:b4a1:: with SMTP id w30mr2302887edd.2.1548952966652; Thu, 31 Jan 2019 08:42:46 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a50:b1e2:: with SMTP id n31ls1694576edd.3.gmail; Thu, 31 Jan 2019 08:42:46 -0800 (PST) X-Google-Smtp-Source: AHgI3Ib+/5iYHf9RXHoHiCZuYbNR4HAzPG2UoRBBV5leiO6vw+yRWWrhZmIFjYeMFcB4v4lgoHKi X-Received: by 2002:a50:a5f1:: with SMTP id b46mr2279958edc.12.1548952966218; Thu, 31 Jan 2019 08:42:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548952966; cv=none; d=google.com; s=arc-20160816; b=HShegqOlGHLPI8lpGLB+TgR0/uJEt8IgJdoRf6cREyJU9xyYgq0uQk2vMArLW4wDQT QcpQYrJ5PJtUH4tKR1/KY9twoPihxHmnJ8g5Z5sY6Lqc2i8uBr8uZ6o5aiHjUonOFVpL 8DFuSnyi9oQM11AZicYVWfHxIlI0KU2JXQjnEmbzWm8gTvg2wdxr4vLnHZ4TYw/4oqn1 sa0GOKYulxTv6AGk//Hl6ieXFrWdohtOApqCletzXLgGsFwuPTq68Ce4X44a9o8LFv0O SLKkKTlNvO8Z4c3cnweah+8ah4Um3atIzaymIhuRyHJUDMELJljzcntIvYmVx4qRwHOE va+A== 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:date:subject:cc:to:from; bh=DhgTKdR+pEAYNc0sO0WCKx1huo+lEg0Ee0oaBhAaF9k=; b=XvuR5gi7GYxVLyyqFlr1GjG4xBD8u9NYV6V8bNH8vnd24UPjnaV55oZQkrZAy0KksW m2HI08pHi68gmTk5VPdHz/1En5CeqO/KYctExHrF1EPUUxLWMsS2H8be0R9mmjCkptf6 XZMHt+JiJMDloBTOFgDCVbCIKWC+P5zf55Tk1qPSSdCACNp1ku92UITztRHVuDXDefFz TTxF7xjAr2ue5ZMEsiJVHKxDahZjOjHn/aQmv2pVSJ+l1kONGYCQCZGREa8TV0AxDWrj dkJlRgKa6vLa7xddqi1B33pn3UbLFWFSH/W1ViU/OAGMLZ4FabH7MlqlgwUQsORHr1b8 rbtw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id ch10si223403ejb.0.2019.01.31.08.42.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 08:42:46 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id x0VGgjkS001313 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 31 Jan 2019 17:42:45 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.69.211]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x0VGgjE3029790; Thu, 31 Jan 2019 17:42:45 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCHv4 7/9] meta: change apt source fetcher to hook into SRC_URI Date: Thu, 31 Jan 2019 17:42:42 +0100 Message-Id: <20190131164244.9169-8-henning.schild@siemens.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190131164244.9169-1-henning.schild@siemens.com> References: <20190131164244.9169-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: 5Hn80YHMMygB From: Henning Schild This patch allows users to use "apt://" 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 | 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 " 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