cups: add volatiles files to create /var/log/cups

Add volatiles files to create /var/log/cups directory rather than create
it directly when do_install.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc
index c5a60bde12cc36f5b8acc2863aa74579be37c909..e389d8a2da79532255afa303de11ad111bcfff48 100644 (file)
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -12,7 +12,9 @@ SRC_URI = "https://github.com/apple/cups/releases/download/v${PV}/${BP}-source.t
            file://0001-use-echo-only-in-init.patch \
            file://0002-don-t-try-to-run-generated-binaries.patch \
            file://0003-cups_1.4.6.bb-Fix-build-on-ppc64.patch \
-           file://0004-cups-fix-multilib-install-file-conflicts.patch\
+           file://0004-cups-fix-multilib-install-file-conflicts.patch \
+           file://volatiles.99_cups \
+           file://cups-volatiles.conf \
            "
 
 UPSTREAM_CHECK_URI = "https://github.com/apple/cups/releases"
@@ -67,6 +69,7 @@ do_install () {
 
        # Remove /var/run from package as cupsd will populate it on startup
        rm -fr ${D}/${localstatedir}/run
+       rm -fr ${D}/${localstatedir}/log
        rmdir ${D}/${libexecdir}/${BPN}/driver
 
        # Fix the pam configuration file permissions
@@ -78,6 +81,13 @@ do_install () {
        if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','false','true',d)}; then
            rm -rf ${D}${sysconfdir}/init.d/
            rm -rf ${D}${sysconfdir}/rc*
+           install -d ${D}${sysconfdir}/tmpfiles.d
+           install -m 0644 ${WORKDIR}/cups-volatiles.conf \
+                   ${D}${sysconfdir}/tmpfiles.d/cups.conf
+       else
+           install -d ${D}${sysconfdir}/default/volatiles
+           install -m 0644 ${WORKDIR}/volatiles.99_cups \
+                   ${D}${sysconfdir}/default/volatiles/99_cups
        fi
 }
 

diff --git a/meta/recipes-extended/cups/cups/cups-volatiles.conf b/meta/recipes-extended/cups/cups/cups-volatiles.conf
new file mode 100644 (file)
index 0000000..0ede78e
--- /dev/null
+++ b/meta/recipes-extended/cups/cups/cups-volatiles.conf
@@ -0,0 +1 @@
+d  /var/log/cups 0755 root root -

diff --git a/meta/recipes-extended/cups/cups/volatiles.99_cups b/meta/recipes-extended/cups/cups/volatiles.99_cups
new file mode 100644 (file)
index 0000000..cc0e19e
--- /dev/null
+++ b/meta/recipes-extended/cups/cups/volatiles.99_cups
@@ -0,0 +1,2 @@
+# <type> <owner> <group> <mode> <path> <linksource>
+d root root 0755 /var/log/cups none