Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *cups* to *2.4.10* has Succeeded.
Next steps:
- apply the patch: git am 0001-cups-upgrade-2.4.9-2.4.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 d3e95f6bdb0ca65c732d6d267ea3c8fb98a544bc Mon Sep 17 00:00:00 2001
From: Upgrade Helper <[email protected]>
Date: Mon, 1 Jul 2024 10:38:18 +0000
Subject: [PATCH] cups: upgrade 2.4.9 -> 2.4.10
---
.../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.9.bb => cups_2.4.10.bb} | 2 +-
5 files changed, 17 insertions(+), 29 deletions(-)
rename meta/recipes-extended/cups/{cups_2.4.9.bb => cups_2.4.10.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..baa8004e74 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 5585d9c124f8107b1e4978923edbb94e1222c005 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..a03dc55c5b 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 5d9243e5a7cb32fa16bbc9accddf0842d3eaf661 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..19f167a91b 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 c05a265bb03268460ce1f6a3d17d7cd38eb1e445 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..c0c6f2e4b5 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 a94d8d987426e4a7ac79a98ca8dc6ee4ac3f7b9c 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.9.bb
b/meta/recipes-extended/cups/cups_2.4.10.bb
similarity index 51%
rename from meta/recipes-extended/cups/cups_2.4.9.bb
rename to meta/recipes-extended/cups/cups_2.4.10.bb
index e0a3522004..e16ad47cf5 100644
--- a/meta/recipes-extended/cups/cups_2.4.9.bb
+++ b/meta/recipes-extended/cups/cups_2.4.10.bb
@@ -2,4 +2,4 @@ require cups.inc
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-SRC_URI[sha256sum] =
"38fbf4535a10554113e013d54fedda03ee88007ea6a9761d626a04e1e4489e8c"
+SRC_URI[sha256sum] =
"d75757c2bc0f7a28b02ee4d52ca9e4b1aa1ba2affe16b985854f5336940e5ad7"
--
2.44.0
packages/core2-64-poky-linux/cups/cups-dbg: PKGV changed from 2.4.9 [default] to 2.4.10 [default] packages/core2-64-poky-linux/cups/cups-dbg: PKGSIZE changed from 8119520 to 8119760 (+0%) packages/core2-64-poky-linux/cups/cups-dbg: PV changed from "2.4.9" to "2.4.10" packages/core2-64-poky-linux/cups/cups-dev: PKGV changed from 2.4.9 [default] to 2.4.10 [default] packages/core2-64-poky-linux/cups/cups-dev: PKGSIZE changed from 188704 to 188709 (+0%) packages/core2-64-poky-linux/cups/cups-dev: PV changed from "2.4.9" to "2.4.10" packages/core2-64-poky-linux/cups/cups-doc: PKGV changed from 2.4.9 [default] to 2.4.10 [default] packages/core2-64-poky-linux/cups/cups-doc: PV changed from "2.4.9" to "2.4.10" packages/core2-64-poky-linux/cups/cups-lib: PKGV changed from 2.4.9 [default] to 2.4.10 [default] packages/core2-64-poky-linux/cups/cups-lib: PV changed from "2.4.9" to "2.4.10" packages/core2-64-poky-linux/cups/cups-libimage: PKGV changed from 2.4.9 [default] to 2.4.10 [default] packages/core2-64-poky-linux/cups/cups-libimage: PV changed from "2.4.9" to "2.4.10" packages/core2-64-poky-linux/cups/cups-locale-ca: PKGV changed from 2.4.9 [default] to 2.4.10 [default] packages/core2-64-poky-linux/cups/cups-locale-ca: PV changed from "2.4.9" to "2.4.10" packages/core2-64-poky-linux/cups/cups-locale-cs: PKGV changed from 2.4.9 [default] to 2.4.10 [default] packages/core2-64-poky-linux/cups/cups-locale-cs: PV changed from "2.4.9" to "2.4.10" packages/core2-64-poky-linux/cups/cups-locale-da: PKGV changed from 2.4.9 [default] to 2.4.10 [default] packages/core2-64-poky-linux/cups/cups-locale-da: PKGSIZE changed from 478934 to 478935 (+0%) packages/core2-64-poky-linux/cups/cups-locale-da: PV changed from "2.4.9" to "2.4.10" packages/core2-64-poky-linux/cups/cups-locale-de: PKGV changed from 2.4.9 [default] to 2.4.10 [default] packages/core2-64-poky-linux/cups/cups-locale-de: PKGSIZE changed from 424603 to 424604 (+0%) packages/core2-64-poky-linux/cups/cups-locale-de: PV changed from "2.4.9" to "2.4.10" packages/core2-64-poky-linux/cups/cups-locale-en: PKGV changed from 2.4.9 [default] to 2.4.10 [default] packages/core2-64-poky-linux/cups/cups-locale-en: PV changed from "2.4.9" to "2.4.10" packages/core2-64-poky-linux/cups/cups-locale-es: PKGV changed from 2.4.9 [default] to 2.4.10 [default] packages/core2-64-poky-linux/cups/cups-locale-es: PKGSIZE changed from 395645 to 395646 (+0%) packages/core2-64-poky-linux/cups/cups-locale-es: PV changed from "2.4.9" to "2.4.10" packages/core2-64-poky-linux/cups/cups-locale-fr: PKGV changed from 2.4.9 [default] to 2.4.10 [default] packages/core2-64-poky-linux/cups/cups-locale-fr: PKGSIZE changed from 361012 to 361013 (+0%) packages/core2-64-poky-linux/cups/cups-locale-fr: PV changed from "2.4.9" to "2.4.10" packages/core2-64-poky-linux/cups/cups-locale-it: PKGV changed from 2.4.9 [default] to 2.4.10 [default] packages/core2-64-poky-linux/cups/cups-locale-it: PV changed from "2.4.9" to "2.4.10" packages/core2-64-poky-linux/cups/cups-locale-ja: PKGV changed from 2.4.9 [default] to 2.4.10 [default] packages/core2-64-poky-linux/cups/cups-locale-ja: PKGSIZE changed from 407728 to 407729 (+0%) packages/core2-64-poky-linux/cups/cups-locale-ja: PV changed from "2.4.9" to "2.4.10" packages/core2-64-poky-linux/cups/cups-locale-pt-br: PKGV changed from 2.4.9 [default] to 2.4.10 [default] packages/core2-64-poky-linux/cups/cups-locale-pt-br: PKGSIZE changed from 394263 to 394264 (+0%) packages/core2-64-poky-linux/cups/cups-locale-pt-br: PV changed from "2.4.9" to "2.4.10" packages/core2-64-poky-linux/cups/cups-locale-ru: PKGV changed from 2.4.9 [default] to 2.4.10 [default] packages/core2-64-poky-linux/cups/cups-locale-ru: PKGSIZE changed from 416513 to 416514 (+0%) packages/core2-64-poky-linux/cups/cups-locale-ru: PV changed from "2.4.9" to "2.4.10" packages/core2-64-poky-linux/cups/cups-locale-zh-cn: PKGV changed from 2.4.9 [default] to 2.4.10 [default] packages/core2-64-poky-linux/cups/cups-locale-zh-cn: PV changed from "2.4.9" to "2.4.10" packages/core2-64-poky-linux/cups/cups-src: PKGV changed from 2.4.9 [default] to 2.4.10 [default] packages/core2-64-poky-linux/cups/cups-src: PKGSIZE changed from 5972495 to 5972275 (-0%) packages/core2-64-poky-linux/cups/cups-src: PV changed from "2.4.9" to "2.4.10" packages/core2-64-poky-linux/cups/cups-staticdev: PKGV changed from 2.4.9 [default] to 2.4.10 [default] packages/core2-64-poky-linux/cups/cups-staticdev: PV changed from "2.4.9" to "2.4.10" packages/core2-64-poky-linux/cups/cups-webif: PKGV changed from 2.4.9 [default] to 2.4.10 [default] packages/core2-64-poky-linux/cups/cups-webif: PKGSIZE changed from 1566146 to 1566162 (+0%) packages/core2-64-poky-linux/cups/cups-webif: PV changed from "2.4.9" to "2.4.10" packages/core2-64-poky-linux/cups/cups: PKGV changed from 2.4.9 [default] to 2.4.10 [default] packages/core2-64-poky-linux/cups/cups: PKGSIZE changed from 7323921 to 7323922 (+0%) packages/core2-64-poky-linux/cups/cups: PV changed from "2.4.9" to "2.4.10" packages/core2-64-poky-linux/cups: PKGV changed from 2.4.9 [default] to 2.4.10 [default] packages/core2-64-poky-linux/cups: SRC_URI changed from "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" to "https://github.com/OpenPrinting/cups/releases/download/v2.4.10/cups-2.4.10-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: PV changed from "2.4.9" to "2.4.10"
0001-cups-upgrade-2.4.9-2.4.10.patch
Description: Binary data
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#201356): https://lists.openembedded.org/g/openembedded-core/message/201356 Mute This Topic: https://lists.openembedded.org/mt/106983493/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
