diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2011-01-30 09:30:23 +0100 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-01-30 09:30:23 +0100 |
commit | a0fea6dda7c711d3c78931bf89d1279d98e425ef (patch) | |
tree | 9a6883807a61d94431536f8d565da4c0659b1755 | |
parent | 20aebd5f9145effd92118346b6131fbc37f20665 (diff) | |
download | meta-openembedded-a0fea6dda7c711d3c78931bf89d1279d98e425ef.tar.gz |
cups: update to 1.4.6
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-rw-r--r-- | recipes-support/cups/cups-1.4.6/configure.patch (renamed from recipes-support/cups/cups-1.4.4/configure.patch) | 0 | ||||
-rw-r--r-- | recipes-support/cups/cups-1.4.6/skip_tools.patch (renamed from recipes-support/cups/cups-1.4.4/skip_tools.patch) | 0 | ||||
-rw-r--r-- | recipes-support/cups/cups-1.4.6/use_echo_only_in_init.patch (renamed from recipes-support/cups/cups-1.4.4/use_echo_only_in_init.patch) | 0 | ||||
-rw-r--r-- | recipes-support/cups/cups.inc | 8 | ||||
-rw-r--r-- | recipes-support/cups/cups_1.4.6.bb (renamed from recipes-support/cups/cups_1.4.4.bb) | 11 |
5 files changed, 9 insertions, 10 deletions
diff --git a/recipes-support/cups/cups-1.4.4/configure.patch b/recipes-support/cups/cups-1.4.6/configure.patch index 877e8d323..877e8d323 100644 --- a/recipes-support/cups/cups-1.4.4/configure.patch +++ b/recipes-support/cups/cups-1.4.6/configure.patch | |||
diff --git a/recipes-support/cups/cups-1.4.4/skip_tools.patch b/recipes-support/cups/cups-1.4.6/skip_tools.patch index 272110146..272110146 100644 --- a/recipes-support/cups/cups-1.4.4/skip_tools.patch +++ b/recipes-support/cups/cups-1.4.6/skip_tools.patch | |||
diff --git a/recipes-support/cups/cups-1.4.4/use_echo_only_in_init.patch b/recipes-support/cups/cups-1.4.6/use_echo_only_in_init.patch index 21ff0e535..21ff0e535 100644 --- a/recipes-support/cups/cups-1.4.4/use_echo_only_in_init.patch +++ b/recipes-support/cups/cups-1.4.6/use_echo_only_in_init.patch | |||
diff --git a/recipes-support/cups/cups.inc b/recipes-support/cups/cups.inc index 0f813ca49..8f97f1233 100644 --- a/recipes-support/cups/cups.inc +++ b/recipes-support/cups/cups.inc | |||
@@ -25,7 +25,7 @@ EXTRA_OECONF = " \ | |||
25 | 25 | ||
26 | 26 | ||
27 | do_configure() { | 27 | do_configure() { |
28 | export DSOFLAGS="${LDFLAGS}" | 28 | export DSOFLAGS="${LDFLAGS}" |
29 | gnu-configize | 29 | gnu-configize |
30 | libtoolize --force | 30 | libtoolize --force |
31 | oe_runconf | 31 | oe_runconf |
@@ -45,11 +45,11 @@ do_compile () { | |||
45 | "-I." | 45 | "-I." |
46 | } | 46 | } |
47 | 47 | ||
48 | fakeroot do_install () { | 48 | do_install () { |
49 | oe_runmake "DSTROOT=${D}" install | 49 | oe_runmake "DSTROOT=${D}" install |
50 | 50 | ||
51 | # This directory gets installed with perms 511, which makes packaging fail | 51 | # This directory gets installed with perms 511, which makes packaging fail |
52 | chmod 0711 "${D}/${localstatedir}/run/cups/certs" | 52 | chmod 0711 "${D}/${localstatedir}/run/cups/certs" |
53 | } | 53 | } |
54 | 54 | ||
55 | python do_package_append() { | 55 | python do_package_append() { |
diff --git a/recipes-support/cups/cups_1.4.4.bb b/recipes-support/cups/cups_1.4.6.bb index df5bf585d..850b80c5c 100644 --- a/recipes-support/cups/cups_1.4.4.bb +++ b/recipes-support/cups/cups_1.4.6.bb | |||
@@ -1,5 +1,7 @@ | |||
1 | require cups14.inc | 1 | require cups14.inc |
2 | 2 | ||
3 | DEPENDS += "virtual/libusb0" | ||
4 | |||
3 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=956e7600195e6139f12de8c2a5bbefa9" | 5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=956e7600195e6139f12de8c2a5bbefa9" |
4 | 6 | ||
5 | SRC_URI += " \ | 7 | SRC_URI += " \ |
@@ -8,12 +10,9 @@ SRC_URI += " \ | |||
8 | file://configure.patch \ | 10 | file://configure.patch \ |
9 | " | 11 | " |
10 | 12 | ||
11 | SRC_URI[md5sum] = "8776403ad60fea9e85eab9c04d88560d" | 13 | SRC_URI[md5sum] = "de8fb5a29c36554925c0c6a6e2c0dae1" |
12 | SRC_URI[sha256sum] = "d25ffa35add3abeeec0eba60be2cffc89425b649c64ef3a73dfc724683a59aa3" | 14 | SRC_URI[sha256sum] = "f08711702a77b52c7150f96fe1f45482f6151cb95ef601268c528607fe6ad514" |
13 | 15 | ||
14 | PR = "r2" | 16 | EXTRA_OECONF += " --disable-gssapi --enable-debug --disable-relro --enable-libusb" |
15 | 17 | ||
16 | DEFAULT_PREFERENCE = "-1" | ||
17 | DEPENDS += "virtual/libusb0" | ||
18 | EXTRA_OECONF += " --disable-gssapi --disable-largefile --enable-debug --disable-relro --enable-libusb" | ||
19 | CONFFILES_${PN} += "${sysconfdir}/cups/cupsd.conf" | 18 | CONFFILES_${PN} += "${sysconfdir}/cups/cupsd.conf" |