From patchwork Sat Jun 15 18:23:19 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: 45151 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 62231C3DA43 for ; Sat, 15 Jun 2024 18:23:28 +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.18376.1718475799414397576 for ; Sat, 15 Jun 2024 11:23:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx header.b=JpfGsxjh; dkim=pass header.i=@amazonses.com header.s=7v7vs6w47njt4pimodk5mmttbegzsi6n header.b=LNajLfuX; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.33, mailfrom: 010101901d23bbd4-cb9f3a70-f2c9-4d2a-b28f-1235fd8f9acc-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=1718475799; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=KJpWUTdYsBnJ9Z7YbN7amL6KtmwwiVZH3xHzJHYByRo=; b=JpfGsxjhOzazfV3MvJbtuIaMSlN21mawEwno+1q8uBFLxtd+176ln++C9JDdbMBS o8MPCguHKgUthJ9fC4tdWE1yyexdQxkCOYzfKif6Yl0hXXdjTA5XXgKfYEKl9dJolCv nalev/sAtIYV4Xt0JICM8UYogi16uswwsPeWoHWI= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=7v7vs6w47njt4pimodk5mmttbegzsi6n; d=amazonses.com; t=1718475799; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=KJpWUTdYsBnJ9Z7YbN7amL6KtmwwiVZH3xHzJHYByRo=; b=LNajLfuXNdpW5DFf7rPGUfW6NpIXDpfXYAqsRqKR4HuXa1B+DKSVnhH/X1HxLuWu zvb3qzYDZF5mc70JhNdTqEsR2k79YIqxyFFXM4mqFo9WswGoH5GKRSW1cTg2xyKl2Kn 9Sy7I0E4YqS25eYEBJ7uFqu8arGZaAMkfr/8bCr8= MIME-Version: 1.0 From: auh@yoctoproject.org To: Chen Qi Cc: openembedded-core@lists.openembedded.org Subject: [AUH] cups: upgrading to 2.4.9 SUCCEEDED Message-ID: <010101901d23bbd4-cb9f3a70-f2c9-4d2a-b28f-1235fd8f9acc-000000@us-west-2.amazonses.com> Date: Sat, 15 Jun 2024 18:23:19 +0000 Feedback-ID: ::1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2024.06.15-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 ; Sat, 15 Jun 2024 18:23:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/200724 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *cups* to *2.4.9* has Succeeded. Next steps: - apply the patch: git am 0001-cups-upgrade-2.4.8-2.4.9.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 d692068951542b0af530324b2cc02733feabbe74 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Sat, 15 Jun 2024 11:24:39 +0000 Subject: [PATCH] cups: upgrade 2.4.8 -> 2.4.9 --- .../cups/cups/0001-use-echo-only-in-init.patch | 11 ++++------- ...002-don-t-try-to-run-generated-binaries.patch | 16 ++++++---------- ...ups-fix-multilib-install-file-conflicts.patch | 12 ++++-------- meta/recipes-extended/cups/cups/libexecdir.patch | 5 ++--- .../cups/{cups_2.4.8.bb => cups_2.4.9.bb} | 2 +- 5 files changed, 17 insertions(+), 29 deletions(-) rename meta/recipes-extended/cups/{cups_2.4.8.bb => cups_2.4.9.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 80bbad0a44..d154b2e457 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,7 +1,7 @@ -From a3f4d8ba97f4669a95943a7e65eb61aa44ce7999 Mon Sep 17 00:00:00 2001 +From 16f3138abcf44c377ccce5ce8291b76219e4f604 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Thu, 13 Dec 2012 19:03:52 -0800 -Subject: [PATCH 1/4] use echo only in init +Subject: [PATCH] use echo only in init Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Alexander Kanavin @@ -10,10 +10,10 @@ Signed-off-by: Alexander Kanavin 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scheduler/cups.sh.in b/scheduler/cups.sh.in -index 89ac36d..6618a0f 100644 +index 74cce18..c57f0db 100644 --- a/scheduler/cups.sh.in +++ b/scheduler/cups.sh.in -@@ -50,7 +50,7 @@ case "`uname`" in +@@ -51,7 +51,7 @@ case "`uname`" in ECHO_ERROR=: ;; @@ -22,6 +22,3 @@ index 89ac36d..6618a0f 100644 IS_ON=/bin/true if test -f /etc/init.d/functions; then . /etc/init.d/functions --- -2.17.1 - 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 2bc26edbfc..75596c0161 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,21 +1,20 @@ -From 3e9a965dcd65ab2d40b753b6f792a1a4559182aa Mon Sep 17 00:00:00 2001 +From 189ac9522a5066e282a68ca0850335940d964bda Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 30 Jan 2011 16:37:27 +0100 -Subject: [PATCH 2/4] don't try to run generated binaries +Subject: [PATCH] don't try to run generated binaries Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Koen Kooi - --- - ppdc/Makefile | 32 ++++++++++++++++---------------- - 1 file changed, 16 insertions(+), 16 deletions(-) + ppdc/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ppdc/Makefile b/ppdc/Makefile -index 32e2e0b..f1478d4 100644 +index e36ed11..3fe97e1 100644 --- a/ppdc/Makefile +++ b/ppdc/Makefile -@@ -186,8 +186,8 @@ genstrings: genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \ +@@ -187,8 +187,8 @@ genstrings: genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \ $(LD_CXX) $(ARCHFLAGS) $(ALL_LDFLAGS) -o genstrings genstrings.o \ libcupsppdc.a $(LINKCUPSSTATIC) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ @@ -26,6 +25,3 @@ index 32e2e0b..f1478d4 100644 # --- -2.17.1 - 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 bc9260307c..c81497082f 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,7 +1,7 @@ -From 7dbda1887aa19ab720aff22312f4caff2d575f62 Mon Sep 17 00:00:00 2001 +From 4a4cb00a0ac65ffc31d1f89df7ae3f4d501cfc78 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Wed, 3 Oct 2018 00:27:11 +0800 -Subject: [PATCH 4/4] cups: fix multilib install file conflicts +Subject: [PATCH] cups: fix multilib install file conflicts @CUPS_SERVERBIN@ is ${libdir} related that causes multilib install file conflict. Remove @CUPS_SERVERBIN@ from the comment line of cups-files.conf to @@ -10,16 +10,15 @@ avoid the conflict. Upstream-Status: Inappropriate [OE specific] Signed-off-by: Kai Kang - --- conf/cups-files.conf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in -index 4a78ba6..03c6582 100644 +index 93584a1..65b7052 100644 --- a/conf/cups-files.conf.in +++ b/conf/cups-files.conf.in -@@ -73,7 +73,7 @@ PageLog @CUPS_LOGDIR@/page_log +@@ -67,7 +67,7 @@ PageLog @CUPS_LOGDIR@/page_log #RequestRoot @CUPS_REQUESTS@ # Location of helper programs... @@ -28,6 +27,3 @@ index 4a78ba6..03c6582 100644 # SSL/TLS keychain for the scheduler... #ServerKeychain @CUPS_SERVERKEYCHAIN@ --- -2.17.1 - diff --git a/meta/recipes-extended/cups/cups/libexecdir.patch b/meta/recipes-extended/cups/cups/libexecdir.patch index 7ccad94f0f..63b94884c3 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 fafcca093061f21a56d09b4657fb9d66d8174b39 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.8.bb b/meta/recipes-extended/cups/cups_2.4.9.bb similarity index 51% rename from meta/recipes-extended/cups/cups_2.4.8.bb rename to meta/recipes-extended/cups/cups_2.4.9.bb index c0cddf7e99..e0a3522004 100644 --- a/meta/recipes-extended/cups/cups_2.4.8.bb +++ b/meta/recipes-extended/cups/cups_2.4.9.bb @@ -2,4 +2,4 @@ require cups.inc LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI[sha256sum] = "75c326b4ba73975efcc9a25078c4b04cdb4ee333caaad0d0823dbd522c6479a0" +SRC_URI[sha256sum] = "38fbf4535a10554113e013d54fedda03ee88007ea6a9761d626a04e1e4489e8c"