cups: update systemd support
Add PACKAGECONFIG for systemd, enable it when systemd is enabled in DISTRO_FEATURES. Pass the correct path to systemd units, ensure they're installed into the package. Drop custom systemd unit files, use those shipped by the upstream instead. (From OE-Core rev: 39912b5f7b40210aefb8b248ab1a8643b61dfcbc) Signed-off-by: Andrew Shadura <andrew.shadura@collabora.co.uk> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
a4b48c26c5
commit
31ce0271e6
|
@ -7,9 +7,6 @@ SRC_URI = "http://www.cups.org/software/${PV}/${BP}-source.tar.bz2 \
|
|||
file://use_echo_only_in_init.patch \
|
||||
file://0001-don-t-try-to-run-generated-binaries.patch \
|
||||
file://cups_serverbin.patch \
|
||||
file://cups.socket \
|
||||
file://cups.path \
|
||||
file://cups.service \
|
||||
"
|
||||
|
||||
UPSTREAM_CHECK_URI = "http://www.cups.org/software.php"
|
||||
|
@ -24,13 +21,15 @@ inherit autotools-brokensep binconfig useradd systemd
|
|||
USERADD_PACKAGES = "${PN}"
|
||||
GROUPADD_PARAM_${PN} = "--system lpadmin"
|
||||
|
||||
SYSTEMD_SERVICE_${PN} = "cups.socket cups.path cups.service"
|
||||
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)}"
|
||||
PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi"
|
||||
PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl"
|
||||
PACKAGECONFIG[pam] = "--enable-pam, --disable-pam, libpam"
|
||||
PACKAGECONFIG[systemd] = "--with-systemd=${systemd_system_unitdir},--without-systemd,systemd"
|
||||
PACKAGECONFIG[xinetd] = "--with-xinetd=${sysconfdir}/xinetd.d,--without-xinetd,xinetd"
|
||||
|
||||
EXTRA_OECONF = " \
|
||||
|
@ -78,13 +77,6 @@ do_install () {
|
|||
rm -rf ${D}${sysconfdir}/init.d/
|
||||
rm -rf ${D}${sysconfdir}/rc*
|
||||
fi
|
||||
|
||||
# Install systemd unit files
|
||||
install -d ${D}${systemd_unitdir}/system
|
||||
install -m 0644 ${WORKDIR}/cups.socket ${D}${systemd_unitdir}/system
|
||||
install -m 0644 ${WORKDIR}/cups.path ${D}${systemd_unitdir}/system
|
||||
install -m 0644 ${WORKDIR}/cups.service ${D}${systemd_unitdir}/system
|
||||
sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/cups.service
|
||||
}
|
||||
|
||||
python do_package_append() {
|
||||
|
|
|
@ -1,8 +0,0 @@
|
|||
[Unit]
|
||||
Description=CUPS Printer Service Spool
|
||||
|
||||
[Path]
|
||||
PathExistsGlob=/var/spool/cups/d*
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
|
@ -1,10 +0,0 @@
|
|||
[Unit]
|
||||
Description=CUPS Printing Service
|
||||
|
||||
[Service]
|
||||
ExecStart=@SBINDIR@/cupsd -f
|
||||
PrivateTmp=true
|
||||
|
||||
[Install]
|
||||
Also=cups.socket cups.path
|
||||
WantedBy=printer.target
|
|
@ -1,8 +0,0 @@
|
|||
[Unit]
|
||||
Description=CUPS Printing Service Sockets
|
||||
|
||||
[Socket]
|
||||
ListenStream=/var/run/cups/cups.sock
|
||||
|
||||
[Install]
|
||||
WantedBy=sockets.target
|
Loading…
Reference in New Issue