From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6665315485307895808 X-Received: by 2002:a05:600c:21c8:: with SMTP id x8mr1056967wmj.14.1551968710968; Thu, 07 Mar 2019 06:25:10 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a7b:cd99:: with SMTP id y25ls36028wmj.2.gmail; Thu, 07 Mar 2019 06:25:10 -0800 (PST) X-Google-Smtp-Source: APXvYqyGsKCXEtc4NeC1zafZeOIXIJ/FoGCJapy069pt7Ihs1gLqgZXL10WN1FRBQdSawteIZJwA X-Received: by 2002:a1c:7910:: with SMTP id l16mr1057322wme.8.1551968710439; Thu, 07 Mar 2019 06:25:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551968710; cv=none; d=google.com; s=arc-20160816; b=s5TnYXQr574t1aUr+9X+zt1erw1GfncHH7XC18mijnai6+GfYFR8s1Dinp80+Ywml0 kt9w9H/RsyNGHx0GRzwj4k4sFvYpVHvUi6/L5BpX3rKeCHZdwzqtfZY0lWqDqlptTkI9 WQMPJ0xLSx9nKvSZlwz4rJpVyXUVF5oghTPDYpdUq8jP4iVgS9KYEDLb6oatkrNeQTnf sYZ9uJdEz8k1rTKw3JIsgUWnRPdwJF2xNWWKsGwtZut56ZpG2k0Xt9//iQnSlbAqPpnJ iXn5mBtXtooNlW45siQmY7/vklZKbOuMN/+0py/3l5v2whMAmdCicAcu++JUHndAelar U8SQ== 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=LgfAyRGVNPXTb8nGknNAG/WXHzB8DCU4q0pGzieTYlQ=; b=ZSjgrQNvpYk4XdxMsCKK3nvt5w5qUkWrrgtWDTTgKY519UkmXVazrNcx7lEEDXZPfE hOW7EoGFlTy13nZq5qmlQi9F9SYP73XNk3nt0PJtk4wWEPCDeKCWtuGiHp9xeUhnvE5e oRth4/a0tZQ+H5sSndiPWHaBZMkzCngmWW1JLC0TtWB3LJuXY6nCFDLA5pPmVBd8EMWJ n4v+az5ApymQRXhvZ91SKFUpJMbCMJaDgBXLAOXR6VM3+DuxEp+sigu0Jlc5a1eNvP2/ LvcfmcnKE5YIcQOdr/E9KE3qg8Kck31j4VLaTyWK936tf6L2eo0jtvtvSa+MGNsyEadM 8PsA== 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 b8si248656wru.1.2019.03.07.06.25.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Mar 2019 06:25:10 -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 mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id x27EP9Yg023582 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 7 Mar 2019 15:25:10 +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 x27EP9RJ020333; Thu, 7 Mar 2019 15:25:09 +0100 From: "Andreas J. Reichel" To: isar-users@googlegroups.com Cc: Andreas Reichel Subject: [PATCH v4 4/6] Fix fetched key location in apt-keyring generator Date: Thu, 7 Mar 2019 15:23:02 +0100 Message-Id: <20190307142304.14508-5-andreas.reichel.ext@siemens.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190307142304.14508-1-andreas.reichel.ext@siemens.com> References: <20190307142304.14508-1-andreas.reichel.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: UOtcwh+MjumS 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 2d6b761..dbc3938 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