[PATCH] cups: explicitly configure with systemd when needed

[PATCH] cups: explicitly configure with systemd when needed

[Andrew Shadura]

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.

Signed-off-by: Andrew Shadura <andrew.shadura@collabora.co.uk>
---
I hope this patch will be merged before jethro is released :)

 meta/recipes-extended/cups/cups.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc
index 2c34da9..ad980fc 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -24,10 +24,12 @@ GROUPADD_PARAM_${PN} = "--system lpadmin"
 SYSTEMD_SERVICE_${PN} = "cups.socket cups.path cups.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 = " \
@@ -100,6 +102,7 @@ FILES_${PN} += "${libdir}/cups/backend \
 		${libdir}/cups/monitor \
 		${libdir}/cups/notifier \
 		${libdir}/cups/daemon \
+		${systemd_system_unitdir} \
 	       "
 
 FILES_${PN}-lib = "${libdir}/libcups.so.*"
-- 
2.1.4

Re: [PATCH] cups: explicitly configure with systemd when needed

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 206 bytes --]

On 21 October 2015 at 18:41, Andrew Shadura <andrew.shadura@collabora.co.uk>
wrote:

> +               ${systemd_system_unitdir} \
>

This isn't needed as systemd.bbclass handles it for you.

Ross

[-- Attachment #2: Type: text/html, Size: 634 bytes --]

Re: [PATCH] cups: explicitly configure with systemd when needed

[Andrew Shadura]

On 22 October 2015 12:59:13 CEST, "Burton, Ross" <ross.burton@intel.com> wrote:
>On 21 October 2015 at 18:41, Andrew Shadura
><andrew.shadura@collabora.co.uk>
>wrote:
>
>> +               ${systemd_system_unitdir} \
>>
>
>This isn't needed as systemd.bbclass handles it for you.


Well, that's what I thought too, but no, in fact it doesn't. 

-- 
Cheers,
  Andrew

Re: [PATCH] cups: explicitly configure with systemd when needed

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 530 bytes --]

On 22 October 2015 at 12:06, Andrew Shadura <andrew.shadura@collabora.co.uk>
wrote:

> >This isn't needed as systemd.bbclass handles it for you.
>
>
> Well, that's what I thought too, but no, in fact it doesn't.
>

That would be because SYSTEMD_SERVICES doesn't list the extra units that
using --enable-systemd installs, because SYSTEMD_SERVICES is set up to use
the local units that were added before cups had native units.

If you're going to use the integrated units, please remove the redundant
copies.

Ross

[-- Attachment #2: Type: text/html, Size: 1032 bytes --]

[PATCH v2] cups: update systemd support

[Andrew Shadura]

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.

Signed-off-by: Andrew Shadura <andrew.shadura@collabora.co.uk>
---
 meta/recipes-extended/cups/cups.inc          | 14 +++-----------
 meta/recipes-extended/cups/cups/cups.path    |  8 --------
 meta/recipes-extended/cups/cups/cups.service | 10 ----------
 meta/recipes-extended/cups/cups/cups.socket  |  8 --------
 4 files changed, 3 insertions(+), 37 deletions(-)
 delete mode 100644 meta/recipes-extended/cups/cups/cups.path
 delete mode 100644 meta/recipes-extended/cups/cups/cups.service
 delete mode 100644 meta/recipes-extended/cups/cups/cups.socket

diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc
index 2c34da9..ac2abf5 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -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 \
 	  "
 
 LEAD_SONAME = "libcupsdriver.so"
@@ -21,13 +18,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 = " \
@@ -75,13 +74,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() {
diff --git a/meta/recipes-extended/cups/cups/cups.path b/meta/recipes-extended/cups/cups/cups.path
deleted file mode 100644
index de8cc57..0000000
--- a/meta/recipes-extended/cups/cups/cups.path
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=CUPS Printer Service Spool
-
-[Path]
-PathExistsGlob=/var/spool/cups/d*
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta/recipes-extended/cups/cups/cups.service b/meta/recipes-extended/cups/cups/cups.service
deleted file mode 100644
index 7d3e839..0000000
--- a/meta/recipes-extended/cups/cups/cups.service
+++ /dev/null
@@ -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
diff --git a/meta/recipes-extended/cups/cups/cups.socket b/meta/recipes-extended/cups/cups/cups.socket
deleted file mode 100644
index 3314870..0000000
--- a/meta/recipes-extended/cups/cups/cups.socket
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=CUPS Printing Service Sockets
-
-[Socket]
-ListenStream=/var/run/cups/cups.sock
-
-[Install]
-WantedBy=sockets.target
-- 
2.1.4

Re: [PATCH v2] cups: update systemd support

[Andrew Shadura]

[-- Attachment #1: Type: text/plain, Size: 432 bytes --]

On 22/10/15 16:00, Andrew Shadura wrote:
> 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.
> 
> Signed-off-by: Andrew Shadura <andrew.shadura@collabora.co.uk>

Anything about this patch?

-- 
Cheers,
  Andrew


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH v2] cups: update systemd support

[Andrew Shadura]

[-- Attachment #1: Type: text/plain, Size: 432 bytes --]

On 26/10/15 23:33, Andrew Shadura wrote:
> On 22/10/15 16:00, Andrew Shadura wrote:
>> 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.
> 
> Ross, could you please review an updated version of the patch?

Any news on this patch since then? Comments, critique, anything?

-- 
Cheers,
  Andrew


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH v2] cups: update systemd support

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 1406 bytes --]

