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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
@@ -10,10 +10,10 @@ Signed-off-by: Alexander Kanavin <[email protected]>
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 <[email protected]>
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 <[email protected]>
-
---
- 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 <[email protected]>
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 <[email protected]>
-
---
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 <[email protected]>
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 <[email protected]>
-
---
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"
--
2.44.0
0001-cups-upgrade-2.4.8-2.4.9.patch
Description: Binary data
packages/core2-64-poky-linux/cups/cups-dbg: PKGSIZE changed from 8117536 to 8119520 (+0%) packages/core2-64-poky-linux/cups/cups-dbg: PV changed from "2.4.8" to "2.4.9" packages/core2-64-poky-linux/cups/cups-dbg: PKGV changed from 2.4.8 [default] to 2.4.9 [default] packages/core2-64-poky-linux/cups/cups-dev: PV changed from "2.4.8" to "2.4.9" packages/core2-64-poky-linux/cups/cups-dev: PKGV changed from 2.4.8 [default] to 2.4.9 [default] packages/core2-64-poky-linux/cups/cups-doc: PV changed from "2.4.8" to "2.4.9" packages/core2-64-poky-linux/cups/cups-doc: PKGV changed from 2.4.8 [default] to 2.4.9 [default] packages/core2-64-poky-linux/cups/cups-lib: PV changed from "2.4.8" to "2.4.9" packages/core2-64-poky-linux/cups/cups-lib: PKGV changed from 2.4.8 [default] to 2.4.9 [default] packages/core2-64-poky-linux/cups/cups-libimage: PV changed from "2.4.8" to "2.4.9" packages/core2-64-poky-linux/cups/cups-libimage: PKGV changed from 2.4.8 [default] to 2.4.9 [default] packages/core2-64-poky-linux/cups/cups-locale-ca: PV changed from "2.4.8" to "2.4.9" packages/core2-64-poky-linux/cups/cups-locale-ca: PKGV changed from 2.4.8 [default] to 2.4.9 [default] packages/core2-64-poky-linux/cups/cups-locale-cs: PV changed from "2.4.8" to "2.4.9" packages/core2-64-poky-linux/cups/cups-locale-cs: PKGV changed from 2.4.8 [default] to 2.4.9 [default] packages/core2-64-poky-linux/cups/cups-locale-da: PV changed from "2.4.8" to "2.4.9" packages/core2-64-poky-linux/cups/cups-locale-da: PKGV changed from 2.4.8 [default] to 2.4.9 [default] packages/core2-64-poky-linux/cups/cups-locale-de: PV changed from "2.4.8" to "2.4.9" packages/core2-64-poky-linux/cups/cups-locale-de: PKGV changed from 2.4.8 [default] to 2.4.9 [default] packages/core2-64-poky-linux/cups/cups-locale-en: PV changed from "2.4.8" to "2.4.9" packages/core2-64-poky-linux/cups/cups-locale-en: PKGV changed from 2.4.8 [default] to 2.4.9 [default] packages/core2-64-poky-linux/cups/cups-locale-es: PV changed from "2.4.8" to "2.4.9" packages/core2-64-poky-linux/cups/cups-locale-es: PKGV changed from 2.4.8 [default] to 2.4.9 [default] packages/core2-64-poky-linux/cups/cups-locale-fr: PKGSIZE changed from 359770 to 361012 (+0%) packages/core2-64-poky-linux/cups/cups-locale-fr: PV changed from "2.4.8" to "2.4.9" packages/core2-64-poky-linux/cups/cups-locale-fr: PKGV changed from 2.4.8 [default] to 2.4.9 [default] packages/core2-64-poky-linux/cups/cups-locale-it: PV changed from "2.4.8" to "2.4.9" packages/core2-64-poky-linux/cups/cups-locale-it: PKGV changed from 2.4.8 [default] to 2.4.9 [default] packages/core2-64-poky-linux/cups/cups-locale-ja: PV changed from "2.4.8" to "2.4.9" packages/core2-64-poky-linux/cups/cups-locale-ja: PKGV changed from 2.4.8 [default] to 2.4.9 [default] packages/core2-64-poky-linux/cups/cups-locale-pt-br: PV changed from "2.4.8" to "2.4.9" packages/core2-64-poky-linux/cups/cups-locale-pt-br: PKGV changed from 2.4.8 [default] to 2.4.9 [default] packages/core2-64-poky-linux/cups/cups-locale-ru: PV changed from "2.4.8" to "2.4.9" packages/core2-64-poky-linux/cups/cups-locale-ru: PKGV changed from 2.4.8 [default] to 2.4.9 [default] packages/core2-64-poky-linux/cups/cups-locale-zh-cn: PV changed from "2.4.8" to "2.4.9" packages/core2-64-poky-linux/cups/cups-locale-zh-cn: PKGV changed from 2.4.8 [default] to 2.4.9 [default] packages/core2-64-poky-linux/cups/cups-src: PKGSIZE changed from 5969837 to 5972495 (+0%) packages/core2-64-poky-linux/cups/cups-src: PV changed from "2.4.8" to "2.4.9" packages/core2-64-poky-linux/cups/cups-src: PKGV changed from 2.4.8 [default] to 2.4.9 [default] packages/core2-64-poky-linux/cups/cups-staticdev: PV changed from "2.4.8" to "2.4.9" packages/core2-64-poky-linux/cups/cups-staticdev: PKGV changed from 2.4.8 [default] to 2.4.9 [default] packages/core2-64-poky-linux/cups/cups-webif: PV changed from "2.4.8" to "2.4.9" packages/core2-64-poky-linux/cups/cups-webif: PKGV changed from 2.4.8 [default] to 2.4.9 [default] packages/core2-64-poky-linux/cups/cups: PKGSIZE changed from 7319825 to 7323921 (+0%) packages/core2-64-poky-linux/cups/cups: PV changed from "2.4.8" to "2.4.9" packages/core2-64-poky-linux/cups/cups: PKGV changed from 2.4.8 [default] to 2.4.9 [default] packages/core2-64-poky-linux/cups: PV changed from "2.4.8" to "2.4.9" packages/core2-64-poky-linux/cups: SRC_URI changed from "https://github.com/OpenPrinting/cups/releases/download/v2.4.8/cups-2.4.8-source.tar.gz file://0001-use-echo-only-in-init.patch file://0002-don-t-try-to-run-generated-binaries.patch file://libexecdir.patch file://0004-cups-fix-multilib-install-file-conflicts.patch file://volatiles.99_cups file://cups-volatiles.conf" to "https://github.com/OpenPrinting/cups/releases/download/v2.4.9/cups-2.4.9-source.tar.gz file://0001-use-echo-only-in-init.patch file://0002-don-t-try-to-run-generated-binaries.patch file://libexecdir.patch file://0004-cups-fix-multilib-install-file-conflicts.patch file://volatiles.99_cups file://cups-volatiles.conf" packages/core2-64-poky-linux/cups: PKGV changed from 2.4.8 [default] to 2.4.9 [default]
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#200724): https://lists.openembedded.org/g/openembedded-core/message/200724 Mute This Topic: https://lists.openembedded.org/mt/106692181/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
