diff options
Diffstat (limited to 'meta/recipes-extended/cups/cups.inc')
| -rw-r--r-- | meta/recipes-extended/cups/cups.inc | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index be5a11c944..df23825466 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -8,18 +8,17 @@ SECTION = "console/utils" LICENSE = "Apache-2.0" DEPENDS = "libpng jpeg dbus zlib libusb1" -SRC_URI = "https://github.com/apple/cups/releases/download/v${PV}/${BP}-source.tar.gz \ +SRC_URI = "https://github.com/OpenPrinting/cups/releases/download/v${PV}/cups-${PV}-source.tar.gz \ 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://libexecdir.patch \ file://0004-cups-fix-multilib-install-file-conflicts.patch \ file://volatiles.99_cups \ file://cups-volatiles.conf \ - file://CVE-2020-10001.patch \ " -UPSTREAM_CHECK_URI = "https://github.com/apple/cups/releases" -UPSTREAM_CHECK_REGEX = "cups-(?P<pver>\d+\.\d+(\.\d+)?)-source.tar" +UPSTREAM_CHECK_URI = "https://github.com/OpenPrinting/cups/releases" +UPSTREAM_CHECK_REGEX = "cups-(?P<pver>.+)-source.tar" # Issue only applies to MacOS CVE_CHECK_WHITELIST += "CVE-2008-1033" @@ -37,7 +36,7 @@ inherit autotools-brokensep binconfig useradd systemd pkgconfig multilib_script USERADD_PACKAGES = "${PN}" GROUPADD_PARAM_${PN} = "--system lpadmin" -SYSTEMD_SERVICE_${PN} = "org.cups.cupsd.socket org.cups.cupsd.path org.cups.cupsd.service org.cups.cups-lpd.socket" +SYSTEMD_SERVICE_${PN} = "cups.socket cups.path cups.service cups-lpd.socket" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)}" @@ -63,20 +62,8 @@ EXTRA_OECONF = " \ EXTRA_AUTORECONF += "--exclude=autoheader" -do_compile () { - echo "all:" > man/Makefile - echo "libs:" >> man/Makefile - echo "install:" >> man/Makefile - echo "install-data:" >> man/Makefile - echo "install-exec:" >> man/Makefile - echo "install-headers:" >> man/Makefile - echo "install-libs:" >> man/Makefile - - oe_runmake -} - do_install () { - oe_runmake "DSTROOT=${D}" install + oe_runmake "DESTDIR=${D}" install # Remove /var/run from package as cupsd will populate it on startup rm -fr ${D}/${localstatedir}/run @@ -105,8 +92,7 @@ do_install () { PACKAGES =+ "${PN}-lib ${PN}-libimage" RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'procps', '', d)}" -FILES_${PN} += "${libexecdir}/cups/ \ - " +FILES_${PN} += "${libexecdir}/cups/" FILES_${PN}-lib = "${libdir}/libcups.so.*" |