On 22 October 2015 at 15:00, Andrew Shadura <andrew.shadura@collabora.co.uk>
wrote:

> 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.
>

Sorry for the delay in looking at this.  buildhistory-diff reports this:

packages/corei7-64-poky-linux/cups/cups: FILELIST: removed
"/etc/rc2.d/S81cups /lib/systemd/system/cups.service /etc/rc5.d/S81cups
/etc/rc5.d/K36cups /etc/rc0.d/K36cups /etc/rc2.d/K36cups /etc/rc3.d/S81cups
/etc/rc3.d/K36cups /lib/systemd/system/cups.socket
/lib/systemd/system/cups.path /etc/init.d/cups" added
"/lib/systemd/system/org.cups.cupsd.socket
/lib/systemd/system/org.cups.cupsd.service
/lib/systemd/system/org.cups.cups-lpd@.service
/lib/systemd/system/org.cups.cupsd.path
/lib/systemd/system/org.cups.cups-lpd.socket"

Looks like if systemd is enabled it removes the sysvinit files, but we
still need those installed if sysvinit is in DISTRO_FEATURES.

Also the configure script checks for libsystemd-daemon which we don't build
by default, so we'll either need to enable compat in systemd or patch
configure to look for the new library name.  To be honest so much is
silently breaking that I think we should enable compat in systemd...

Ross

[-- Attachment #2: Type: text/html, Size: 2110 bytes --]

Re: [PATCH v2] cups: update systemd support

[Andrew Shadura]

[-- Attachment #1: Type: text/plain, Size: 1018 bytes --]

On 11/12/15 22:39, Burton, Ross wrote:
> Sorry for the delay in looking at this.  buildhistory-diff reports this:
> 
> packages/corei7-64-poky-linux/cups/cups: FILELIST: removed
> "/etc/rc2.d/S81cups /lib/systemd/system/cups.service /etc/rc5.d/S81cups
> /etc/rc5.d/K36cups /etc/rc0.d/K36cups /etc/rc2.d/K36cups
> /etc/rc3.d/S81cups /etc/rc3.d/K36cups /lib/systemd/system/cups.socket
> /lib/systemd/system/cups.path /etc/init.d/cups" added
> "/lib/systemd/system/org.cups.cupsd.socket
> /lib/systemd/system/org.cups.cupsd.service
> /lib/systemd/system/org.cups.cups-lpd@.service
> /lib/systemd/system/org.cups.cupsd.path
> /lib/systemd/system/org.cups.cups-lpd.socket"
> 
> Looks like if systemd is enabled it removes the sysvinit files, but we
> still need those installed if sysvinit is in DISTRO_FEATURES.

I just had a look at the recipe, and it seems it removes those files on
its own even without my patch. I guess fixing that makes sense in a
separate patch then?

-- 
Cheers,
  Andrew


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH v2] cups: update systemd support

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2010 bytes --]

