From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6665315485307895808 X-Received: by 2002:a2e:5c88:: with SMTP id q130mr344883ljb.2.1551889695219; Wed, 06 Mar 2019 08:28:15 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:ed02:: with SMTP id y2ls264286lfy.10.gmail; Wed, 06 Mar 2019 08:28:14 -0800 (PST) X-Google-Smtp-Source: APXvYqylRatB6I3EporE0lnWg8QYIKg23Twp8VA9JDTDjsuAUtbg43X7KUJyUucd3BfQkaTZ3xrU X-Received: by 2002:a19:f703:: with SMTP id z3mr521335lfe.8.1551889694680; Wed, 06 Mar 2019 08:28:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551889694; cv=none; d=google.com; s=arc-20160816; b=wGqMWBhsWM8dufKzhFGletIVLpjICcipSb6JQddHrMqb18+DMUcS3PjAvoK/B3uCBB 2zsAr8IGQmJTzM4Y0OcIFRUN9TrstPye82gUeYa/Gl5Gc7IPmWL+2LuBzs1wTwwIQvuY PKmKS0jqC6ZXUVYppSdlk3XYc0RE+l20DcM+Kfamabewt3NP2yyfmPL16IvjWcz34HKS hUsj0EcMiQ3Zs9Q3AVB9h6w+IJ5WN98AfTmiGGLZo2vBnkpoU4HSwP7LgGFay+kpHQ1R JGiroBaoiidyK3S1ulFLOR3fgwlJLN+YyTwX+CC9jtggmUl1us17mkFm0qusnz4e26Cr 8/CQ== 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=rH0AovnP2bo3SooSTeCL78SQHNLlMW1fvruDXpDzPi8=; b=bXTKrUZvFzfCciqkHXtnDpWZKKE/Fkcgw7P/8vzsB7DgLPPWHW9m0R1R2uBQi5aasl oqYz0bNj+itRgvuOv9MpEZiDZ2eF/QPhxh3BmUFH0nnZEPEQKlIM+1CjdRzHKOj6thC5 +PMFpg7bt0UTbuUERpkT1UdWat3uhK7GDapMAhnIUwhXUX9n9IkGBUlNxNPfuN/wfHdq ZXjBoFCDnIbeZa2iga2V204acc8gyJj4lKKaEIFpfIfxTJwHp7d62OmiGjgcFuds3mDV 7In/Rl6D38XglS95lMfBIClGGkywQ9a6zbZWURE/+aLTMkrUww0aq6ebC2Hi7l0myoqu wZYQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of andreas.reichel.ext@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=andreas.reichel.ext@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id h25si116561lja.3.2019.03.06.08.28.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Mar 2019 08:28:14 -0800 (PST) Received-SPF: pass (google.com: domain of andreas.reichel.ext@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 andreas.reichel.ext@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=andreas.reichel.ext@siemens.com Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id x26GSDAq002359 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 6 Mar 2019 17:28:13 +0100 Received: from localhost.localdomain (golem.ppmd.siemens.net [139.25.69.17]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id x26GSDvE010079; Wed, 6 Mar 2019 17:28:13 +0100 From: "Andreas J. Reichel" To: isar-users@googlegroups.com Cc: Andreas Reichel Subject: [PATCH v3 3/6] Fix key filename in apt-keyring generator Date: Wed, 6 Mar 2019 17:26:15 +0100 Message-Id: <20190306162619.826-4-andreas.reichel.ext@siemens.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190306162619.826-1-andreas.reichel.ext@siemens.com> References: <20190306162619.826-1-andreas.reichel.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: dOEi0nmWYOgd From: Andreas Reichel Use bb.fetch2.Fetch to retrieve the final filename after it is downloaded. This way we don't have to guess (wrongly), and also additional SRC_URI parameters like subdir or filename are usable now. Signed-off-by: Andreas Reichel --- meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index 204ed1f..98c5c6b 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -33,7 +33,6 @@ DISTRO_APT_PREMIRRORS ?= "${@ "http://ftp\.(\S+\.)?debian.org file:///${REPO_BA inherit base-apt-helper python () { - from urllib.parse import urlparse distro_apt_keys = d.getVar("DISTRO_APT_KEYS", False) aptkeys = [] @@ -46,9 +45,9 @@ python () { d.setVar("DEBOOTSTRAP_KEYRING", "--keyring ${APTKEYRING}") for key in aptkeys: - url = urlparse(key) - filename = os.path.basename(url.path) d.appendVar("SRC_URI", " %s" % key) + fetcher = bb.fetch2.Fetch([key], d) + filename = fetcher.localpath(key) d.appendVar("APTKEYFILES", " %s" % filename) } -- 2.21.0