[PATCH 0/1] cups: upgrade to 2.1.2

[PATCH 0/1] cups: upgrade to 2.1.2

[Chen Qi]

The following changes since commit 541315d6c56df6448f64c262f99d43d5c1e9400b:

  update_font_cache: only scan system font directories (2016-01-11 23:23:18 +0000)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib ChenQi/cups-2.1.2
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/cups-2.1.2

Chen Qi (1):
  cups: upgrade to 2.1.2

 meta/recipes-extended/cups/cups.inc                    | 18 ++++++++++++------
 .../cups/{cups_2.0.4.bb => cups_2.1.2.bb}              |  4 ++--
 2 files changed, 14 insertions(+), 8 deletions(-)
 rename meta/recipes-extended/cups/{cups_2.0.4.bb => cups_2.1.2.bb} (40%)

-- 
1.9.1

[PATCH 1/1] cups: upgrade to 2.1.2

[Chen Qi]

Add PACKAGECONFIG for systemd. And install our own systemd unit files.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/recipes-extended/cups/cups.inc                    | 18 ++++++++++++------
 .../cups/{cups_2.0.4.bb => cups_2.1.2.bb}              |  4 ++--
 2 files changed, 14 insertions(+), 8 deletions(-)
 rename meta/recipes-extended/cups/{cups_2.0.4.bb => cups_2.1.2.bb} (40%)

diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc
index 5aa365d..c013205 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -27,7 +27,9 @@ 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', 'pam', 'pam', '', d)}"
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
+PACKAGECONFIG[systemd] = "--enable-systemd --with-systemd=${systemd_unitdir}/system/,--disable-systemd,systemd"
 PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi"
 PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl"
 PACKAGECONFIG[pam] = "--enable-pam, --disable-pam, libpam"
@@ -80,11 +82,15 @@ do_install () {
 	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
+	if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+	    # Use our own unit files
+	    [ -d ${D}${systemd_unitdir}/system ] && rm -rf ${D}${systemd_unitdir}/system
+	    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
+	fi
 }
 
 python do_package_append() {
diff --git a/meta/recipes-extended/cups/cups_2.0.4.bb b/meta/recipes-extended/cups/cups_2.1.2.bb
similarity index 40%
rename from meta/recipes-extended/cups/cups_2.0.4.bb
rename to meta/recipes-extended/cups/cups_2.1.2.bb
index bad73b3..0c1e75d 100644
--- a/meta/recipes-extended/cups/cups_2.0.4.bb
+++ b/meta/recipes-extended/cups/cups_2.1.2.bb
@@ -2,5 +2,5 @@ require cups.inc
 
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=6c5a350596fba02754bd96eb6df3afd0"
 
-SRC_URI[md5sum] = "f5c847d9a4fac6c4c66fb0526a7afaae"
-SRC_URI[sha256sum] = "e1d5e68d9f24faca317aeaebc164c34102813bc0f1d69c00b3a59b49c49f4abd"
+SRC_URI[md5sum] = "b3ba0ca676d56857bbd9b182ef4b14b3"
+SRC_URI[sha256sum] = "bab0ca3ba80eae48319b3a6b19a5b14fad5ce230f30151a0cfa4c0271df281ad"
-- 
1.9.1

Re: [PATCH 1/1] cups: upgrade to 2.1.2

[Burton, Ross]

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

On 13 January 2016 at 03:23, Chen Qi <Qi.Chen@windriver.com> wrote:

> Add PACKAGECONFIG for systemd. And install our own systemd unit files.
>

Why would we want to use our own units over the upstream units?

Ross

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

Re: [PATCH 1/1] cups: upgrade to 2.1.2

[ChenQi]

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

On 01/18/2016 10:44 PM, Burton, Ross wrote:
>
> On 13 January 2016 at 03:23, Chen Qi <Qi.Chen@windriver.com 
> <mailto:Qi.Chen@windriver.com>> wrote:
>
>     Add PACKAGECONFIG for systemd. And install our own systemd unit files.
>
>
> Why would we want to use our own units over the upstream units?
>
> Ross

Hi Ross,

Sorry for the late reply.

Our unit files are the same with the Fedora's.
And the unit files that cups it self provides have strange names like 
org.cups.cupsd.socket and org.cups.cupsd.service.
And contents are something like below.

chenqi@pek-hostel-deb01:~/poky/build-systemd/tmp/work/core2-64-poky-linux/cups/2.1.2-r0/cups-2.1.2/scheduler 
[1] $ cat org.cups.cupsd.service
[Unit]
Description=CUPS Scheduler
Documentation=man:cupsd(8)

[Service]
ExecStart=/usr/sbin/cupsd -l
Type=simple

[Install]
Also=org.cups.cupsd.socket org.cups.cupsd.path
WantedBy=printer.target

So if we use unit files that cups provides, we either change both the 
file names and the contents, or we use these strange names.

Best Regards,
Chen Qi

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