From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6669723628337102848 X-Received: by 2002:a1c:f107:: with SMTP id p7mr1024159wmh.12.1552916045625; Mon, 18 Mar 2019 06:34:05 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:3d6:: with SMTP id 205ls2033210wmd.1.gmail; Mon, 18 Mar 2019 06:34:05 -0700 (PDT) X-Google-Smtp-Source: APXvYqyF9nC/jg7VPy8bjfByiUPJx6SHOqyiXsPOn04H/X96py59lv9utbkGuWn7T46edHI1aeV/ X-Received: by 2002:a1c:ef19:: with SMTP id n25mr1044715wmh.20.1552916044893; Mon, 18 Mar 2019 06:34:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552916044; cv=none; d=google.com; s=arc-20160816; b=M0MFpPtgp+jf3YsnlBO4p978hgK2/IX0jR25JpTVqt8FE9Ld0VVK0qGFCRgJwgmPtx mGr3g2e6zoakawiPKUdA/JQCfqOx7DXYZT8WaAK0/BJtwhBTqanNm+e4zo9HoFA6oLdT Rm8zv9boJJdzsuia558rKitb4YubJ6qn8yjuHjoTXyckjK/5KX8syM+3gB+ndJX17Qnw TgG9EZ/PyKYnUIbfIwIQ5T2025nZIhWKFyomoNB5NGj6qZuyCiKVbg+qXptDSdkzIWH/ KkgiDJPpG6kFuEo/bKixV0CuWb1RsMgkRFIpe93VAoUgCJ5ksVDyHFxiREEbRdkXt0cj BpmQ== 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=JwYpjOYO0vf0wO+DA2ht6jeBhKr+s4ShApUrVwQLKdTZc5wR3vaKz9bRz3QUqTGlYP 7Gl3P2q91AKlFecHy2/ngQD+JRHdUuiYGHGKLHN/aC9MCGwZxB7pUZLgwEjmSjTW3TpO nXI62rp9oXSxfXqOi3LsRD7VeRDD0xmNQyF1rsAKwkm/Ihni0+CUP1Y4XWR6WdWCRG+Z FNeS7iX5CWydTXzsxm7lTdRskqvRpzwO5Jybm29UF7CqmYewqscp8pcxsvpjt72DCWZ0 u5mgzHgVy/5b2fpnG8kqUu501CUOreXwgrI0yrJK4c5y7MRwhLeTdrbT7EdQnCIWbkgY K1Bw== 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 p4si460571wmh.0.2019.03.18.06.34.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 06:34:04 -0700 (PDT) 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 x2IDY4S8031033 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 18 Mar 2019 14:34:04 +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 x2IDY3t8014851; Mon, 18 Mar 2019 14:34:03 +0100 From: "Andreas J. Reichel" To: isar-users@googlegroups.com Cc: Andreas Reichel Subject: [PATCH v5 3/5] Fix fetched key location in apt-keyring generator Date: Mon, 18 Mar 2019 14:32:02 +0100 Message-Id: <20190318133205.29705-4-andreas.reichel.ext@siemens.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190318133205.29705-1-andreas.reichel.ext@siemens.com> References: <20190318133205.29705-1-andreas.reichel.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: Fr1XhMamt547 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