mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 17:19:20 +00:00
Code Issues Projects Releases Wiki Activity

cups: upgrade to 2.2.9

Browse Source 
The following patch is rebased.

  0001-don-t-try-to-run-generated-binaries.patch

(From OE-Core rev: ee57d79aec06e9b160cf2713636cda650ba68d5a)

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Chen Qi
2018-12-05 16:40:44 +08:00
committed by Richard Purdie
parent ccfeb253c5
commit 29e20d031f
3 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch
+17 -16
View File
@@ -1,20 +1,21 @@
Upstream-Status: Inappropriate [embedded specific]
From 90069586167b930befce7303aea57078f04b4ed8 Mon Sep 17 00:00:00 2001
From 1fb07162a9ed187cccf06e34c9bf841d15c6e64e 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
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
ppdc/Makefile | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
Upstream-Status: Inappropriate [embedded specific]
Index: cups-2.2.6/ppdc/Makefile
===================================================================
--- cups-2.2.6.orig/ppdc/Makefile
+++ cups-2.2.6/ppdc/Makefile
@@ -228,8 +228,8 @@ genstrings: genstrings.o libcupsppdc.a
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
ppdc/Makefile | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/ppdc/Makefile b/ppdc/Makefile
index e563988..973dd3f 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)
@@ -25,10 +26,10 @@ Index: cups-2.2.6/ppdc/Makefile
#
@@ -246,9 +246,9 @@ ppdc-static: ppdc.o libcupsppdc.a ../cu
$(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \
@@ -209,9 +209,9 @@ ppdc-static: ppdc.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) foo.drv foo-fr.po
../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
$(COMMONLIBS) $(LIBZ)
$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
- echo Testing PPD compiler...
- ./ppdc-static -l en,fr -I ../data foo.drv
- ./ppdc-static -l en,fr -z -I ../data foo.drv
@@ -38,10 +39,10 @@ Index: cups-2.2.6/ppdc/Makefile
#
@@ -274,17 +274,17 @@ ppdi-static: ppdc-static ppdi.o libcups
$(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdi-static ppdi.o libcupsppdc.a \
@@ -240,17 +240,17 @@ ppdi-static: ppdc-static ppdi.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC)
../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
$(COMMONLIBS) $(LIBZ)
$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
- echo Testing PPD importer...
- $(RM) -r ppd ppd2 sample-import.drv
- ./ppdc-static -l en -I ../data sample.drv
meta/recipes-extended/cups/cups_2.2.8.bb
-6
View File
@@ -1,6 +0,0 @@
require cups.inc
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f212b4338db0da8cb892e94bf2949460"
SRC_URI[md5sum] = "33150d08993a04c8e22176e93805a051"
SRC_URI[sha256sum] = "3968fc1d26fc48727508db1c1380e36c6694ab90177fd6920aec5f6cc73af9e4"
meta/recipes-extended/cups/cups_2.2.9.bb
+6
View File
@@ -0,0 +1,6 @@
require cups.inc
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f212b4338db0da8cb892e94bf2949460"
SRC_URI[md5sum] = "798e83bb1a240f5417a252903d83ae0c"
SRC_URI[sha256sum] = "6d22d5da253b97643320da0bf95574acd85ff2abe3ec1a51d36093841d891156"