From: Wang Mingyu <wan...@fujitsu.com> 0001-gpg_gpgme.c-fix-build-errors-with-older-gcc.patch removed since it's included in 1.17.1
Changelog: ============= -gpg_gpgme.c: fix build errors with older gcc -Fix some compiler warnings -Change header files to match a configured ABI regarding a zchunk support -Fix building zchunk code if zchunk is enabled Signed-off-by: Wang Mingyu <wan...@fujitsu.com> --- ...me.c-fix-build-errors-with-older-gcc.patch | 36 ------------------- .../{librepo_1.17.0.bb => librepo_1.17.1.bb} | 3 +- 2 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 meta/recipes-devtools/librepo/librepo/0001-gpg_gpgme.c-fix-build-errors-with-older-gcc.patch rename meta/recipes-devtools/librepo/{librepo_1.17.0.bb => librepo_1.17.1.bb} (88%) diff --git a/meta/recipes-devtools/librepo/librepo/0001-gpg_gpgme.c-fix-build-errors-with-older-gcc.patch b/meta/recipes-devtools/librepo/librepo/0001-gpg_gpgme.c-fix-build-errors-with-older-gcc.patch deleted file mode 100644 index 8727b181b3..0000000000 --- a/meta/recipes-devtools/librepo/librepo/0001-gpg_gpgme.c-fix-build-errors-with-older-gcc.patch +++ /dev/null @@ -1,36 +0,0 @@ -From b525cdec3051d1c6ff0c3cd38bf3070b18d6fb50 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <a...@linutronix.de> -Date: Wed, 6 Mar 2024 10:13:38 +0100 -Subject: [PATCH] gpg_gpgme.c: fix build errors with older gcc -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When selinux is not enabled, older gcc versions error out this way: - -| /home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-1938845/tmp-mc-tiny/hosttools/gcc -DG_LOG_DOMAIN=\"librepo\" -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -Dlibrepo_EXPORTS -I/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-1938845/tmp-mc-tiny/work/aarch64-linux/librepo-native/1.17.0/git -I/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-1938845/tmp-mc-tiny/work/aarch64-linux/librepo-native/1.17.0/recipe-sysroot-native/usr/lib/pkgconfig/../../../usr/include/libmount -I/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-1938845/tmp-mc-tiny/work/aarch64-linux/librepo-native/1.17.0/recipe-sysroot-native/usr/lib/pkgconfig/../../../usr/include/blkid -I/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-1938845/tmp-mc-tiny/work/aarch64-linux/librepo-native/1.17.0/recipe-sysroot-native/usr/lib/pkgconfig/../../../usr/include/glib-2.0 -I/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-19 38845/tmp-mc-tiny/work/aarch64-linux/librepo-native/1.17.0/recipe-sysroot-native/usr/lib/pkgconfig/../../../usr/lib/glib-2.0/include -I/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-1938845/tmp-mc-tiny/work/aarch64-linux/librepo-native/1.17.0/recipe-sysroot-native/usr/lib/pkgconfig/../../../usr/include/libxml2 -isystem/home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-1938845/tmp-mc-tiny/work/aarch64-linux/librepo-native/1.17.0/recipe-sysroot-native/usr/include -O2 -pipe -std=c99 -Wall -fPIC -MD -MT librepo/CMakeFiles/librepo.dir/gpg_gpgme.c.o -MF librepo/CMakeFiles/librepo.dir/gpg_gpgme.c.o.d -o librepo/CMakeFiles/librepo.dir/gpg_gpgme.c.o -c /home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-1938845/tmp-mc-tiny/work/aarch64-linux/librepo-native/1.17.0/git/librepo/gpg_gpgme.c -| /home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-1938845/tmp-mc-tiny/work/aarch64-linux/librepo-native/1.17.0/git/librepo/gpg_gpgme.c: In function ‘lr_gpg_ensure_socket_dir_exists’: -| /home/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-1938845/tmp-mc-tiny/work/aarch64-linux/librepo-native/1.17.0/git/librepo/gpg_gpgme.c:135:1: error: label at end of compound statement -| 135 | exit: -| | ^~~~ - -Ensuring the exit: block is not empty fixes the issue. - -Upstream-Status: Submitted [https://github.com/rpm-software-management/librepo/pull/300] -Signed-off-by: Alexander Kanavin <a...@linutronix.de> ---- - librepo/gpg_gpgme.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/librepo/gpg_gpgme.c b/librepo/gpg_gpgme.c -index c4addb2..47c3153 100644 ---- a/librepo/gpg_gpgme.c -+++ b/librepo/gpg_gpgme.c -@@ -144,6 +144,7 @@ exit: - } - freecon(old_default_context); - #endif -+ return; - } - - static gpgme_ctx_t diff --git a/meta/recipes-devtools/librepo/librepo_1.17.0.bb b/meta/recipes-devtools/librepo/librepo_1.17.1.bb similarity index 88% rename from meta/recipes-devtools/librepo/librepo_1.17.0.bb rename to meta/recipes-devtools/librepo/librepo_1.17.1.bb index 810191459d..beb8baf8d6 100644 --- a/meta/recipes-devtools/librepo/librepo_1.17.0.bb +++ b/meta/recipes-devtools/librepo/librepo_1.17.1.bb @@ -8,10 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "git://github.com/rpm-software-management/librepo.git;branch=master;protocol=https \ file://0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch \ file://0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch \ - file://0001-gpg_gpgme.c-fix-build-errors-with-older-gcc.patch \ " -SRCREV = "ae727d99086f70f39fba5695af5460e1da908c1b" +SRCREV = "4ff11d85cb06026943f297bc3e06f047dd73bf0b" S = "${WORKDIR}/git" -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#198032): https://lists.openembedded.org/g/openembedded-core/message/198032 Mute This Topic: https://lists.openembedded.org/mt/105417639/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-