From patchwork Mon Jul 1 16:57:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 45877 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4C5B1C3DA64 for ; Mon, 1 Jul 2024 16:58:00 +0000 (UTC) Received: from a27-33.smtp-out.us-west-2.amazonses.com (a27-33.smtp-out.us-west-2.amazonses.com [54.240.27.33]) by mx.groups.io with SMTP id smtpd.web11.2181.1719853076346746181 for ; Mon, 01 Jul 2024 09:57:56 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx header.b=SEkw17/t; dkim=pass header.i=@amazonses.com header.s=7v7vs6w47njt4pimodk5mmttbegzsi6n header.b=qyuiB1D7; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.33, mailfrom: 010101906f3b4bca-589aebe0-60b7-4341-83c3-0c08ce9ec579-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx; d=yoctoproject.org; t=1719853075; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=N40hkDB1Wh6eynbvtKUP2foiVrp3jbMBOrd5VVZAuFM=; b=SEkw17/tJpAbedHp9O75bLgwJleaAebqTQ5cH0gD77/7ffFr/niCrsPh8625Uos2 MvYmb8Q53b9DY+BDH4/OB6eMyW22pROSHnFyDpJFAC5DLFWhtve+DPJQZmga0AIZ8QT 8JLluJiECQD0jgToaKFAtxl8vXQmTxiRdqCK9fUQ= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=7v7vs6w47njt4pimodk5mmttbegzsi6n; d=amazonses.com; t=1719853075; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=N40hkDB1Wh6eynbvtKUP2foiVrp3jbMBOrd5VVZAuFM=; b=qyuiB1D75ZxYCevonUGCc+gWDlLevilY7N27i8hiftWPYvOch5hl0+EmOYb/0ZbL IFzirvJRTK7+8SYXFwx6v3vl9nwVn7QX6Z1tASdEXUFfjop/9n4pRXu2QUtUMfMcr4D Tc3bNXmz5zer2chqPohaiHAMCZtgYiZiBCzk2p0g= MIME-Version: 1.0 From: auh@yoctoproject.org To: Wang Mingyu Cc: openembedded-core@lists.openembedded.org Subject: [AUH] librepo: upgrading to 1.17.2 SUCCEEDED Message-ID: <010101906f3b4bca-589aebe0-60b7-4341-83c3-0c08ce9ec579-000000@us-west-2.amazonses.com> Date: Mon, 1 Jul 2024 16:57:55 +0000 Feedback-ID: ::1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2024.07.01-54.240.27.33 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 01 Jul 2024 16:58:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/201346 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *librepo* to *1.17.2* has Succeeded. Next steps: - apply the patch: git am 0001-librepo-upgrade-1.17.0-1.17.2.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From 488707e1d27424e715ab504e9d65fbbf11b511a5 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Mon, 1 Jul 2024 07:59:12 +0000 Subject: [PATCH] librepo: upgrade 1.17.0 -> 1.17.2 --- ...me.c-fix-build-errors-with-older-gcc.patch | 36 ------------------- ...tain-PYTHON_INSTALL_DIR-by-running-p.patch | 2 +- ...les-with-pkg-config-not-with-cmake-m.patch | 6 ++-- .../{librepo_1.17.0.bb => librepo_1.17.2.bb} | 3 +- 4 files changed, 5 insertions(+), 42 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.2.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 -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-1938845/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 ---- - 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/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch b/meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch index 4a851ad1e2..612f567a0b 100644 --- a/meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch +++ b/meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch @@ -1,4 +1,4 @@ -From 76052aa40c61580869472fd3f009a4ab1620b998 Mon Sep 17 00:00:00 2001 +From 8611625169cddfe8451012b578b0797562cd0949 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 30 Dec 2016 18:05:36 +0200 Subject: [PATCH] Do not try to obtain PYTHON_INSTALL_DIR by running python. diff --git a/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch b/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch index fd1df95473..3f28fb34f2 100644 --- a/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch +++ b/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch @@ -1,4 +1,4 @@ -From b5918f06d790dc346d41de4b3a3ec01f290c1d25 Mon Sep 17 00:00:00 2001 +From b9673288faa7d3b95f42bdac95b3e46bc4d576f0 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 30 Dec 2016 18:23:27 +0200 Subject: [PATCH] Set gpgme variables with pkg-config, not with cmake module @@ -11,10 +11,10 @@ Signed-off-by: Alexander Kanavin 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6c00024..a2f57af 100644 +index 166ac03..e4bd7a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -37,7 +37,8 @@ PKG_CHECK_MODULES(LIBXML2 libxml-2.0 REQUIRED) +@@ -38,7 +38,8 @@ PKG_CHECK_MODULES(LIBXML2 libxml-2.0 REQUIRED) FIND_PACKAGE(CURL 7.52.0 REQUIRED) IF (USE_GPGME) diff --git a/meta/recipes-devtools/librepo/librepo_1.17.0.bb b/meta/recipes-devtools/librepo/librepo_1.17.2.bb similarity index 88% rename from meta/recipes-devtools/librepo/librepo_1.17.0.bb rename to meta/recipes-devtools/librepo/librepo_1.17.2.bb index 810191459d..08ccce1623 100644 --- a/meta/recipes-devtools/librepo/librepo_1.17.0.bb +++ b/meta/recipes-devtools/librepo/librepo_1.17.2.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 = "138b71be24704d89c114511f4a3637c7d2de684a" S = "${WORKDIR}/git"