From patchwork Tue Oct 15 12:16:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 50674 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 54EA2D1D863 for ; Tue, 15 Oct 2024 12:16:14 +0000 (UTC) Received: from a27-193.smtp-out.us-west-2.amazonses.com (a27-193.smtp-out.us-west-2.amazonses.com [54.240.27.193]) by mx.groups.io with SMTP id smtpd.web10.11862.1728994550369274025 for ; Tue, 15 Oct 2024 05:16:03 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx header.b=JEZdn60I; dkim=pass header.i=@amazonses.com header.s=7v7vs6w47njt4pimodk5mmttbegzsi6n header.b=MO+VwSEi; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.193, mailfrom: 01010192901b53f8-00f0bbfd-13bf-42d9-8d27-d9375367fd4d-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=1728994563; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=Ez1Y1GWafYR5CmjKr308Jd0jRrrgJ4lgMAKGHw0pwbI=; b=JEZdn60IJLJuwiEyjceBwBVmGF7/z8Bv1Qehdxgl4bAbb3WSsaUZ7UX1gv6j4GVb eNjdKeP8FErerrsSV/UT+Lh5TQovRN/QAa683Z93XQoRcLlkDyBla7UYm3CN0NvtEg2 znKy5lvMThnDzpmsUPOKWwecitiHwh0ifJjXW8KY= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=7v7vs6w47njt4pimodk5mmttbegzsi6n; d=amazonses.com; t=1728994563; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=Ez1Y1GWafYR5CmjKr308Jd0jRrrgJ4lgMAKGHw0pwbI=; b=MO+VwSEi80M2yAkg5xjiI9pjr0XK7E7cubupkRuR3bKCoY+l3oAOJYcWYRt+WJ2Y wo01k/SXFPhv51YA6J2qHOWS1n6nZxmGcMCqRs6MQLphN4UJZOdNKUSjrx/tl9xdeS8 Q2OPGB570IGeV2zfot3//asMwI1Y1RAxNOw3hTT4= MIME-Version: 1.0 From: auh@yoctoproject.org To: Chen Qi Cc: openembedded-core@lists.openembedded.org Subject: [AUH] cups: upgrading to 2.4.11 FAILED Message-ID: <01010192901b53f8-00f0bbfd-13bf-42d9-8d27-d9375367fd4d-000000@us-west-2.amazonses.com> Date: Tue, 15 Oct 2024 12:16:03 +0000 Feedback-ID: ::1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2024.10.15-54.240.27.193 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 ; Tue, 15 Oct 2024 12:16:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/205866 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe(s) *cups* to *2.4.11* has Failed(do_compile). Detailed error information: do_compile failed Next steps: - apply the patch: git am 0001-cups-upgrade-2.4.10-2.4.11.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 d4c1d7f574623e73b8f1b492c2c7b4748574b926 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Tue, 15 Oct 2024 09:30:23 +0000 Subject: [PATCH] cups: upgrade 2.4.10 -> 2.4.11 --- .../cups/cups/0001-use-echo-only-in-init.patch | 2 +- .../cups/0002-don-t-try-to-run-generated-binaries.patch | 2 +- .../0004-cups-fix-multilib-install-file-conflicts.patch | 6 +++--- meta/recipes-extended/cups/cups/libexecdir.patch | 5 ++--- .../cups/{cups_2.4.10.bb => cups_2.4.11.bb} | 2 +- 5 files changed, 8 insertions(+), 9 deletions(-) rename meta/recipes-extended/cups/{cups_2.4.10.bb => cups_2.4.11.bb} (51%) diff --git a/meta/recipes-extended/cups/cups/0001-use-echo-only-in-init.patch b/meta/recipes-extended/cups/cups/0001-use-echo-only-in-init.patch index e6bd400779..dda6ceb101 100644 --- a/meta/recipes-extended/cups/cups/0001-use-echo-only-in-init.patch +++ b/meta/recipes-extended/cups/cups/0001-use-echo-only-in-init.patch @@ -1,4 +1,4 @@ -From ddfe6ed6a89226985e8c9f0751c026aabc0927a0 Mon Sep 17 00:00:00 2001 +From c51bce48960080b6afe616c706dcab17d6de4fb4 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Thu, 13 Dec 2012 19:03:52 -0800 Subject: [PATCH] use echo only in init diff --git a/meta/recipes-extended/cups/cups/0002-don-t-try-to-run-generated-binaries.patch b/meta/recipes-extended/cups/cups/0002-don-t-try-to-run-generated-binaries.patch index 75270cb0cb..377343b4c9 100644 --- a/meta/recipes-extended/cups/cups/0002-don-t-try-to-run-generated-binaries.patch +++ b/meta/recipes-extended/cups/cups/0002-don-t-try-to-run-generated-binaries.patch @@ -1,4 +1,4 @@ -From ff6c7168c3f26094b3a18298208a28831d1c1fd5 Mon Sep 17 00:00:00 2001 +From d7ee125b28a5291d7a27b8fcaa2a29626d9fd91d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 30 Jan 2011 16:37:27 +0100 Subject: [PATCH] don't try to run generated binaries diff --git a/meta/recipes-extended/cups/cups/0004-cups-fix-multilib-install-file-conflicts.patch b/meta/recipes-extended/cups/cups/0004-cups-fix-multilib-install-file-conflicts.patch index d49fb8f2c2..8f8840bdd2 100644 --- a/meta/recipes-extended/cups/cups/0004-cups-fix-multilib-install-file-conflicts.patch +++ b/meta/recipes-extended/cups/cups/0004-cups-fix-multilib-install-file-conflicts.patch @@ -1,4 +1,4 @@ -From 6e286b582571ffca3f7874076d70eec6fd5713f6 Mon Sep 17 00:00:00 2001 +From 8dac8b0c58d53b74d4bc0cb159c8b4d7a376aa8c Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Wed, 3 Oct 2018 00:27:11 +0800 Subject: [PATCH] cups: fix multilib install file conflicts @@ -15,10 +15,10 @@ Signed-off-by: Kai Kang 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in -index 93584a1..65b7052 100644 +index f96f745..27d8be9 100644 --- a/conf/cups-files.conf.in +++ b/conf/cups-files.conf.in -@@ -67,7 +67,7 @@ PageLog @CUPS_LOGDIR@/page_log +@@ -70,7 +70,7 @@ PageLog @CUPS_LOGDIR@/page_log #RequestRoot @CUPS_REQUESTS@ # Location of helper programs... diff --git a/meta/recipes-extended/cups/cups/libexecdir.patch b/meta/recipes-extended/cups/cups/libexecdir.patch index 7ccad94f0f..97640976c5 100644 --- a/meta/recipes-extended/cups/cups/libexecdir.patch +++ b/meta/recipes-extended/cups/cups/libexecdir.patch @@ -1,4 +1,4 @@ -From 1724f7bcdbcfdb445778f8a2e530c5c094c18c10 Mon Sep 17 00:00:00 2001 +From e839a37e8d49e77e18c2588d41c661b7f98cdf6c Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 13 Jul 2021 12:56:30 +0100 Subject: [PATCH] Use $libexecdir instead of hardcoding $prefix/lib as this @@ -6,13 +6,12 @@ Subject: [PATCH] Use $libexecdir instead of hardcoding $prefix/lib as this Upstream-Status: Pending Signed-off-by: Ross Burton - --- config-scripts/cups-directories.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4 -index 2033d47..230166e 100644 +index 069ee7b..2f67e5b 100644 --- a/config-scripts/cups-directories.m4 +++ b/config-scripts/cups-directories.m4 @@ -239,7 +239,7 @@ AC_SUBST([CUPS_REQUESTS]) diff --git a/meta/recipes-extended/cups/cups_2.4.10.bb b/meta/recipes-extended/cups/cups_2.4.11.bb similarity index 51% rename from meta/recipes-extended/cups/cups_2.4.10.bb rename to meta/recipes-extended/cups/cups_2.4.11.bb index e16ad47cf5..71568295cb 100644 --- a/meta/recipes-extended/cups/cups_2.4.10.bb +++ b/meta/recipes-extended/cups/cups_2.4.11.bb @@ -2,4 +2,4 @@ require cups.inc LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI[sha256sum] = "d75757c2bc0f7a28b02ee4d52ca9e4b1aa1ba2affe16b985854f5336940e5ad7" +SRC_URI[sha256sum] = "9a88fe1da3a29a917c3fc67ce6eb3178399d68e1a548c6d86c70d9b13651fd71"