summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/cups/cups-1.4.6/0001-don-t-try-to-run-generated-binaries.patch68
-rw-r--r--meta/recipes-extended/cups/cups-1.4.6/use_echo_only_in_init.patch11
-rw-r--r--meta/recipes-extended/cups/cups14.inc85
-rw-r--r--meta/recipes-extended/cups/cups_1.4.6.bb17
4 files changed, 181 insertions, 0 deletions
diff --git a/meta/recipes-extended/cups/cups-1.4.6/0001-don-t-try-to-run-generated-binaries.patch b/meta/recipes-extended/cups/cups-1.4.6/0001-don-t-try-to-run-generated-binaries.patch
new file mode 100644
index 0000000000..7b544ca0e3
--- /dev/null
+++ b/meta/recipes-extended/cups/cups-1.4.6/0001-don-t-try-to-run-generated-binaries.patch
@@ -0,0 +1,68 @@
1From 90069586167b930befce7303aea57078f04b4ed8 Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Sun, 30 Jan 2011 16:37:27 +0100
4Subject: [PATCH] don't try to run generated binaries
5
6Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
7---
8 ppdc/Makefile | 30 +++++++++++++++---------------
9 1 files changed, 15 insertions(+), 15 deletions(-)
10
11diff --git a/ppdc/Makefile b/ppdc/Makefile
12index 0288d47..fc87f1b 100644
13--- a/ppdc/Makefile
14+++ b/ppdc/Makefile
15@@ -243,8 +243,8 @@ genstrings: genstrings.o libcupsppdc.a ../cups/libcups.a \
16 $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \
17 libcupsppdc.a ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) \
18 $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
19- echo Generating localization strings...
20- ./genstrings >sample.c
21+# echo Generating localization strings...
22+# ./genstrings >sample.c
23
24
25 #
26@@ -261,9 +261,9 @@ ppdc-static: ppdc.o libcupsppdc.a ../cups/libcups.a foo.drv foo-fr.po
27 $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \
28 ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
29 $(COMMONLIBS) $(LIBZ)
30- echo Testing PPD compiler...
31- ./ppdc-static -l en,fr -I ../data foo.drv
32- ./ppdc-static -l en,fr -z -I ../data foo.drv
33+# echo Testing PPD compiler...
34+# ./ppdc-static -l en,fr -I ../data foo.drv
35+# ./ppdc-static -l en,fr -z -I ../data foo.drv
36
37
38 #
39@@ -290,16 +290,16 @@ ppdi-static: ppdc-static ppdi.o libcupsppdc.a ../cups/libcups.a
40 ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
41 $(COMMONLIBS) $(LIBZ)
42 echo Testing PPD importer...
43- $(RM) -r ppd ppd2 sample-import.drv
44- ./ppdc-static -I ../data sample.drv
45- ./ppdi-static -I ../data -o sample-import.drv ppd/*
46- ./ppdc-static -I ../data -d ppd2 sample-import.drv
47- if diff -r ppd ppd2 >/dev/null; then \
48- echo PPD import OK; \
49- else \
50- echo PPD import FAILED; \
51- exit 1; \
52- fi
53+# $(RM) -r ppd ppd2 sample-import.drv
54+# ./ppdc-static -I ../data sample.drv
55+# ./ppdi-static -I ../data -o sample-import.drv ppd/*
56+# ./ppdc-static -I ../data -d ppd2 sample-import.drv
57+# if diff -r ppd ppd2 >/dev/null; then \
58+# echo PPD import OK; \
59+# else \
60+# echo PPD import FAILED; \
61+# exit 1; \
62+# fi
63
64
65 #
66--
671.6.6.1
68
diff --git a/meta/recipes-extended/cups/cups-1.4.6/use_echo_only_in_init.patch b/meta/recipes-extended/cups/cups-1.4.6/use_echo_only_in_init.patch
new file mode 100644
index 0000000000..21ff0e535b
--- /dev/null
+++ b/meta/recipes-extended/cups/cups-1.4.6/use_echo_only_in_init.patch
@@ -0,0 +1,11 @@
1--- a/init/cups.sh.in.orig 2008-10-04 16:50:46.000000000 -0300
2+++ b/init/cups.sh.in 2008-10-04 16:51:39.000000000 -0300
3@@ -68,7 +68,7 @@
4 ECHO_ERROR=:
5 ;;
6
7- Linux*)
8+ DISABLELinux*)
9 IS_ON=/bin/true
10 if test -f /etc/init.d/functions; then
11 . /etc/init.d/functions
diff --git a/meta/recipes-extended/cups/cups14.inc b/meta/recipes-extended/cups/cups14.inc
new file mode 100644
index 0000000000..e64f239a6a
--- /dev/null
+++ b/meta/recipes-extended/cups/cups14.inc
@@ -0,0 +1,85 @@
1SUMMARY = "An Internet printing system for Unix"
2DESCRIPTION = "An Internet printing system for Unix."
3SECTION = "console/utils"
4LICENSE = "GPLv2 LGPLv2"
5DEPENDS = "gnutls libpng jpeg dbus dbus-glib zlib"
6PROVIDES = "cups14"
7
8SRC_URI = "ftp://ftp.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2"
9
10LEAD_SONAME = "libcupsdriver.so"
11
12inherit autotools binconfig
13
14EXTRA_OECONF = " \
15 --enable-gnutls \
16 --enable-dbus \
17 --enable-browsing \
18 --disable-openssl \
19 --disable-tiff \
20 --without-php \
21 --without-perl \
22 --without-python \
23 --without-java \
24 "
25
26
27do_configure() {
28 gnu-configize
29 libtoolize --force
30 DSOFLAGS="${LDFLAGS}" oe_runconf
31}
32
33do_compile () {
34 sed -i s:STRIP:NOSTRIP: Makedefs
35 sed -i s:serial:: backend/Makefile
36
37 echo "all:" > man/Makefile
38 echo "libs:" >> man/Makefile
39 echo "install:" >> man/Makefile
40 echo "install-data:" >> man/Makefile
41 echo "install-exec:" >> man/Makefile
42 echo "install-headers:" >> man/Makefile
43 echo "install-libs:" >> man/Makefile
44
45 oe_runmake "SSLLIBS=-lgnutls -L${STAGING_LIBDIR}" \
46 "LIBPNG=-lpng -lm -L${STAGING_LIBDIR}" \
47 "LIBJPEG=-ljpeg -L${STAGING_LIBDIR}" \
48 "LIBZ=-lz -L${STAGING_LIBDIR}" \
49 "-I."
50}
51
52fakeroot do_install () {
53 oe_runmake "DSTROOT=${D}" install
54
55 # This directory gets installed with perms 511, which makes packaging fail
56 chmod 0711 "${D}/${localstatedir}/run/cups/certs"
57}
58
59python do_package_append() {
60 # Change permissions back the way they were, they probably had a reason...
61 workdir = bb.data.getVar('WORKDIR', d, 1)
62 os.system('chmod 0511 %s/install/cups/var/run/cups/certs' % workdir)
63}
64
65PACKAGES =+ "${PN}-lib ${PN}-libimage"
66
67FILES_${PN}-lib = "${libdir}/libcups.so.*"
68
69FILES_${PN}-libimage = "${libdir}/libcupsimage.so.*"
70
71FILES_${PN}-dbg += "${libdir}/cups/backend/.debug \
72 ${libdir}/cups/cgi-bin/.debug \
73 ${libdir}/cups/filter/.debug \
74 ${libdir}/cups/monitor/.debug \
75 ${libdir}/cups/notifier/.debug \
76 ${libdir}/cups/daemon/.debug \
77 "
78
79#package the html for the webgui inside the main packages (~1MB uncompressed)
80
81FILES_${PN} += "${datadir}/doc/cups/images \
82 ${datadir}/doc/cups/*html \
83 ${datadir}/doc/cups/*.css \
84 ${datadir}/icons/ \
85 "
diff --git a/meta/recipes-extended/cups/cups_1.4.6.bb b/meta/recipes-extended/cups/cups_1.4.6.bb
new file mode 100644
index 0000000000..86b53403eb
--- /dev/null
+++ b/meta/recipes-extended/cups/cups_1.4.6.bb
@@ -0,0 +1,17 @@
1require cups14.inc
2
3PR = "r0"
4DEPENDS += "libusb"
5
6LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=956e7600195e6139f12de8c2a5bbefa9"
7SRC_URI += " \
8 file://use_echo_only_in_init.patch \
9 file://0001-don-t-try-to-run-generated-binaries.patch \
10 "
11
12SRC_URI[md5sum] = "de8fb5a29c36554925c0c6a6e2c0dae1"
13SRC_URI[sha256sum] = "f08711702a77b52c7150f96fe1f45482f6151cb95ef601268c528607fe6ad514"
14
15EXTRA_OECONF += " --disable-gssapi --enable-debug --disable-relro --enable-libusb"
16
17CONFFILES_${PN} += "${sysconfdir}/cups/cupsd.conf"