From patchwork Fri Sep 15 18:59:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 30540 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 BA01EEEEC34 for ; Fri, 15 Sep 2023 19:00:02 +0000 (UTC) Received: from a27-31.smtp-out.us-west-2.amazonses.com (a27-31.smtp-out.us-west-2.amazonses.com [54.240.27.31]) by mx.groups.io with SMTP id smtpd.web11.29483.1694804396105084019 for ; Fri, 15 Sep 2023 11:59:56 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky header.b=UC9LECe4; dkim=pass header.i=@amazonses.com header.s=hsbnp7p3ensaochzwyq5wwmceodymuwv header.b=VNwF3IMl; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.31, mailfrom: 0101018a9a36c5b9-0d775b60-b614-488b-a187-531cc98b715d-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky; d=yoctoproject.org; t=1694804395; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=3k/fuo3zyoCwxC5M69o6tIGpk8jkNOZ3B3GmohP7DPk=; b=UC9LECe44+SyO0NtD6TFul5CHllPhdcABRDxE5pYNLcLcMucV5tJLQY2y8Tx6M/1 S0VlFMps8et1U5Y6TDHsk6hy4V8X+Ip2jDtuBBJ2fGRomIt5QkwdIyOeVOyUSzsiCU/ bzyzjs5w+P6VXQQAMr9Epoue3wR4wjUeAyfob92U= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=hsbnp7p3ensaochzwyq5wwmceodymuwv; d=amazonses.com; t=1694804395; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=3k/fuo3zyoCwxC5M69o6tIGpk8jkNOZ3B3GmohP7DPk=; b=VNwF3IMlmOAohpsycRnD0izgbiTwjtZUmQPEaffv+GMnI+0V2B3g7R+LcCg1CQ2U OzbMYV4cSPm0hawFCytzRgXvLC0guQoHuUWh2qloA7Lswlz6uPrSYpyyHFSK6GLhD8B eMAJL3KXFgxLxXt7OIMxRb3OUjDsW7fPpH94SdsE= MIME-Version: 1.0 From: auh@yoctoproject.org To: Michael Opdenacker Cc: openembedded-core@lists.openembedded.org Subject: [AUH] alsa-utils: upgrading to 1.2.10 FAILED Message-ID: <0101018a9a36c5b9-0d775b60-b614-488b-a187-531cc98b715d-000000@us-west-2.amazonses.com> Date: Fri, 15 Sep 2023 18:59:55 +0000 Feedback-ID: 1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2023.09.15-54.240.27.31 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 ; Fri, 15 Sep 2023 19:00:02 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/187758 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *alsa-utils* to *1.2.10* has Failed(do_compile). Detailed error information: do_compile failed Next steps: - apply the patch: git am 0001-alsa-utils-upgrade-1.2.9-1.2.10.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 97be7a6d064513de30a1afcba4726b0fc1638462 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Fri, 15 Sep 2023 16:58:21 +0000 Subject: [PATCH] alsa-utils: upgrade 1.2.9 -> 1.2.10 --- ...dd-define-to-compile-with-glibc-2.38.patch | 39 ------------------- ...ompilation-when-building-in-a-subdir.patch | 35 ----------------- ...sa-utils_1.2.9.bb => alsa-utils_1.2.10.bb} | 7 +--- 3 files changed, 2 insertions(+), 79 deletions(-) delete mode 100644 meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-add-define-to-compile-with-glibc-2.38.patch delete mode 100644 meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-fix-compilation-when-building-in-a-subdir.patch rename meta/recipes-multimedia/alsa/{alsa-utils_1.2.9.bb => alsa-utils_1.2.10.bb} (95%) diff --git a/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-add-define-to-compile-with-glibc-2.38.patch b/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-add-define-to-compile-with-glibc-2.38.patch deleted file mode 100644 index 8c23fb2cec..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-add-define-to-compile-with-glibc-2.38.patch +++ /dev/null @@ -1,39 +0,0 @@ -From a610f4c21b083c0f9cf62ad2251dfadc98abb50e Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum -Date: Sat, 22 Jul 2023 15:36:09 +0000 -Subject: [PATCH] alsactl: add define to compile with glibc 2.38 - -strlcat and strlcpy have been added to glibc 2.38. -update the defines to use the glibc versions, and not conflict with -string.h. - -ref: -- https://sourceware.org/git/?p=glibc.git;a=commit;h=454a20c8756c9c1d55419153255fc7692b3d2199 - -Fixes: https://github.com/alsa-project/alsa-utils/pull/225 -Signed-off-by: Jaroslav Kysela -Signed-off-by: Martin Jansa - -Upstream-Status: Backport [https://github.com/alsa-project/alsa-utils/commit/d6a71bfbde9e1710743d3a446c6ea3b41c45234e] ---- - alsactl/init_sysdeps.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/alsactl/init_sysdeps.c b/alsactl/init_sysdeps.c -index 3aca1b4..f09b1ae 100644 ---- a/alsactl/init_sysdeps.c -+++ b/alsactl/init_sysdeps.c -@@ -18,6 +18,7 @@ - */ - - #if defined(__GLIBC__) && !(defined(__UCLIBC__) && defined(__USE_BSD)) -+#if !(__GLIBC_PREREQ(2, 38)) - static size_t strlcpy(char *dst, const char *src, size_t size) - { - size_t bytes = 0; -@@ -60,4 +61,5 @@ static size_t strlcat(char *dst, const char *src, size_t size) - *q = '\0'; - return bytes; - } -+#endif /* !(__GLIBC_PREREQ(2, 38)) */ - #endif /* __GLIBC__ */ diff --git a/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-fix-compilation-when-building-in-a-subdir.patch b/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-fix-compilation-when-building-in-a-subdir.patch deleted file mode 100644 index 3b3fe5345a..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-fix-compilation-when-building-in-a-subdir.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 44636a7c5862538def0d2fac074772cc39a22a15 Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum -Date: Tue, 16 May 2023 02:27:59 +1000 -Subject: [PATCH] alsactl: fix compilation when building in a subdir - -Fixes: 613372d -Fixes: cff2d1c - -Compile errors when building in a subdir: -alsactl/alsactl.c:33:10: fatal error: os_compat.h: No such file or directory - 33 | #include "os_compat.h" - | ^~~~~~~~~~~~~ -alsactl/lock.c:34:10: fatal error: os_compat.h: No such file or directory - 34 | #include "os_compat.h" - | ^~~~~~~~~~~~~ - -Signed-off-by: Rudi Heitbaum -Upstream-Status: Submitted [https://github.com/alsa-project/alsa-utils/pull/213] ---- - alsactl/Makefile.am | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am -index 80dba69d..fb32c4f3 100644 ---- a/alsactl/Makefile.am -+++ b/alsactl/Makefile.am -@@ -9,6 +9,8 @@ EXTRA_DIST=alsactl.1 alsactl_init.xml - - AM_CFLAGS = -D_GNU_SOURCE - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - alsactl_SOURCES=alsactl.c state.c lock.c utils.c init_parse.c init_ucm.c \ - daemon.c monitor.c clean.c info.c - diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.2.9.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.2.10.bb similarity index 95% rename from meta/recipes-multimedia/alsa/alsa-utils_1.2.9.bb rename to meta/recipes-multimedia/alsa/alsa-utils_1.2.10.bb index af28f5468f..4f14967170 100644 --- a/meta/recipes-multimedia/alsa/alsa-utils_1.2.9.bb +++ b/meta/recipes-multimedia/alsa/alsa-utils_1.2.10.bb @@ -24,11 +24,8 @@ PACKAGECONFIG[udev] = "--with-udev-rules-dir=`pkg-config --variable=udevdir udev PACKAGECONFIG[manpages] = "--enable-xmlto, --disable-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" # alsa-utils specified in SRC_URI due to alsa-utils-scripts recipe -SRC_URI = "https://www.alsa-project.org/files/pub/utils/alsa-utils-${PV}.tar.bz2 \ - file://0001-alsactl-fix-compilation-when-building-in-a-subdir.patch \ - file://0001-alsactl-add-define-to-compile-with-glibc-2.38.patch \ - " -SRC_URI[sha256sum] = "e7623d4525595f92e11ce25ee9a97f2040a14c6e4dcd027aa96e06cbce7817bd" +SRC_URI = "https://www.alsa-project.org/files/pub/utils/alsa-utils-${PV}.tar.bz2" +SRC_URI[sha256sum] = "104b62ec7f02a7ce16ca779f4815616df1cc21933503783a9107b5944f83063a" # On build machines with python-docutils (not python3-docutils !!) installed # rst2man (not rst2man.py) is detected and compile fails with