summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/opkg/opkg/0001-opkg-key-Backport-improvements.patch78
-rw-r--r--meta/recipes-devtools/opkg/opkg_0.2.4.bb1
2 files changed, 79 insertions, 0 deletions
diff --git a/meta/recipes-devtools/opkg/opkg/0001-opkg-key-Backport-improvements.patch b/meta/recipes-devtools/opkg/opkg/0001-opkg-key-Backport-improvements.patch
new file mode 100644
index 0000000000..ae319ce2bb
--- /dev/null
+++ b/meta/recipes-devtools/opkg/opkg/0001-opkg-key-Backport-improvements.patch
@@ -0,0 +1,78 @@
1From 87bec8300a1122829b2ed565db7da5bacfa88919 Mon Sep 17 00:00:00 2001
2From: Paul Barker <paul@paulbarker.me.uk>
3Date: Sun, 12 Oct 2014 09:59:53 +0000
4Subject: [PATCH] opkg-key: Backport improvements
5
6The improvements to opkg-key made for v0.3.0 are backported. The rest of v0.3.0
7needs further testing and bugfixing prior to release, but the improvements to
8opkg-key have been tested and work well.
9
10 1) opkg-key: Add 'reset' option
11
12 This option removes the keyrings used to verify package signatures,
13 effectively resetting opkg to the initial state where it recognises no
14 keys.
15
16 2) opkg-key: Add 'populate' option
17
18 This option causes all keyrings in /usr/share/opkg/keyrings to be
19 imported. Thus distributions may install their keys into this directory
20 and use 'opkg-key populate' to ensure the correct keys are loaded.
21
22 3) opkg-key: Improve usage output
23
24Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
25Upstream-status: Backport
26---
27 utils/opkg-key | 26 ++++++++++++++++++++++----
28 1 file changed, 22 insertions(+), 4 deletions(-)
29
30diff --git a/utils/opkg-key b/utils/opkg-key
31index 266bb66..085f1e8 100755
32--- a/utils/opkg-key
33+++ b/utils/opkg-key
34@@ -10,12 +10,17 @@ usage() {
35 echo
36 echo "Manage opkg's list of trusted keys"
37 echo
38- echo " opkg-key add <file> - add the key contained in <file> ('-' for stdin)"
39- echo " opkg-key del <keyid> - remove the key <keyid>"
40- echo " opkg-key list - list keys"
41+ echo "Commands and arguments:"
42+ echo " add <file> - Add the key contained in <file> ('-' for stdin)"
43+ echo " del <keyid> - Remove the key <keyid>"
44+ echo " list - List keys"
45+ echo " fingerprint - List keys with fingerprints"
46+ echo " reset - Remove all keys, resetting the keyring"
47+ echo " populate - Import keys from /usr/share/opkg/keyrings"
48+ echo " help - Print this usage message and exit"
49 echo
50 echo "Options:"
51- echo " -o <root> Use <root> as the offline root directory"
52+ echo " -o <root> - Use <root> as the offline root directory"
53 echo
54 }
55
56@@ -64,6 +69,19 @@ case "$command" in
57 echo "Executing: $GPG $*"
58 $GPG $*
59 ;;
60+ reset)
61+ rm -f $ROOT/etc/opkg/trusted.gpg $ROOT/etc/opkg/trusted.gpg~
62+ rm -f $ROOT/etc/opkg/secring.gpg $ROOT/etc/opkg/secring.gpg~
63+ rm -f $ROOT/etc/opkg/trustdb.gpg $ROOT/etc/opkg/trustdb.gpg~
64+ echo "OK"
65+ ;;
66+ populate)
67+ for f in $ROOT/usr/share/opkg/keyrings/*.gpg; do
68+ echo "Importing keys from '`basename $f`'..."
69+ $GPG --quiet --batch --import "$f"
70+ done
71+ echo "OK"
72+ ;;
73 help)
74 usage
75 ;;
76--
771.9.1
78
diff --git a/meta/recipes-devtools/opkg/opkg_0.2.4.bb b/meta/recipes-devtools/opkg/opkg_0.2.4.bb
index 5aaabcf08b..7b49d5efe6 100644
--- a/meta/recipes-devtools/opkg/opkg_0.2.4.bb
+++ b/meta/recipes-devtools/opkg/opkg_0.2.4.bb
@@ -16,6 +16,7 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz
16 file://remove-ACLOCAL_AMFLAGS-I-shave-I-m4.patch \ 16 file://remove-ACLOCAL_AMFLAGS-I-shave-I-m4.patch \
17 file://opkg-configure.service \ 17 file://opkg-configure.service \
18 file://opkg.conf \ 18 file://opkg.conf \
19 file://0001-opkg-key-Backport-improvements.patch \
19" 20"
20 21
21S = "${WORKDIR}/${BPN}-${PV}" 22S = "${WORKDIR}/${BPN}-${PV}"