diff options
Diffstat (limited to 'external/poky/meta/recipes-extended/cups/cups')
| -rw-r--r-- | external/poky/meta/recipes-extended/cups/cups/0001-use-echo-only-in-init.patch | 27 | ||||
| -rw-r--r-- | external/poky/meta/recipes-extended/cups/cups/0002-don-t-try-to-run-generated-binaries.patch (renamed from external/poky/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch) | 29 | ||||
| -rw-r--r-- | external/poky/meta/recipes-extended/cups/cups/0003-cups_1.4.6.bb-Fix-build-on-ppc64.patch | 51 | ||||
| -rw-r--r-- | external/poky/meta/recipes-extended/cups/cups/0004-cups-fix-multilib-install-file-conflicts.patch (renamed from external/poky/meta/recipes-extended/cups/cups/cups-avoid-install-file-conflicts.patch) | 12 | ||||
| -rw-r--r-- | external/poky/meta/recipes-extended/cups/cups/cups_serverbin.patch | 32 | ||||
| -rw-r--r-- | external/poky/meta/recipes-extended/cups/cups/use_echo_only_in_init.patch | 15 |
6 files changed, 106 insertions, 60 deletions
diff --git a/external/poky/meta/recipes-extended/cups/cups/0001-use-echo-only-in-init.patch b/external/poky/meta/recipes-extended/cups/cups/0001-use-echo-only-in-init.patch new file mode 100644 index 00000000..80bbad0a --- /dev/null +++ b/external/poky/meta/recipes-extended/cups/cups/0001-use-echo-only-in-init.patch @@ -0,0 +1,27 @@ +From a3f4d8ba97f4669a95943a7e65eb61aa44ce7999 Mon Sep 17 00:00:00 2001 +From: Saul Wold <sgw@linux.intel.com> +Date: Thu, 13 Dec 2012 19:03:52 -0800 +Subject: [PATCH 1/4] use echo only in init + +Upstream-Status: Inappropriate [embedded specific] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + scheduler/cups.sh.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scheduler/cups.sh.in b/scheduler/cups.sh.in +index 89ac36d..6618a0f 100644 +--- a/scheduler/cups.sh.in ++++ b/scheduler/cups.sh.in +@@ -50,7 +50,7 @@ case "`uname`" in + ECHO_ERROR=: + ;; + +- Linux*) ++ DisableLinux*) + IS_ON=/bin/true + if test -f /etc/init.d/functions; then + . /etc/init.d/functions +-- +2.17.1 + diff --git a/external/poky/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch b/external/poky/meta/recipes-extended/cups/cups/0002-don-t-try-to-run-generated-binaries.patch index d6a69f28..ea248e47 100644 --- a/external/poky/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch +++ b/external/poky/meta/recipes-extended/cups/cups/0002-don-t-try-to-run-generated-binaries.patch @@ -1,7 +1,7 @@ -From 1fb07162a9ed187cccf06e34c9bf841d15c6e64e Mon Sep 17 00:00:00 2001 +From 3e9a965dcd65ab2d40b753b6f792a1a4559182aa Mon Sep 17 00:00:00 2001 From: Koen Kooi <koen@dominion.thruhere.net> Date: Sun, 30 Jan 2011 16:37:27 +0100 -Subject: [PATCH] don't try to run generated binaries +Subject: [PATCH 2/4] don't try to run generated binaries Upstream-Status: Inappropriate [embedded specific] @@ -12,13 +12,13 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/ppdc/Makefile b/ppdc/Makefile -index e563988..973dd3f 100644 +index 32e2e0b..f1478d4 100644 --- a/ppdc/Makefile +++ b/ppdc/Makefile -@@ -189,8 +189,8 @@ genstrings: genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \ - $(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \ - libcupsppdc.a ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \ - $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) +@@ -186,8 +186,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)" $@ - echo Generating localization strings... - ./genstrings >sample.c +# echo Generating localization strings... @@ -26,9 +26,9 @@ index e563988..973dd3f 100644 # -@@ -209,9 +209,9 @@ ppdc-static: ppdc.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) foo.drv foo-fr.po - ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ - $(COMMONLIBS) $(LIBZ) +@@ -205,9 +205,9 @@ ppdc-static: ppdc.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) foo.drv foo-fr.po + $(LD_CXX) $(ARCHFLAGS) $(ALL_LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \ + $(LINKCUPSSTATIC) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ - echo Testing PPD compiler... - ./ppdc-static -l en,fr -I ../data foo.drv @@ -39,9 +39,9 @@ index e563988..973dd3f 100644 # -@@ -240,17 +240,17 @@ ppdi-static: ppdc-static ppdi.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) - ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ - $(COMMONLIBS) $(LIBZ) +@@ -235,17 +235,17 @@ ppdi-static: ppdc-static ppdi.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) + $(LD_CXX) $(ARCHFLAGS) $(ALL_LDFLAGS) -o ppdi-static ppdi.o libcupsppdc.a \ + $(LINKCUPSSTATIC) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ - echo Testing PPD importer... - $(RM) -r ppd ppd2 sample-import.drv @@ -68,3 +68,6 @@ index e563988..973dd3f 100644 # +-- +2.17.1 + diff --git a/external/poky/meta/recipes-extended/cups/cups/0003-cups_1.4.6.bb-Fix-build-on-ppc64.patch b/external/poky/meta/recipes-extended/cups/cups/0003-cups_1.4.6.bb-Fix-build-on-ppc64.patch new file mode 100644 index 00000000..b48c7a9a --- /dev/null +++ b/external/poky/meta/recipes-extended/cups/cups/0003-cups_1.4.6.bb-Fix-build-on-ppc64.patch @@ -0,0 +1,51 @@ +From 66c2079ae91389ee0f9d704bf0d2cccd53b2c603 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 22 Jul 2012 16:54:17 -0700 +Subject: [PATCH 3/4] cups_1.4.6.bb: Fix build on ppc64 + +Make CUPS_SERVERBIN relative to libdir otherwise on 64bit arches +e.g. ppc64 where base libdir is lib64 this does not go well + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Inappropriate [OE config specific] + +Update on 20190904: +Redefine CUPS_SERVERBIN to "$libexecdir/cups" which solves file confliction +when multilib is enabled. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> + +--- + config-scripts/cups-directories.m4 | 2 +- + configure | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4 +index b74083a..9a5abb2 100644 +--- a/config-scripts/cups-directories.m4 ++++ b/config-scripts/cups-directories.m4 +@@ -270,7 +270,7 @@ case "$host_os_name" in + *) + # All others + INSTALL_SYSV="install-sysv" +- CUPS_SERVERBIN="$exec_prefix/lib/cups" ++ CUPS_SERVERBIN="$libexecdir/cups" + ;; + esac + +diff --git a/configure b/configure +index d3df145..bc68a6c 100755 +--- a/configure ++++ b/configure +@@ -6420,7 +6420,7 @@ case "$host_os_name" in + *) + # All others + INSTALL_SYSV="install-sysv" +- CUPS_SERVERBIN="$exec_prefix/lib/cups" ++ CUPS_SERVERBIN="$libexecdir/cups" + ;; + esac + +-- +2.17.1 + diff --git a/external/poky/meta/recipes-extended/cups/cups/cups-avoid-install-file-conflicts.patch b/external/poky/meta/recipes-extended/cups/cups/0004-cups-fix-multilib-install-file-conflicts.patch index 68885fa4..bc926030 100644 --- a/external/poky/meta/recipes-extended/cups/cups/cups-avoid-install-file-conflicts.patch +++ b/external/poky/meta/recipes-extended/cups/cups/0004-cups-fix-multilib-install-file-conflicts.patch @@ -1,3 +1,8 @@ +From 7dbda1887aa19ab720aff22312f4caff2d575f62 Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Wed, 3 Oct 2018 00:27:11 +0800 +Subject: [PATCH 4/4] 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 avoid the conflict. @@ -6,6 +11,10 @@ Upstream-Status: Inappropriate [OE specific] Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + 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 --- a/conf/cups-files.conf.in @@ -19,3 +28,6 @@ index 4a78ba6..03c6582 100644 # SSL/TLS keychain for the scheduler... #ServerKeychain @CUPS_SERVERKEYCHAIN@ +-- +2.17.1 + diff --git a/external/poky/meta/recipes-extended/cups/cups/cups_serverbin.patch b/external/poky/meta/recipes-extended/cups/cups/cups_serverbin.patch deleted file mode 100644 index f7b44a7b..00000000 --- a/external/poky/meta/recipes-extended/cups/cups/cups_serverbin.patch +++ /dev/null @@ -1,32 +0,0 @@ -Make CUPS_SERVERBIN relative to libdir otherwise on 64bit arches -e.g. ppc64 where base libdir is lib64 this does not go well - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Inappropriate [OE config specific] - -Index: cups-1.4.6/config-scripts/cups-directories.m4 -=================================================================== ---- cups-1.4.6.orig/config-scripts/cups-directories.m4 2009-04-12 16:04:51.000000000 -0700 -+++ cups-1.4.6/config-scripts/cups-directories.m4 2012-07-21 12:12:05.896405923 -0700 -@@ -397,7 +397,7 @@ - *) - # All others - INSTALL_SYSV="install-sysv" -- CUPS_SERVERBIN="$exec_prefix/lib/cups" -+ CUPS_SERVERBIN="$libdir/cups" - ;; - esac - -Index: cups-1.4.6/configure -=================================================================== ---- cups-1.4.6.orig/configure 2012-07-21 12:13:34.512405950 -0700 -+++ cups-1.4.6/configure 2012-07-21 12:14:05.724406017 -0700 -@@ -11181,7 +11181,7 @@ - *) - # All others - INSTALL_SYSV="install-sysv" -- CUPS_SERVERBIN="$exec_prefix/lib/cups" -+ CUPS_SERVERBIN="$libdir/cups" - ;; - esac - diff --git a/external/poky/meta/recipes-extended/cups/cups/use_echo_only_in_init.patch b/external/poky/meta/recipes-extended/cups/cups/use_echo_only_in_init.patch deleted file mode 100644 index 696f1374..00000000 --- a/external/poky/meta/recipes-extended/cups/cups/use_echo_only_in_init.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Inappropriate [embedded specific] - -Index: cups-1.6.1/scheduler/cups.sh.in -=================================================================== ---- cups-1.6.1.orig/scheduler/cups.sh.in -+++ cups-1.6.1/scheduler/cups.sh.in -@@ -67,7 +67,7 @@ case "`uname`" in - ECHO_ERROR=: - ;; - -- Linux*) -+ DisableLinux*) - IS_ON=/bin/true - if test -f /etc/init.d/functions; then - . /etc/init.d/functions |