From patchwork Fri Jan 22 07:09:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 287 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:94eb:0:0:0:0:0 with SMTP id l40csp1464207ooi; Fri, 22 Jan 2021 09:09:17 -0800 (PST) X-Received: by 2002:a17:906:a88d:: with SMTP id ha13mr3442291ejb.124.1611335357229; Fri, 22 Jan 2021 09:09:17 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1611335357; cv=pass; d=google.com; s=arc-20160816; b=czI3Wjt6yp+W4JLx8sUvtb1o9LpeleuO5nCcorZlp2NjdQ7xQCveDMAekI73FREdR8 eiAuEvjOVHmuNO9Xy3Df0QAprrcjTTrayyAQggl7DYpepekZR8X6/V7ogzv2os3j8nQp Sw3Q3qeNKYFB3gpOCjrxliFzbBV+efu27kA80jSyIsEBMKV8RVmucs+K+vS/EegnGcOA c4HcL1sxSI+Dh38G03QJ0LPRgw+IFSMfTVywWhbpnlElpdNp8eRmeQMaAWxI3iJBcMdW I4C8+C4PYl/MGZomEWeVzH+ZXC2/osMwPy9JpbsWr+Usdm/d3hbL53cszpQuZUhTfs3D Zw0w== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:cc:to:from:sender:dkim-signature; bh=pBdikHCoQ6ttx4wIuOfYJP3sAzJmNhejGTlglWhEUng=; b=QcOvF/ylbi1HJOiy1NOziFTeDqbhaIx+4MyClyB642KkMV6ZRpFa0VtVyGBDsg6CRO 7ZNK1RSiGxVoYJBMYgEHoJCM9U8kz+cBkQGOn24uiFhJ1KNBfsheSVr6KGXIgJb0MLGn Q5Cu1dWauSZ78cAw3S5KdiqnaHSIpi1oReQxC+CSCQbBEYcbKOzRuCmX4rBKvZ/YbLTx rJStIodZuS2Wn6J45C0kP+t+oeGEOSzuea+GtkkUDzhE00nM6qgNHQYbTawIDG835RqH WYT2MOn9b5/fxkcm9CVpk3CPgrtIbFfTzZ+jGWDfBS2MECcdnBIzrTQj+z1hlasvSOax +CAw== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=VGU6mKfz; arc=pass (i=2 spf=pass spfdomain=ilbers.de); spf=pass (google.com: domain of isar-users+bncbchiponzwecrbpenvsaamgqeobbcoda@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCHIPONZWECRBPENVSAAMGQEOBBCODA@googlegroups.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id x10sor6323208ejj.61.2021.01.22.09.09.16 (Google Transport Security); Fri, 22 Jan 2021 09:09:17 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbchiponzwecrbpenvsaamgqeobbcoda@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=VGU6mKfz; arc=pass (i=2 spf=pass spfdomain=ilbers.de); spf=pass (google.com: domain of isar-users+bncbchiponzwecrbpenvsaamgqeobbcoda@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCHIPONZWECRBPENVSAAMGQEOBBCODA@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1611335356; cv=pass; d=google.com; s=arc-20160816; b=ceXb7K6oWam8ncR35gx1k8hemISENGIbPukN9NtvJA+2JZ16TjDJrfBDa8SWzRJPCB XP1RzBaEZmsM+c7aOVzftZjF6UdJKf4IrYo9g76JZ/nCvq/8oLSSR4kEyvY9kmdMbLLp sC/stHobpEHzjx5cDzo9nbUcGJtDvAEXFdo01b0hBUG/XBpiIPbqn6V0ykHzEgh8XVFQ xAH53JSd+kH9wkVfHISDHqDFtzH1p7pT5jSFzIR7ttysbr/zyKIwX90KePNVu3fKhssm iPbHyim7NQl4jm9AQwMJrF+IqqOlh1ybcjDWzIetxZJEMbXHrbocO+zWAImKav3a5OP0 g60w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:cc:to:from:sender:dkim-signature; bh=pBdikHCoQ6ttx4wIuOfYJP3sAzJmNhejGTlglWhEUng=; b=LBhB6AvvU8QryxKEd4Ktv8Bau6M2yt5Ouh1bME5BUu7zwIU3RgFjqrVA1cPzDOfKrp ySryz5Gj/OHO4vPP6mScdi1wxInSt7S8BQ+rFxSkZz3LxVzFN5t4GEnBFLqHkc1zGQPN eq6FUAvgcNPj0cmSTl3rjCHwRYNw1DJM3RKji61Y+LEKE4o0eqAALN0Ih0j5Z4kL+yIk qGfwfgk5nZh5/uFGpPebEuD+UmgAm9OnEbi5W4au4Q1Pv+/8EgWDI762VOPUhZ02cgg5 gxVlTG8iThD6TCd9MyV4mgv+dpwRIQHo8qR4HaYwPYFUetyo/zgItnTJG8SigIuFjIlh G1ww== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=pBdikHCoQ6ttx4wIuOfYJP3sAzJmNhejGTlglWhEUng=; b=VGU6mKfz9RXNNY1DRW9Vfcw6K6UNOJTH5bi/w1DS00UtYKA5CPf3j1dnMXwso+VqWF j3B4UqiSsdBJKoaYU7WRHfZFxeCoUrJb5maPBwMgXNDPG6iFE7gOYVtTbtUL7YFP8SsL Lv2YkfSsTA0ebxxSG1e86syddubTacnrR+6WaBdETcRqxYeO5m7/w1GC6Y6I8WgnvZZr qndd4QFFPWuDef/ILWI+8Mqm4YhaoG7ANfr4UntgEvfSABaAXG3Kej/jQoTaCRFGkurk 9DEtiWB41l30SqP7wVDZrz+x297IHO0HVSaKj5cVXLucsXl1R9KwubV2GB+H+Y9y+H9U nV7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:x-spam-checked-in-group:list-post :list-help:list-archive:list-subscribe:list-unsubscribe; bh=pBdikHCoQ6ttx4wIuOfYJP3sAzJmNhejGTlglWhEUng=; b=a6DRD/PNkJEHoOIY6WuYCerIjhDLCpAhyBAC5RCxYn4SBHqMk2uZ/uJ1I4wDwH7Wfj Ayytj0UrZlDwGQWZCU7nBA2TSWlAUcOIra3LV1bKbkV4ueSGsqVGA2fDEJRgFB40/huS KPfxORpPv/mDBp2LuYEWHHTwuPjo+4W61ora+mCalovve4oOYRWsoWio1svbEH8ZdvUA 1PPvgppq06Xcfl5MB4hZJCUu3Lrv4u/nKn0UrWIsAaRqUwTYayHhI9IBvndQLctl8kkG cvXA0z85j4nTkY8WD7BsgL2wkOnHztaRNH779kpnZwMcAec+frWMjLFl8BRX5zG19nsu 6tSQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM533I+OdD5UQbQX7trVv5FCmtiiI6zCiUSCcpA8z9bUJfzaolbGwg AdiplZQeQetZYu02UacwZFw= X-Google-Smtp-Source: ABdhPJxDtAJV8Cl7mIPKeZotO1jElulqTS7bPjgqPdomJqNByMmpzf//dQptFOd5ttxe5QdMc2chEw== X-Received: by 2002:a17:907:2705:: with SMTP id w5mr3498793ejk.505.1611335356466; Fri, 22 Jan 2021 09:09:16 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:907:7641:: with SMTP id kj1ls3293177ejc.4.gmail; Fri, 22 Jan 2021 09:09:15 -0800 (PST) X-Received: by 2002:a17:906:94ce:: with SMTP id d14mr3559943ejy.121.1611335355561; Fri, 22 Jan 2021 09:09:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611335355; cv=none; d=google.com; s=arc-20160816; b=W9xU5RV3mE7zaHTedzjP9fBCc8ZIjV65Yq3uiFvDStquQZEcZLTnL4m0XZDCPH0Yhb 9hqcgw1id4DgYzCGgVXo0tKli2fKQxfRFzuEOg3xJxsxIRFuu1doh/bDB3/GGsXtfSnS X6Qx6t81BWF0c9hL+lnkUcWaNrg/CSK5x24X9sge72CkuGsg6hNQ1n0qasuWJk35utVo fzoX5CHJ8qbaReRV5HS4Hx5eoAX5BttTLbK7JINKsWwKfeo2VMbHzfJRnT5/Jn+rmt1X 8yjD9n6JiPXbsfdCO7FwgUttd7RuX8Rh7OK9RGwZ5qZRipSQmIEybfGIsf4DCTezW1KR 37zA== 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=y+RAgk4RnNHbH9xXp8F15GC2zHJETtkGKbhq1vNtLqE=; b=YJIsHqb0gyKeG3Odq0i4PQSY+J+F/bAPQI75CSG72eMwalfig+T4TRBAYztBxAfu74 ULHX26H8UQ7TAu8+C1F6u2KdTUc+hOW9GOLWPXfe/TF7QNCYKXupIMlQKV9oQFV4gsVw RNEGgXKw/OmFNNiAUGg0pxDIaTMhT9y/mFaiA1WecrAkuGEeqU/ApLQB47DC8i+0ZyR5 EldMMoNyR2Rr2qvSOTFcZTOne+s/kKI2EV4XU+Ohv1qaYYSlgKoJdKmG0k5tP7O3VBg/ NFtLGfDm+dhmiUvtbeICdlZnY1hWcIQUGpJSgVhg0BomflMLpewLlSgXvJR1IbzmNDr+ 7bDw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id f4si291037edr.2.2021.01.22.09.09.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 22 Jan 2021 09:09:15 -0800 (PST) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from localhost.localdomain (mm-114-76-121-178.mgts.dynamic.pppoe.byfly.by [178.121.76.114] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 10MH9EGs029435 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 22 Jan 2021 18:09:14 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Yuri Adamov , Anton Mikanovich Subject: [PATCH v3] isar-bootstrap: Run gpg-agent before starting apt-key Date: Fri, 22 Jan 2021 20:09:03 +0300 Message-Id: <20210122170903.28134-1-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1689607583288265081?= X-GMAIL-MSGID: =?utf-8?q?1689607583288265081?= From: Yuri Adamov Building rpi-stretch natively (under qemu) sometimes fails with: gpg: can't connect to the agent: IPC connect call failed gpg starts gpg-agent and times out after 5 s. This value is hard-coded. Besides, leaving running gpg-agent processes is not clean and prevents unmounting of filesystems. This patch starts and stops the agent manually. Signed-off-by: Yuri Adamov Signed-off-by: Anton Mikanovich --- Changes since v2: - Restored conditional gnupg include. - Made gpg-agent run in gpg enabled builds only. Changes since v1: - Removed unnecessary sleeping. - Removed -9 in kill. - Commented unconditionally gnupg package append. - Removed unused OVERRIDES_append and get_distro_needs_gpg_support(). --- meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index 8f5f727..0edefc5 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -309,14 +309,25 @@ isar_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 [ "${@get_distro_needs_gpg_support(d)}" = "gnupg" ]; then + MY_GPGHOME="$(chroot "${ROOTFSDIR}" mktemp -d /tmp/gpghomeXXXXXXXXXX)" + echo "Created temporary directory ${MY_GPGHOME} for gpg-agent" + export GNUPGHOME="${MY_GPGHOME}" + chroot "${ROOTFSDIR}" gpg-agent --daemon + 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/apt-key \ - --keyring ${THIRD_PARTY_APT_KEYRING} add "/tmp/$kfn" + --keyring ${THIRD_PARTY_APT_KEYRING} ${APT_KEY_APPEND} add "/tmp/$kfn" rm "${ROOTFSDIR}/tmp/$kfn" done + if [ -d "${MY_GPGHOME}" ]; then + echo "Killing gpg-agent for ${MY_GPGHOME}" + chroot "${ROOTFSDIR}" gpgconf --kill gpg-agent && /bin/rm -rf "${MY_GPGHOME}" + fi if [ "${@get_distro_suite(d, True)}" = "stretch" ] && [ "${@get_host_release().split('.')[0]}" -lt "4" ]; then install -v -m644 "${WORKDIR}/isar-apt-fallback.conf" \