From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6669723628337102848 X-Received: by 2002:a2e:909a:: with SMTP id l26mr996703ljg.1.1552916045179; Mon, 18 Mar 2019 06:34:05 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:7408:: with SMTP id v8ls1502924lfe.9.gmail; Mon, 18 Mar 2019 06:34:04 -0700 (PDT) X-Google-Smtp-Source: APXvYqyf9erUo33Elq4Hyf0AnNRBjcpg5MqZVDpKtOStGeH21XrJP4/QJ4qwaWqNxcaKNLyUb6w3 X-Received: by 2002:ac2:44a7:: with SMTP id c7mr214279lfm.7.1552916044695; 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=A77HojSb3Dxm61XOtVgeXs5S80O18Bzqo15Vuu7Vq2NQmP9351Du7awPmkoiMSItz4 iKwRM5ru6TIBENWTwLjGvBMAOODpG9EUjD66z4PMwQRvGGDbbmCY7YoRhVhoHfuAm7OF QOde15BmtlwSFDkaMpgVdR/aoubsUCXsbCmIpyAqJMW0BOjqP3m7QtoJ7gShWhItv91G Ygdol8d732nYWElsud93jB4SUEer15mEIssmYEhae9STJsJf8b1FD9SgnLgAyTbo4vwg BT/YlQJnhqh1N5utZJwpy+IxtedZniSxgks+KaacHg9JP6XDQeeM+qViNZUlw7OlDomv m9EA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=KBFxyaggMQC4aOXbm2tf/CYBwl3783gueVrcZW1KcJU=; b=VOBIEAq29J3IjWfV2g4TQ/pGe6D0MV6qIPPQqknxJQiOeDAfDpbkDaLgoGgmIY1YjY m3XVqZGwkSdNP5B4/f6Y5h0WkF8G9P6OVHpsNqbKaMNHnRJ09u9cnoAxUK25YQD526ow dGPO2L1PuzMupMGXXmbSjKBtN/Nm9M2z5SDuQzBe9rmJ2MECmby9TBZirS9fVAIpq/WX BpV786emOxvBw9nEofNRpcu9yBrNFyXhHSC106BsfXTA/crD6lZpBm1NIxVXejioJoc/ 57ua0b5KSn/RAgtfISX3OPGTH8b9zKOzj09KGdwqqWtFq+jgMeMv9dQpSa1s9rm/bvsi ohyw== 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 v74si8554lje.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.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 x2IDY3Dq032394 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 18 Mar 2019 14:34:03 +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 x2IDY3t5014851; Mon, 18 Mar 2019 14:34:03 +0100 From: "Andreas J. Reichel" To: isar-users@googlegroups.com Cc: Andreas Reichel Subject: [PATCH v5 0/5] Fix usage of additional apt keys and repos Date: Mon, 18 Mar 2019 14:31:59 +0100 Message-Id: <20190318133205.29705-1-andreas.reichel.ext@siemens.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: 51Ctf/sLXocC From: Andreas Reichel Diff to v4: * don't remove keyring deployed to target rootfs so that one can do updates later * keys are temporarily held in WORKDIR/aptkeys, not TMPDIR/aptkeys * variable renamed from APTKEYTMPDIR to APT_KEYS_DIR Unchanged with reason: * function for retreiving override for https is unchanged, since renaming this to one global function "get_distro_overrides" is better done in a separate patch. This patch should concentrate on getting things finally working, before changing too much code that is more or less a beautification. * (Other comments on mailing list) * HAVE_CUSTOM_APT_KEYS is used in patch 4, but introduced in patch 5, which is okay here, because we check if it exists... What this series does: * Enable/fix possibility of additional apt repos * Enable/fix handling of additional apt keys * Deduplicate some code Signed-off-by: Andreas Reichel Andreas Reichel (5): Revert "isar-bootstrap: Allow to set local keys in DISTRO_APT_KEYS" Remove duplicate code from apt-keyring generation Fix fetched key location in apt-keyring generator Use apt-key to generate apt-keyring If we use a custom keyring debootstrap may fall to https .../conf/multiconfig/qemuamd64-buster.conf | 1 - .../conf/multiconfig/qemuamd64-jessie.conf | 1 - meta/classes/isar-bootstrap-helper.bbclass | 2 + meta/conf/bitbake.conf | 1 + .../isar-bootstrap/isar-bootstrap.inc | 62 +++++++++++++------ 5 files changed, 47 insertions(+), 20 deletions(-) -- 2.21.0