diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-extended/cups/cups.inc')
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-extended/cups/cups.inc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-extended/cups/cups.inc b/import-layers/yocto-poky/meta/recipes-extended/cups/cups.inc index 02b6358af..c3fa45941 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/cups/cups.inc +++ b/import-layers/yocto-poky/meta/recipes-extended/cups/cups.inc @@ -3,7 +3,7 @@ SECTION = "console/utils" LICENSE = "GPLv2 & LGPLv2" DEPENDS = "gnutls libpng jpeg dbus dbus-glib zlib libusb" -SRC_URI = "https://github.com/apple/cups/releases/download/release-${PV}/${BP}-source.tar.gz \ +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 \ @@ -16,7 +16,7 @@ LEAD_SONAME = "libcupsdriver.so" CLEANBROKEN = "1" -inherit autotools-brokensep binconfig useradd systemd +inherit autotools-brokensep binconfig useradd systemd pkgconfig USERADD_PACKAGES = "${PN}" GROUPADD_PARAM_${PN} = "--system lpadmin" @@ -24,8 +24,7 @@ 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 org.cups.cups-lpd@.service" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" + ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)}" PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl" PACKAGECONFIG[pam] = "--enable-pam, --disable-pam, libpam" @@ -83,7 +82,7 @@ do_install () { python do_package_append() { import subprocess # Change permissions back the way they were, they probably had a reason... - workdir = d.getVar('WORKDIR', True) + workdir = d.getVar('WORKDIR') subprocess.call('chmod 0511 %s/install/cups/var/run/cups/certs' % workdir, shell=True) } |