mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-27 12:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

opkg: ensure opkg uses private gpg.conf when applying keys.

Browse Source 
Currently, the opkg-key utility calls gpg with --no-options,
which uses /dev/null as the configuration file. This means
any configurations in /etc/opkg/gpg/gpg.conf were being
ignored. This change applies a patch to remove the
--no-options flag.

(From OE-Core rev: f206f5c55bd6ba59ba1455ea8a8a146c901c5194)

Signed-off-by: Charlie Johnston <charlie.johnston@ni.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 3699096f3214e77fe4aa1daebe85308d02940f2f)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Charlie Johnston
2023-01-09 15:22:00 -06:00
committed by Richard Purdie
parent 2422f7bfef
commit 371b1b1e59
2 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
meta/recipes-devtools/opkg/opkg/0002-opkg-key-remove-no-options-flag-from-gpg-calls.patch Normal file
View File

@@ -0,0 +1,34 @@
From a658e6402382250f0164c5b47b744740e04f3611 Mon Sep 17 00:00:00 2001
From: Charlie Johnston <charlie.johnston@ni.com>
Date: Fri, 30 Dec 2022 15:21:14 -0600
Subject: [PATCH] opkg-key: Remove --no-options flag from gpg calls.
The opkg-key script was always passing the --no-options
flag to gpg, which uses /dev/null as the options file.
As a result, the opkg gpg.conf file was not getting
used. This change removes that flag so that gpg.conf
in the GPGHOMEDIR for opkg (currently /etc/opkg/gpg/)
will be used if present.
Upstream-Status: Accepted [https://git.yoctoproject.org/opkg/commit/?id=cee294e72d257417b5e55ef7a76a0fd15313e46b]
Signed-off-by: Charlie Johnston <charlie.johnston@ni.com>
---
utils/opkg-key | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/utils/opkg-key b/utils/opkg-key
index e395a59..8645ebc 100755
--- a/utils/opkg-key
+++ b/utils/opkg-key
@@ -53,7 +53,7 @@ else
exit 1
fi
-GPG="$GPGCMD --no-options --homedir $GPGHOMEDIR"
+GPG="$GPGCMD --homedir $GPGHOMEDIR"
# Gpg home dir isn't created automatically when --homedir option is used
if [ ! -e "$GPGHOMEDIR" ]; then
--
2.30.2

1
meta/recipes-devtools/opkg/opkg_0.6.1.bb
View File

@@ -15,6 +15,7 @@ PE = "1"
SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz \
file://opkg.conf \
file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \
file://0002-opkg-key-remove-no-options-flag-from-gpg-calls.patch \
file://run-ptest \
"