From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6669723628337102848 X-Received: by 2002:adf:e510:: with SMTP id j16mr2820293wrm.259.1553181448931; Thu, 21 Mar 2019 08:17:28 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:9cc7:: with SMTP id f190ls444038wme.8.canary-gmail; Thu, 21 Mar 2019 08:17:28 -0700 (PDT) X-Google-Smtp-Source: APXvYqz07lJnR1eKahHZZN4wZxdNkOarqZ2nIzkj1mhr8QyamsgjU5JlwErxa2cdX0+vZOwWSM3H X-Received: by 2002:a7b:c5c3:: with SMTP id n3mr3027392wmk.82.1553181447023; Thu, 21 Mar 2019 08:17:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553181447; cv=none; d=google.com; s=arc-20160816; b=kP6tRksjhb0TJRPCwweK95NpXWHRH0DHh0UCW3FNVe5KnjYsnJPTllzb+4NBCX6j/v +tWVX7oUvHCXMLfqVH/mzgFB9AFQ/jO2mGU8mmlLg+McOpzFfn6Dn1PUbWDHYj4GDsqG A79iFUfJoFeCuVPRI51m2/Bc2eJluXKw8Yiq1ldmZISKGH1SgXofZP1RVlLj/VN5CANS XKlcGsSe/n07E43H9/9ugccxy5cc/A56cb8O8omnhVcirBB/by473MgOVrX8G0HbK/d4 qGHORyxCO6DxdTnWgG7cHGBwGHKGe/L/8eWNjXP6hCYvgZi2r2RQeiocLJ0xioXveqJs 4Trw== 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=/Nr7P0PUtK10dQFAulHxYGJAV3aAOmSBl51WArYtSLA=; b=r26GYG9VZPO/q7F1QlvJTn5aOvtwxI1o06yaWWbHuH6VHBN3sCRBpVxlCJb6uJetaa NWejmNH28LaYEG//XSe9HCu4sETyT0Vy7qW7PXAFmmUz4HNOACj7TgcJEmytpV/sS60s HYHpen8seiPtFzePolJSmQLzRNsPHIXsuEITsG/bled93FxFLUiefyDhVzxSlqLuMTwP CeozHq2NEH+IMbIujhwNhxytpFfW7rwjeJAVMqTXwcuTLGvoXDvtbVjGiV58J8lDuRFe Z+Mq9YBqP63U1XVjnm7s/sITQZTu7siweEK84OJZyBP52wwLA7aueQPzeCPrzRWdHgaS zSFw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of andreas.reichel.ext@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=andreas.reichel.ext@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id z129si303284wmc.2.2019.03.21.08.17.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Mar 2019 08:17:27 -0700 (PDT) Received-SPF: pass (google.com: domain of andreas.reichel.ext@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 andreas.reichel.ext@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=andreas.reichel.ext@siemens.com Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id x2LFHQIO015373 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 21 Mar 2019 16:17:26 +0100 Received: from localhost.localdomain (golem.ppmd.siemens.net [139.25.69.17]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id x2LFHQM6013389; Thu, 21 Mar 2019 16:17:26 +0100 From: "Andreas J. Reichel" To: isar-users@googlegroups.com Cc: Andreas Reichel Subject: [PATCH v8 3/7] Fix fetched key location in apt-keyring generator Date: Thu, 21 Mar 2019 16:15:22 +0100 Message-Id: <20190321151526.12001-4-andreas.reichel.ext@siemens.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190321151526.12001-1-andreas.reichel.ext@siemens.com> References: <20190321151526.12001-1-andreas.reichel.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: ks9yV4FyFMD4 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 4526aa7..1f8f178 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