diff options
author | Adrian Dudau <adrian.dudau@enea.com> | 2013-12-12 13:38:32 +0100 |
---|---|---|
committer | Adrian Dudau <adrian.dudau@enea.com> | 2013-12-12 13:50:20 +0100 |
commit | e2e6f6fe07049f33cb6348780fa975162752e421 (patch) | |
tree | b1813295411235d1297a0ed642b1346b24fdfb12 /meta/recipes-extended/cups | |
download | poky-e2e6f6fe07049f33cb6348780fa975162752e421.tar.gz |
initial commit of Enea Linux 3.1
Migrated from the internal git server on the dora-enea branch
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
Diffstat (limited to 'meta/recipes-extended/cups')
5 files changed, 241 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 | ||
diff --git a/meta/recipes-extended/cups/cups16.inc b/meta/recipes-extended/cups/cups16.inc new file mode 100644 index 0000000000..7b8ba06d59 --- /dev/null +++ b/meta/recipes-extended/cups/cups16.inc | |||
@@ -0,0 +1,105 @@ | |||
1 | SUMMARY = "An Internet printing system for Unix" | ||
2 | DESCRIPTION = "An Internet printing system for Unix." | ||
3 | SECTION = "console/utils" | ||
4 | LICENSE = "GPLv2 & LGPLv2" | ||
5 | DEPENDS = "gnutls libpng jpeg dbus dbus-glib zlib" | ||
6 | PROVIDES = "cups14" | ||
7 | |||
8 | SRC_URI = "http://www.cups.org/software/${PV}/${BP}-source.tar.bz2" | ||
9 | |||
10 | LEAD_SONAME = "libcupsdriver.so" | ||
11 | |||
12 | inherit autotools binconfig | ||
13 | |||
14 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)}" | ||
15 | PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" | ||
16 | PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl" | ||
17 | |||
18 | EXTRA_OECONF = " \ | ||
19 | --enable-gnutls \ | ||
20 | --enable-dbus \ | ||
21 | --enable-browsing \ | ||
22 | --disable-openssl \ | ||
23 | --disable-tiff \ | ||
24 | --without-php \ | ||
25 | --without-perl \ | ||
26 | --without-python \ | ||
27 | --without-java \ | ||
28 | --with-pdftops=none \ | ||
29 | " | ||
30 | |||
31 | |||
32 | do_configure() { | ||
33 | gnu-configize | ||
34 | libtoolize --force | ||
35 | DSOFLAGS="${LDFLAGS}" SERVERBIN="${libdir}/cups" oe_runconf | ||
36 | } | ||
37 | |||
38 | do_compile () { | ||
39 | sed -i s:STRIP:NOSTRIP: Makedefs | ||
40 | sed -i s:serial:: backend/Makefile | ||
41 | |||
42 | echo "all:" > man/Makefile | ||
43 | echo "libs:" >> man/Makefile | ||
44 | echo "install:" >> man/Makefile | ||
45 | echo "install-data:" >> man/Makefile | ||
46 | echo "install-exec:" >> man/Makefile | ||
47 | echo "install-headers:" >> man/Makefile | ||
48 | echo "install-libs:" >> man/Makefile | ||
49 | |||
50 | oe_runmake "SSLLIBS=-lgnutls -L${STAGING_LIBDIR}" \ | ||
51 | "LIBPNG=-lpng -lm -L${STAGING_LIBDIR}" \ | ||
52 | "LIBJPEG=-ljpeg -L${STAGING_LIBDIR}" \ | ||
53 | "LIBZ=-lz -L${STAGING_LIBDIR}" \ | ||
54 | "-I." | ||
55 | } | ||
56 | |||
57 | fakeroot do_install () { | ||
58 | oe_runmake "DSTROOT=${D}" install | ||
59 | |||
60 | # Remove /var/run from package as cupsd will populate it on startup | ||
61 | rm -fr ${D}/${localstatedir}/run | ||
62 | rmdir ${D}/${libdir}/${BPN}/driver | ||
63 | } | ||
64 | |||
65 | python do_package_append() { | ||
66 | import subprocess | ||
67 | # Change permissions back the way they were, they probably had a reason... | ||
68 | workdir = d.getVar('WORKDIR', True) | ||
69 | subprocess.call('chmod 0511 %s/install/cups/var/run/cups/certs' % workdir, shell=True) | ||
70 | } | ||
71 | |||
72 | PACKAGES =+ "${PN}-lib ${PN}-libimage" | ||
73 | |||
74 | FILES_${PN} += "${libdir}/cups/backend \ | ||
75 | ${libdir}/cups/cgi-bin \ | ||
76 | ${libdir}/cups/filter \ | ||
77 | ${libdir}/cups/monitor \ | ||
78 | ${libdir}/cups/notifier \ | ||
79 | ${libdir}/cups/daemon \ | ||
80 | " | ||
81 | |||
82 | FILES_${PN}-lib = "${libdir}/libcups.so.*" | ||
83 | |||
84 | FILES_${PN}-libimage = "${libdir}/libcupsimage.so.*" | ||
85 | |||
86 | FILES_${PN}-dbg += "${libdir}/cups/backend/.debug \ | ||
87 | ${libdir}/cups/cgi-bin/.debug \ | ||
88 | ${libdir}/cups/filter/.debug \ | ||
89 | ${libdir}/cups/monitor/.debug \ | ||
90 | ${libdir}/cups/notifier/.debug \ | ||
91 | ${libdir}/cups/daemon/.debug \ | ||
92 | " | ||
93 | |||
94 | #package the html for the webgui inside the main packages (~1MB uncompressed) | ||
95 | |||
96 | FILES_${PN} += "${datadir}/doc/cups/images \ | ||
97 | ${datadir}/doc/cups/*html \ | ||
98 | ${datadir}/doc/cups/*.css \ | ||
99 | ${datadir}/icons/ \ | ||
100 | " | ||
101 | |||
102 | SYSROOT_PREPROCESS_FUNCS += "cups_sysroot_preprocess" | ||
103 | cups_sysroot_preprocess () { | ||
104 | sed -i ${SYSROOT_DESTDIR}${bindir_crossscripts}/cups-config -e 's:cups_datadir=.*:cups_datadir=${datadir}/cups:' -e 's:cups_serverbin=.*:cups_serverbin=${libdir}/cups:' | ||
105 | } | ||
diff --git a/meta/recipes-extended/cups/cups_1.6.3.bb b/meta/recipes-extended/cups/cups_1.6.3.bb new file mode 100644 index 0000000000..5ed52fe03e --- /dev/null +++ b/meta/recipes-extended/cups/cups_1.6.3.bb | |||
@@ -0,0 +1,19 @@ | |||
1 | require cups16.inc | ||
2 | |||
3 | DEPENDS += "libusb \ | ||
4 | ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | ||
5 | |||
6 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c5e50cb4b8f24b04636b719683a9102d" | ||
7 | SRC_URI += " \ | ||
8 | file://use_echo_only_in_init.patch \ | ||
9 | file://0001-don-t-try-to-run-generated-binaries.patch \ | ||
10 | file://cups_serverbin.patch \ | ||
11 | " | ||
12 | |||
13 | SRC_URI[md5sum] = "946a2d8ad1aec6beced312fce18543da" | ||
14 | SRC_URI[sha256sum] = "84fa83dea6ed08dbd4d1112d9b0005424713b32bcb13111857836312896cf29d" | ||
15 | |||
16 | EXTRA_OECONF += " --disable-gssapi --enable-debug --disable-relro --enable-libusb \ | ||
17 | ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}" | ||
18 | |||
19 | CONFFILES_${PN} += "${sysconfdir}/cups/cupsd.conf" | ||