diff options
author | Tudor Florea <tudor.florea@enea.com> | 2014-10-16 03:05:19 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2014-10-16 03:05:19 +0200 |
commit | c527fd1f14c27855a37f2e8ac5346ce8d940ced2 (patch) | |
tree | bb002c1fdf011c41dbd2f0927bed23ecb5f83c97 /meta/recipes-extended/cups/cups | |
download | poky-c527fd1f14c27855a37f2e8ac5346ce8d940ced2.tar.gz |
initial commit for Enea Linux 4.0-140929daisy-140929
Migrated from the internal git server on the daisy-enea-point-release branch
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta/recipes-extended/cups/cups')
3 files changed, 117 insertions, 0 deletions
diff --git a/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch b/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch new file mode 100644 index 0000000000..e6544b5607 --- /dev/null +++ b/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch | |||
@@ -0,0 +1,70 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | From 90069586167b930befce7303aea57078f04b4ed8 Mon Sep 17 00:00:00 2001 | ||
4 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
5 | Date: Sun, 30 Jan 2011 16:37:27 +0100 | ||
6 | Subject: [PATCH] don't try to run generated binaries | ||
7 | |||
8 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
9 | --- | ||
10 | ppdc/Makefile | 30 +++++++++++++++--------------- | ||
11 | 1 files changed, 15 insertions(+), 15 deletions(-) | ||
12 | |||
13 | diff --git a/ppdc/Makefile b/ppdc/Makefile | ||
14 | index 0288d47..fc87f1b 100644 | ||
15 | --- a/ppdc/Makefile | ||
16 | +++ b/ppdc/Makefile | ||
17 | @@ -243,8 +243,8 @@ genstrings: genstrings.o libcupsppdc.a ../cups/libcups.a \ | ||
18 | $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \ | ||
19 | libcupsppdc.a ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) \ | ||
20 | $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) | ||
21 | - echo Generating localization strings... | ||
22 | - ./genstrings >sample.c | ||
23 | +# echo Generating localization strings... | ||
24 | +# ./genstrings >sample.c | ||
25 | |||
26 | |||
27 | # | ||
28 | @@ -261,9 +261,9 @@ ppdc-static: ppdc.o libcupsppdc.a ../cups/libcups.a foo.drv foo-fr.po | ||
29 | $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \ | ||
30 | ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ | ||
31 | $(COMMONLIBS) $(LIBZ) | ||
32 | - echo Testing PPD compiler... | ||
33 | - ./ppdc-static -l en,fr -I ../data foo.drv | ||
34 | - ./ppdc-static -l en,fr -z -I ../data foo.drv | ||
35 | +# echo Testing PPD compiler... | ||
36 | +# ./ppdc-static -l en,fr -I ../data foo.drv | ||
37 | +# ./ppdc-static -l en,fr -z -I ../data foo.drv | ||
38 | |||
39 | |||
40 | # | ||
41 | @@ -290,16 +290,16 @@ ppdi-static: ppdc-static ppdi.o libcupsppdc.a ../cups/libcups.a | ||
42 | ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ | ||
43 | $(COMMONLIBS) $(LIBZ) | ||
44 | echo Testing PPD importer... | ||
45 | - $(RM) -r ppd ppd2 sample-import.drv | ||
46 | - ./ppdc-static -I ../data sample.drv | ||
47 | - ./ppdi-static -I ../data -o sample-import.drv ppd/* | ||
48 | - ./ppdc-static -I ../data -d ppd2 sample-import.drv | ||
49 | - if diff -r ppd ppd2 >/dev/null; then \ | ||
50 | - echo PPD import OK; \ | ||
51 | - else \ | ||
52 | - echo PPD import FAILED; \ | ||
53 | - exit 1; \ | ||
54 | - fi | ||
55 | +# $(RM) -r ppd ppd2 sample-import.drv | ||
56 | +# ./ppdc-static -I ../data sample.drv | ||
57 | +# ./ppdi-static -I ../data -o sample-import.drv ppd/* | ||
58 | +# ./ppdc-static -I ../data -d ppd2 sample-import.drv | ||
59 | +# if diff -r ppd ppd2 >/dev/null; then \ | ||
60 | +# echo PPD import OK; \ | ||
61 | +# else \ | ||
62 | +# echo PPD import FAILED; \ | ||
63 | +# exit 1; \ | ||
64 | +# fi | ||
65 | |||
66 | |||
67 | # | ||
68 | -- | ||
69 | 1.6.6.1 | ||
70 | |||
diff --git a/meta/recipes-extended/cups/cups/cups_serverbin.patch b/meta/recipes-extended/cups/cups/cups_serverbin.patch new file mode 100644 index 0000000000..f7b44a7bc1 --- /dev/null +++ b/meta/recipes-extended/cups/cups/cups_serverbin.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | Make CUPS_SERVERBIN relative to libdir otherwise on 64bit arches | ||
2 | e.g. ppc64 where base libdir is lib64 this does not go well | ||
3 | |||
4 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
5 | Upstream-Status: Inappropriate [OE config specific] | ||
6 | |||
7 | Index: cups-1.4.6/config-scripts/cups-directories.m4 | ||
8 | =================================================================== | ||
9 | --- cups-1.4.6.orig/config-scripts/cups-directories.m4 2009-04-12 16:04:51.000000000 -0700 | ||
10 | +++ cups-1.4.6/config-scripts/cups-directories.m4 2012-07-21 12:12:05.896405923 -0700 | ||
11 | @@ -397,7 +397,7 @@ | ||
12 | *) | ||
13 | # All others | ||
14 | INSTALL_SYSV="install-sysv" | ||
15 | - CUPS_SERVERBIN="$exec_prefix/lib/cups" | ||
16 | + CUPS_SERVERBIN="$libdir/cups" | ||
17 | ;; | ||
18 | esac | ||
19 | |||
20 | Index: cups-1.4.6/configure | ||
21 | =================================================================== | ||
22 | --- cups-1.4.6.orig/configure 2012-07-21 12:13:34.512405950 -0700 | ||
23 | +++ cups-1.4.6/configure 2012-07-21 12:14:05.724406017 -0700 | ||
24 | @@ -11181,7 +11181,7 @@ | ||
25 | *) | ||
26 | # All others | ||
27 | INSTALL_SYSV="install-sysv" | ||
28 | - CUPS_SERVERBIN="$exec_prefix/lib/cups" | ||
29 | + CUPS_SERVERBIN="$libdir/cups" | ||
30 | ;; | ||
31 | esac | ||
32 | |||
diff --git a/meta/recipes-extended/cups/cups/use_echo_only_in_init.patch b/meta/recipes-extended/cups/cups/use_echo_only_in_init.patch new file mode 100644 index 0000000000..696f1374d9 --- /dev/null +++ b/meta/recipes-extended/cups/cups/use_echo_only_in_init.patch | |||
@@ -0,0 +1,15 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | Index: cups-1.6.1/scheduler/cups.sh.in | ||
4 | =================================================================== | ||
5 | --- cups-1.6.1.orig/scheduler/cups.sh.in | ||
6 | +++ cups-1.6.1/scheduler/cups.sh.in | ||
7 | @@ -67,7 +67,7 @@ case "`uname`" in | ||
8 | ECHO_ERROR=: | ||
9 | ;; | ||
10 | |||
11 | - Linux*) | ||
12 | + DisableLinux*) | ||
13 | IS_ON=/bin/true | ||
14 | if test -f /etc/init.d/functions; then | ||
15 | . /etc/init.d/functions | ||