diff options
Diffstat (limited to 'poky/meta/recipes-extended/cups/cups.inc')
-rw-r--r-- | poky/meta/recipes-extended/cups/cups.inc | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/poky/meta/recipes-extended/cups/cups.inc b/poky/meta/recipes-extended/cups/cups.inc index 2149cbe4cf..e389d8a2da 100644 --- a/poky/meta/recipes-extended/cups/cups.inc +++ b/poky/meta/recipes-extended/cups/cups.inc @@ -5,14 +5,16 @@ Protocol (IPP), and has its own filtering driver model for handling various \ document types." HOMEPAGE = "https://www.cups.org/" SECTION = "console/utils" -LICENSE = "GPLv2 & LGPLv2" +LICENSE = "Apache-2.0" DEPENDS = "gnutls libpng jpeg dbus zlib libusb1" SRC_URI = "https://github.com/apple/cups/releases/download/v${PV}/${BP}-source.tar.gz \ - file://use_echo_only_in_init.patch \ - file://0001-don-t-try-to-run-generated-binaries.patch \ - file://cups_serverbin.patch \ - file://cups-avoid-install-file-conflicts.patch \ + file://0001-use-echo-only-in-init.patch \ + file://0002-don-t-try-to-run-generated-binaries.patch \ + file://0003-cups_1.4.6.bb-Fix-build-on-ppc64.patch \ + file://0004-cups-fix-multilib-install-file-conflicts.patch \ + file://volatiles.99_cups \ + file://cups-volatiles.conf \ " UPSTREAM_CHECK_URI = "https://github.com/apple/cups/releases" @@ -22,7 +24,7 @@ LEAD_SONAME = "libcupsdriver.so" CLEANBROKEN = "1" -inherit autotools-brokensep binconfig useradd systemd pkgconfig +inherit autotools-brokensep binconfig useradd systemd pkgconfig multilib_script USERADD_PACKAGES = "${PN}" GROUPADD_PARAM_${PN} = "--system lpadmin" @@ -45,10 +47,6 @@ EXTRA_OECONF = " \ --enable-debug \ --disable-relro \ --enable-libusb \ - --without-php \ - --without-perl \ - --without-python \ - --without-java \ DSOFLAGS='${LDFLAGS}' \ " @@ -71,6 +69,7 @@ do_install () { # Remove /var/run from package as cupsd will populate it on startup rm -fr ${D}/${localstatedir}/run + rm -fr ${D}/${localstatedir}/log rmdir ${D}/${libexecdir}/${BPN}/driver # Fix the pam configuration file permissions @@ -82,18 +81,20 @@ do_install () { if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','false','true',d)}; then rm -rf ${D}${sysconfdir}/init.d/ rm -rf ${D}${sysconfdir}/rc* + install -d ${D}${sysconfdir}/tmpfiles.d + install -m 0644 ${WORKDIR}/cups-volatiles.conf \ + ${D}${sysconfdir}/tmpfiles.d/cups.conf + else + install -d ${D}${sysconfdir}/default/volatiles + install -m 0644 ${WORKDIR}/volatiles.99_cups \ + ${D}${sysconfdir}/default/volatiles/99_cups fi } PACKAGES =+ "${PN}-lib ${PN}-libimage" RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'procps', '', d)}" -FILES_${PN} += "${libdir}/cups/backend \ - ${libdir}/cups/cgi-bin \ - ${libdir}/cups/filter \ - ${libdir}/cups/monitor \ - ${libdir}/cups/notifier \ - ${libdir}/cups/daemon \ +FILES_${PN} += "${libexecdir}/cups/ \ " FILES_${PN}-lib = "${libdir}/libcups.so.*" @@ -109,7 +110,9 @@ FILES_${PN} += "${datadir}/doc/cups/images \ " CONFFILES_${PN} += "${sysconfdir}/cups/cupsd.conf" +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/cups-config" + SYSROOT_PREPROCESS_FUNCS += "cups_sysroot_preprocess" cups_sysroot_preprocess () { - sed -i ${SYSROOT_DESTDIR}${bindir_crossscripts}/cups-config -e 's:cups_datadir=.*:cups_datadir=${datadir}/cups:' -e 's:cups_serverbin=.*:cups_serverbin=${libdir}/cups:' + sed -i ${SYSROOT_DESTDIR}${bindir_crossscripts}/cups-config -e 's:cups_datadir=.*:cups_datadir=${datadir}/cups:' -e 's:cups_serverbin=.*:cups_serverbin=${libexecdir}/cups:' } |