From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7018933008204824576 X-Received: by 2002:a05:6512:33c8:: with SMTP id d8mr5184733lfg.621.1634222690967; Thu, 14 Oct 2021 07:44:50 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3f14:: with SMTP id y20ls358461lfa.1.gmail; Thu, 14 Oct 2021 07:44:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx6dK0EkNQCm5QLSKpj3OltU11sQWzwMtjgg+xePebeY2HL7R0mOiWtdNITHCSNPiR4DI5k X-Received: by 2002:a05:6512:3404:: with SMTP id i4mr5349122lfr.14.1634222689906; Thu, 14 Oct 2021 07:44:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634222689; cv=none; d=google.com; s=arc-20160816; b=jnqXk0CT/ol9nAIOvHo9dqofNeoJnClVFtYmqbgVqdLl+1zKpfeG4f/BJtDb6Zc4vZ 1UG2sTljqScrggA1P1JOKu1gldpBgbk90aSJGOD12cNYu52uUMh73xEWLoAvpkBe5MEB xlH7TKYSsxV2QXiR7wbwY88Re8PrS2tkW6OGk+WxGiXcrLCfiZyofbbALnvbh6FYAk6m IaEep22agYDZKFaO2QL4m9X5BOAvGhTZqo4WOqji1DOz9XGxZT2uQlyzUZ3EJMhBPIJR cz2ggw6wUUJva3fot1S3MsrHFRdj0RzkunmkOV4yxZeWQ/VtPt0mfKOMN5FOq0/c/gGz SERg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from; bh=Zlt3mY24wWaP5qFE8WCdQmDHa+e46spOSTgt364bkjc=; b=ZNpx7d8zMtpAtjyrOHjGIeFnxwjK3F2IkH+GHqiCl9vMUE624nvEzDXbIK1EuQm+2H Vtzo9FFBwo/elV12mMATXGcmomd2aIP88h+7W7jI1bx4VUd6Fap7wMTKvO1LfCsalqd2 4VUEl0vZDVBZAiC7011sW5t4JV8H7HoVhiweSb4xgc4rEsRL2SSRLogGCXPBbSDsqmm2 lf4YUDCbJ9TVBw3/LGTVWHVVZFSlBY+8Vogpf1to5tSNJbh7GZLQgT2JWck6pBLW7IRG 0igN0wo5aGlOv/bsbFMVw0DgqLLQ2IAiaoqUIjfXZiQJY/yf8++qZv27rzUdhsxG5u3j hNfg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=softfail (google.com: domain of transitioning anton.mikanovich@promwad.com does not designate 85.214.156.166 as permitted sender) smtp.mailfrom=anton.mikanovich@promwad.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=promwad.com Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id d19si172725lfa.0.2021.10.14.07.44.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Oct 2021 07:44:49 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning anton.mikanovich@promwad.com does not designate 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=softfail (google.com: domain of transitioning anton.mikanovich@promwad.com does not designate 85.214.156.166 as permitted sender) smtp.mailfrom=anton.mikanovich@promwad.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=promwad.com Received: from ws-323.promwad.corp (leased-line-st-87-252-252-30.telecom.by [87.252.252.30]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 19EEikNT014120 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA256 bits=128 verify=NOT); Thu, 14 Oct 2021 16:44:46 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH] isar-bootstrap: Remove GNUPGHOME sharing Date: Thu, 14 Oct 2021 17:44:43 +0300 Message-Id: <1634222683-29000-1-git-send-email-anton.mikanovich@promwad.com> X-Mailer: git-send-email 2.7.4 X-TUID: qyGG++qmTxI9 From: Anton Mikanovich Run every gpg-agent in separate GNUPGHOME to get rid of any conflicts in case of multiple keys defined in THIRD_PARTY_APT_KEYS. Fix issue #73 Signed-off-by: Anton Mikanovich --- meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index b8af6760..08b1486b 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -331,23 +331,22 @@ do_bootstrap() { mkdir -p "${ROOTFSDIR}/etc/apt/apt.conf.d" install -v -m644 "${WORKDIR}/isar-apt.conf" \ "${ROOTFSDIR}/etc/apt/apt.conf.d/50isar.conf" - if [ -n "${@get_distro_needs_gpg_support(d)}" ]; then + find ${APT_KEYS_DIR}/ -type f | while read keyfile + do MY_GPGHOME="$(chroot "${ROOTFSDIR}" mktemp -d /tmp/gpghomeXXXXXXXXXX)" echo "Created temporary directory ${MY_GPGHOME} for gpg-agent" export GNUPGHOME="${MY_GPGHOME}" APT_KEY_APPEND="--homedir ${MY_GPGHOME}" - fi - find ${APT_KEYS_DIR}/ -type f | while read keyfile - do + kfn="$(basename $keyfile)" cp $keyfile "${ROOTFSDIR}/tmp/$kfn" chroot "${ROOTFSDIR}" /usr/bin/gpg-agent --daemon -- /usr/bin/apt-key \ --keyring ${THIRD_PARTY_APT_KEYRING} ${APT_KEY_APPEND} add "/tmp/$kfn" rm "${ROOTFSDIR}/tmp/$kfn" - done - if [ -n "${MY_GPGHOME}" ]; then + + echo "Removing ${MY_GPGHOME}" rm -rf "${ROOTFSDIR}${MY_GPGHOME}" - fi + done if [ "${@get_distro_suite(d)}" = "stretch" ] && [ "${@get_host_release().split('.')[0]}" -lt "4" ]; then install -v -m644 "${WORKDIR}/isar-apt-fallback.conf" \ -- 2.20.1