opkg: upgrade 0.6.1 -> 0.6.2

0001-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch
0002-opkg-key-remove-no-options-flag-from-gpg-calls.patch
removed since they're included in 0.6.2.

Changelog:
===========
### Changed
- the project's developer documentation to be more correct and current.

### Fixed
- a bug in the 'opkg-keys' utility script which caused the script to ignore settings in the '/etc/opkg/gpg/gpg.conf' file.
- a compilation error in 'md5.c' when using clang16+ and '-std >= gnu11'.

(From OE-Core rev: 5bdfde3fd4266d637019b59d55a33438cb36903f)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit d7c8a58297e38f6222035aa9135fedf2ca387742)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
Wang Mingyu
2023-07-17 17:10:15 +08:00
committed by Steve Sakoman
parent 078269eedf
commit abbd466097
3 changed files with 2 additions and 89 deletions

View File

@@ -1,51 +0,0 @@
From 4089affd371e6d62dd8c1e57b344f8cc329005ea Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 14 Jan 2023 23:11:08 -0800
Subject: [PATCH] Define alignof using _Alignof when using C11 or newer
WG14 N2350 made very clear that it is an UB having type definitions
within "offsetof" [1]. This patch enhances the implementation of macro
alignof_slot to use builtin "_Alignof" to avoid undefined behavior on
when using std=c11 or newer
clang 16+ has started to flag this [2]
Fixes build when using -std >= gnu11 and using clang16+
Older compilers gcc < 4.9 or clang < 8 has buggy _Alignof even though it
may support C11, exclude those compilers too
[1] https://www.open-std.org/jtc1/sc22/wg14/www/docs/n2350.htm
[2] https://reviews.llvm.org/D133574
Upstream-Status: Submitted [https://groups.google.com/g/opkg-devel/c/gjcQPZgT_jI]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
libopkg/md5.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/libopkg/md5.c b/libopkg/md5.c
index 981b9b8..ccb645e 100644
--- a/libopkg/md5.c
+++ b/libopkg/md5.c
@@ -237,7 +237,17 @@ void md5_process_bytes(const void *buffer, size_t len, struct md5_ctx *ctx)
/* Process available complete blocks. */
if (len >= 64) {
#if !_STRING_ARCH_unaligned
+/* GCC releases before GCC 4.9 had a bug in _Alignof. See GCC bug 52023
+ <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>.
+ clang versions < 8.0.0 have the same bug. */
+#if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \
+ || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \
+ && !defined __clang__) \
+ || (defined __clang__ && __clang_major__ < 8))
#define alignof(type) offsetof (struct { char c; type x; }, x)
+#else
+#define alignof(type) _Alignof(type)
+#endif
#define UNALIGNED_P(p) (((size_t) p) % alignof (uint32_t) != 0)
if (UNALIGNED_P(buffer))
while (len > 64) {
--
2.39.0

View File

@@ -1,34 +0,0 @@
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

View File

@@ -15,12 +15,10 @@ 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://0001-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch \
file://run-ptest \
"
"
SRC_URI[sha256sum] = "e87fccb575c64d3ac0559444016a2795f12125986a0da896bab97c4a1a2f1b2a"
SRC_URI[sha256sum] = "ac73a90a2549cd04948e563d915912c78e1b8ba0f43af75c5a53fcca474adbd5"
# This needs to be before ptest inherit, otherwise all ptest files end packaged
# in libopkg package if OPKGLIBDIR == libdir, because default