On Wed, Dec 30, 2015 at 11:53:04AM +0100, Andrew Shadura wrote:
> On 11/12/15 22:39, Burton, Ross wrote:
> > Sorry for the delay in looking at this.  buildhistory-diff reports this:
> > 
> > packages/corei7-64-poky-linux/cups/cups: FILELIST: removed
> > "/etc/rc2.d/S81cups /lib/systemd/system/cups.service /etc/rc5.d/S81cups
> > /etc/rc5.d/K36cups /etc/rc0.d/K36cups /etc/rc2.d/K36cups
> > /etc/rc3.d/S81cups /etc/rc3.d/K36cups /lib/systemd/system/cups.socket
> > /lib/systemd/system/cups.path /etc/init.d/cups" added
> > "/lib/systemd/system/org.cups.cupsd.socket
> > /lib/systemd/system/org.cups.cupsd.service
> > /lib/systemd/system/org.cups.cups-lpd@.service
> > /lib/systemd/system/org.cups.cupsd.path
> > /lib/systemd/system/org.cups.cups-lpd.socket"
> > 
> > Looks like if systemd is enabled it removes the sysvinit files, but we
> > still need those installed if sysvinit is in DISTRO_FEATURES.
> 
> I just had a look at the recipe, and it seems it removes those files on
> its own even without my patch. I guess fixing that makes sense in a
> separate patch then?

My latest bitbake world build shows new QA issue:

cups-2.0.4: cups: Files/directories were installed but not shipped in
any package:
  /lib/systemd/system/org.cups.cupsd.path
  /lib/systemd/system/org.cups.cupsd.service
  /lib/systemd/system/org.cups.cupsd.socket
  /lib/systemd/system/org.cups.cups-lpd@.service
  /lib/systemd/system/org.cups.cups-lpd.socket
Please set FILES such that these items are packaged. Alternatively if
they are unneeded, avoid installing them or delete them within
do_install.

I'm not sure if it's caused by this change, but it would be good to fix
it.

> 
> -- 
> Cheers,
>   Andrew
> 



> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core


-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [PATCH v2] cups: update systemd support

[Andrew Shadura]

[-- Attachment #1: Type: text/plain, Size: 1980 bytes --]

On 08/01/16 16:34, Martin Jansa wrote:
> On Wed, Dec 30, 2015 at 11:53:04AM +0100, Andrew Shadura wrote:
>> > On 11/12/15 22:39, Burton, Ross wrote:
>>> > > Sorry for the delay in looking at this.  buildhistory-diff reports this:
>>> > > 
>>> > > packages/corei7-64-poky-linux/cups/cups: FILELIST: removed
>>> > > "/etc/rc2.d/S81cups /lib/systemd/system/cups.service /etc/rc5.d/S81cups
>>> > > /etc/rc5.d/K36cups /etc/rc0.d/K36cups /etc/rc2.d/K36cups
>>> > > /etc/rc3.d/S81cups /etc/rc3.d/K36cups /lib/systemd/system/cups.socket
>>> > > /lib/systemd/system/cups.path /etc/init.d/cups" added
>>> > > "/lib/systemd/system/org.cups.cupsd.socket
>>> > > /lib/systemd/system/org.cups.cupsd.service
>>> > > /lib/systemd/system/org.cups.cups-lpd@.service
>>> > > /lib/systemd/system/org.cups.cupsd.path
>>> > > /lib/systemd/system/org.cups.cups-lpd.socket"
>>> > > 
>>> > > Looks like if systemd is enabled it removes the sysvinit files, but we
>>> > > still need those installed if sysvinit is in DISTRO_FEATURES.
>> > 
>> > I just had a look at the recipe, and it seems it removes those files on
>> > its own even without my patch. I guess fixing that makes sense in a
>> > separate patch then?
> My latest bitbake world build shows new QA issue:
> 
> cups-2.0.4: cups: Files/directories were installed but not shipped in
> any package:
>   /lib/systemd/system/org.cups.cupsd.path
>   /lib/systemd/system/org.cups.cupsd.service
>   /lib/systemd/system/org.cups.cupsd.socket
>   /lib/systemd/system/org.cups.cups-lpd@.service
>   /lib/systemd/system/org.cups.cups-lpd.socket
> Please set FILES such that these items are packaged. Alternatively if
> they are unneeded, avoid installing them or delete them within
> do_install.
> 
> I'm not sure if it's caused by this change, but it would be good to fix
> it.

Hmm, the whole point of my change is precisely fixing this issue, are
you sure you have applied my patch?


-- 
Cheers,
  Andrew


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH v2] cups: update systemd support

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 271 bytes --]

On 8 January 2016 at 15:37, Andrew Shadura <andrew.shadura@collabora.co.uk>
wrote:

> Hmm, the whole point of my change is precisely fixing this issue, are
> you sure you have applied my patch?
>

Merged to my local staging branch, sorry it took so long!

Ross

[-- Attachment #2: Type: text/html, Size: 669 bytes --]