diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-extended/cups | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz |
Convert to new override syntax
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/cups')
-rw-r--r-- | meta/recipes-extended/cups/cups.inc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index df23825466..f6f8637a43 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc | |||
@@ -34,9 +34,9 @@ CLEANBROKEN = "1" | |||
34 | inherit autotools-brokensep binconfig useradd systemd pkgconfig multilib_script | 34 | inherit autotools-brokensep binconfig useradd systemd pkgconfig multilib_script |
35 | 35 | ||
36 | USERADD_PACKAGES = "${PN}" | 36 | USERADD_PACKAGES = "${PN}" |
37 | GROUPADD_PARAM_${PN} = "--system lpadmin" | 37 | GROUPADD_PARAM:${PN} = "--system lpadmin" |
38 | 38 | ||
39 | SYSTEMD_SERVICE_${PN} = "cups.socket cups.path cups.service cups-lpd.socket" | 39 | SYSTEMD_SERVICE:${PN} = "cups.socket cups.path cups.service cups-lpd.socket" |
40 | 40 | ||
41 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ | 41 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ |
42 | ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)}" | 42 | ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)}" |
@@ -91,21 +91,21 @@ do_install () { | |||
91 | 91 | ||
92 | PACKAGES =+ "${PN}-lib ${PN}-libimage" | 92 | PACKAGES =+ "${PN}-lib ${PN}-libimage" |
93 | 93 | ||
94 | RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'procps', '', d)}" | 94 | RDEPENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'procps', '', d)}" |
95 | FILES_${PN} += "${libexecdir}/cups/" | 95 | FILES:${PN} += "${libexecdir}/cups/" |
96 | 96 | ||
97 | FILES_${PN}-lib = "${libdir}/libcups.so.*" | 97 | FILES:${PN}-lib = "${libdir}/libcups.so.*" |
98 | 98 | ||
99 | FILES_${PN}-libimage = "${libdir}/libcupsimage.so.*" | 99 | FILES:${PN}-libimage = "${libdir}/libcupsimage.so.*" |
100 | 100 | ||
101 | #package the html for the webgui inside the main packages (~1MB uncompressed) | 101 | #package the html for the webgui inside the main packages (~1MB uncompressed) |
102 | 102 | ||
103 | FILES_${PN} += "${datadir}/doc/cups/images \ | 103 | FILES:${PN} += "${datadir}/doc/cups/images \ |
104 | ${datadir}/doc/cups/*html \ | 104 | ${datadir}/doc/cups/*html \ |
105 | ${datadir}/doc/cups/*.css \ | 105 | ${datadir}/doc/cups/*.css \ |
106 | ${datadir}/icons/ \ | 106 | ${datadir}/icons/ \ |
107 | " | 107 | " |
108 | CONFFILES_${PN} += "${sysconfdir}/cups/cupsd.conf" | 108 | CONFFILES:${PN} += "${sysconfdir}/cups/cupsd.conf" |
109 | 109 | ||
110 | MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/cups-config" | 110 | MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/cups-config" |
111 | 111 | ||