diff options
| author |   Tom Rini <tom_rini@mentor.com> | 2010-10-15 12:57:27 -0700 |
|---|---|---|
| committer | Tom Rini <tom_rini@mentor.com> | 2010-10-15 12:57:27 -0700 |
| commit | bed8795f363295a61c48e2df58d1c5626f1cad3a (patch) | |
| tree | 1a0eac7efa7acebbe1fa36e37cc5892bbf5f2c7c /recipes/cups | |
| parent | 5b485324c2ac637e9fc6d40753ee64fd6907db69 (diff) | |
| download | openembedded-bed8795f363295a61c48e2df58d1c5626f1cad3a.tar.gz | |
cups14: Drop legacy bits, correct libusb dep
We don't need do_stage for target stuff, drop. We don't need
name=foo on SRC_URIs in this case, drop. We want virtual/libusb0
for a dep here.
Signed-off-by: Tom Rini <tom_rini@mentor.com>
Diffstat (limited to 'recipes/cups')
| -rw-r--r-- | recipes/cups/cups14.inc | 12 | ||||
| -rw-r--r-- | recipes/cups/cups_1.4.3.bb | 4 | ||||
| -rw-r--r-- | recipes/cups/cups_1.4.4.bb | 8 |
3 files changed, 7 insertions, 17 deletions
diff --git a/recipes/cups/cups14.inc b/recipes/cups/cups14.inc index 5ae6f20137..0828187c1a 100644 --- a/recipes/cups/cups14.inc +++ b/recipes/cups/cups14.inc @@ -4,8 +4,7 @@ LICENSE = "GPL LGPL" DEPENDS = "gnutls libpng jpeg dbus dbus-glib zlib fakeroot-native" PROVIDES = "cups14" -SRC_URI = "ftp://ftp.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2;name=archive \ - " +SRC_URI = "ftp://ftp.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2" LEAD_SONAME = "libcupsdriver.so" @@ -56,14 +55,6 @@ fakeroot do_install () { chmod 0711 "${D}/${localstatedir}/run/cups/certs" } -do_stage () { - install -d ${STAGING_INCDIR}/cups - install ${S}/cups/*.h ${STAGING_INCDIR}/cups/ - install ${S}/filter/*.h ${STAGING_INCDIR}/cups/ - oe_libinstall -C cups -so libcups ${STAGING_LIBDIR} - oe_libinstall -C filter -so libcupsimage ${STAGING_LIBDIR} -} - python do_package_append() { # Change permissions back the way they were, they probably had a reason... workdir = bb.data.getVar('WORKDIR', d, 1) @@ -90,4 +81,3 @@ FILES_${PN} += "${datadir}/doc/cups/images \ ${datadir}/doc/cups/*.css \ ${datadir}/icons/ \ " - diff --git a/recipes/cups/cups_1.4.3.bb b/recipes/cups/cups_1.4.3.bb index 5cc0518881..f562725f35 100644 --- a/recipes/cups/cups_1.4.3.bb +++ b/recipes/cups/cups_1.4.3.bb @@ -5,8 +5,8 @@ SRC_URI += "file://use_echo_only_in_init.patch \ file://configure.patch \ " -SRC_URI[archive.md5sum] = "e70b1c3f60143d7310c1d74c111a21ab" -SRC_URI[archive.sha256sum] = "47a559b1c50192b94479ae7dab132ea0008727045d4993501cf0a6df0c64db97" +SRC_URI[md5sum] = "e70b1c3f60143d7310c1d74c111a21ab" +SRC_URI[sha256sum] = "47a559b1c50192b94479ae7dab132ea0008727045d4993501cf0a6df0c64db97" PR = "r3" diff --git a/recipes/cups/cups_1.4.4.bb b/recipes/cups/cups_1.4.4.bb index 7813dbfe61..bf23cc5231 100644 --- a/recipes/cups/cups_1.4.4.bb +++ b/recipes/cups/cups_1.4.4.bb @@ -6,12 +6,12 @@ SRC_URI += " \ file://configure.patch \ " -SRC_URI[archive.md5sum] = "8776403ad60fea9e85eab9c04d88560d" -SRC_URI[archive.sha256sum] = "d25ffa35add3abeeec0eba60be2cffc89425b649c64ef3a73dfc724683a59aa3" +SRC_URI[md5sum] = "8776403ad60fea9e85eab9c04d88560d" +SRC_URI[sha256sum] = "d25ffa35add3abeeec0eba60be2cffc89425b649c64ef3a73dfc724683a59aa3" -PR = "r1" +PR = "r2" DEFAULT_PREFERENCE = "-1" -DEPENDS += " libusb " +DEPENDS += "virtual/libusb0" EXTRA_OECONF += " --disable-gssapi --disable-largefile --enable-debug --disable-relro --enable-libusb" CONFFILES_${PN} += "${sysconfdir}/cups/cupsd.conf" |