From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6652665106569101312 X-Received: by 2002:a50:86d3:: with SMTP id 19mr2164152edu.5.1548944298997; Thu, 31 Jan 2019 06:18:18 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a50:89cf:: with SMTP id h15ls1560502edh.7.gmail; Thu, 31 Jan 2019 06:18:18 -0800 (PST) X-Google-Smtp-Source: AHgI3IYzZN2jMfpxSFfHI2hPQySlXQtdx/fjSlo9mLsHhgrd2ldqoTfSk0qP5WHYH93FI0RdRcAa X-Received: by 2002:a50:aeaf:: with SMTP id e44mr2175628edd.4.1548944298600; Thu, 31 Jan 2019 06:18:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548944298; cv=none; d=google.com; s=arc-20160816; b=dIxmIqaelQMg60RLJffkFJsaVFtBmELd4pl6txxLdxP1UxY3ncANwnT33wYoRM4N7/ aRHDuLTILyMkr5aYJvb0UTUFUq51HkD2HkrDW/468qwYnoHTnmZVVqUPAym0SdDD2+Ux 6I3lZPSBV45Pss8YjmAuQszWTF+4+ENP8I5z6McE5UgiWgTmEj3mDd+f3DBG1n4krsLO lEfF6l6nX0kyM7Vv4x630vSwm5vqIRA24gQlQ6yV9afOsLVq3quJ1sKDH6ZATtjBZMAT +KjSu2WN4t/mUIiLvxiyD9KULtXCYlhWjNEjmCAm9afGRpbPV1KYNUKK9gqUpGvh2TGv +sPA== 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=xXpR8RfTBAVYekGHYwZWrN8cIHUegCoYBMhCnZF+Vdc=; b=vXjCBn0r+SMY2DBteg1j0KvGk/vAe5/j5KQM7y/SOL7hJ/zyGHmqquxkT2DpaOfplw e2KBdQYiJsEitoPAG486uMXpjZbxTpEw5fWJOYXLjk3de0/dARpb14iYpuOFZSi1Dj9a nF/jLOomMybHeXIVZvSkdkOeSlMSPpmdol9sv3eG7nyoudHAtsZVtrltXqwZAbz5sDTt rlgo672FIH72j/mk+FPUW4+3/erT8wTbgjgM/RKJfnMgT54BUbapqVasg/B59Eb2vIDG bLp5kIgs4g4KvaoTn1ETJIBmmnkkbIzszsnT5gu1BvgklEPLGFYver1gvUEPYngxYzND C0wA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id m24si146382edc.3.2019.01.31.06.18.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 06:18:18 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id x0VEIIul019174 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 31 Jan 2019 15:18:18 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.69.211]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x0VEIHtw031813; Thu, 31 Jan 2019 15:18:18 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCHv3 7/8] meta: change apt source fetcher to hook into SRC_URI Date: Thu, 31 Jan 2019 15:18:15 +0100 Message-Id: <20190131141816.32437-8-henning.schild@siemens.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190131141816.32437-1-henning.schild@siemens.com> References: <20190131141816.32437-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: UWgnYO75Upp3 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 3976b15..c826ad0 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 = "apt://${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..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