From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6658246660386193408 X-Received: by 2002:adf:e412:: with SMTP id g18mr73439wrm.9.1551189036368; Tue, 26 Feb 2019 05:50:36 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:b1c5:: with SMTP id a188ls188588wmf.5.gmail; Tue, 26 Feb 2019 05:50:36 -0800 (PST) X-Google-Smtp-Source: AHgI3IZeguz3zdTm4rVcbPm3AKBOhloCS8TjqzBc7m+SJH+vNetYniasSzl1n5pANnBwR1LPtLIP X-Received: by 2002:a1c:cb8d:: with SMTP id b135mr323165wmg.22.1551189035964; Tue, 26 Feb 2019 05:50:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551189035; cv=none; d=google.com; s=arc-20160816; b=rxWExTmNV8iTyfzSEj8l3HSXe/qzauMaQIoFouQCQYVpvfONbjLySHhXgtvvHUKm0S Ms4BdLm1LNMegtfP5aBZdnZYWlOeFsdfvD4Iy78wBc/sCzOlYTLoWUkTp7weoMs+QsWW Flf3X+ImgE20yc9UAP5KGf8dbWs2B6ecI57p9NRxexmWBRvWk/O500fR1cyRrB+sN0JQ ybOeJY5qpoNuREDX+64+PhCzCHK1ATBLANCI1m45ut28MDLUxAxccewNWEbTgzYeg7rK ezaXUVp+L1zaccUCWvhwNh+/9vxfcldBqReUhemoO/Brnp/fLCT05FwQs3Oh7VI7YwI6 qgeQ== 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=XZ1KkH3EER53FWIUs2PDPqArDhcJqtbR9bN9B3bO+Wo=; b=X+SaPRM67yaUIL/fKj8AISaFzTasQL3cn0vlZOwX7iUFBX4fFUI4yXr3SLxVg1sofD jnziXcRL2y7uc+Txs56n8nKZfii2KnY4ndKT/sOtpZ2hbsZcRjt7cez9HdXdCOVrBCQJ KpbDCD0m/lKUsc4GIIdXMBoY+TwFymnCU7Hs3dBGCum5TSqdVrNL7uxCmmfFRmmcTlTI VO1GASqxjsNPbr/xu+q/esclmr+kx1yGu4mrzrH4l7Xuz+xh/H7EUE4cQfRiR8on79aI ZZXn98Rukv0aKi2YAg/khxN+4XhE4+k7C+G5nwM7TqsjAbTBZbA/pQTjdT+WSKdJQrtS 6PZw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of andreas.reichel.ext@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=andreas.reichel.ext@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id j43si117384wre.2.2019.02.26.05.50.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Feb 2019 05:50:35 -0800 (PST) Received-SPF: pass (google.com: domain of andreas.reichel.ext@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of andreas.reichel.ext@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=andreas.reichel.ext@siemens.com Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id x1QDoZQB016206 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 26 Feb 2019 14:50:35 +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 x1QDoZd7003394; Tue, 26 Feb 2019 14:50:35 +0100 From: "Andreas J. Reichel" To: isar-users@googlegroups.com Cc: Andreas Reichel Subject: [RFC v1 1/3] Fix path to user gpg-keys Date: Tue, 26 Feb 2019 14:48:42 +0100 Message-Id: <20190226134844.8632-2-andreas.reichel.ext@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190226134844.8632-1-andreas.reichel.ext@siemens.com> References: <20190226134844.8632-1-andreas.reichel.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: 0rxN1gm1OZmO From: Andreas Reichel If the key is fetched from remote (currently http, https), use the basename, otherwise, use the absolute path. Signed-off-by: Andreas Reichel --- meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index 234d339..25133be 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -40,7 +40,10 @@ python () { d.setVar("DEBOOTSTRAP_KEYRING", "--keyring ${APTKEYRING}") for key in distro_apt_keys.split(): url = urlparse(key) - filename = ''.join([wd, url.path]) + if "https://" in key or "http://" in key: + filename = os.path.basename(url.path) + else: + filename = ''.join([wd, url.path]) d.appendVar("SRC_URI", " %s" % key) d.appendVar("APTKEYFILES", " %s" % filename) if bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')): -- 2.20.1