summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2020-04-15 12:47:20 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-04-24 14:10:08 +0100
commitf8c41e8e03a8e816d05421c5e9f76a38312e58f4 (patch)
treeeeeeefc8552ffc4658d8ff7271be3752cccab91a
parent13cad0f5c41b8abf11d2cfc383e3b9b5ca2721f4 (diff)
downloadpoky-f8c41e8e03a8e816d05421c5e9f76a38312e58f4.tar.gz
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. (From OE-Core rev: 315689f58536dec4042ef9880c227a69e71e749d) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/cups/cups.inc12
-rw-r--r--meta/recipes-extended/cups/cups/cups-volatiles.conf1
-rw-r--r--meta/recipes-extended/cups/cups/volatiles.99_cups2
3 files changed, 14 insertions, 1 deletions
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc
index c5a60bde12..e389d8a2da 100644
--- 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
12 file://0001-use-echo-only-in-init.patch \ 12 file://0001-use-echo-only-in-init.patch \
13 file://0002-don-t-try-to-run-generated-binaries.patch \ 13 file://0002-don-t-try-to-run-generated-binaries.patch \
14 file://0003-cups_1.4.6.bb-Fix-build-on-ppc64.patch \ 14 file://0003-cups_1.4.6.bb-Fix-build-on-ppc64.patch \
15 file://0004-cups-fix-multilib-install-file-conflicts.patch\ 15 file://0004-cups-fix-multilib-install-file-conflicts.patch \
16 file://volatiles.99_cups \
17 file://cups-volatiles.conf \
16 " 18 "
17 19
18UPSTREAM_CHECK_URI = "https://github.com/apple/cups/releases" 20UPSTREAM_CHECK_URI = "https://github.com/apple/cups/releases"
@@ -67,6 +69,7 @@ do_install () {
67 69
68 # Remove /var/run from package as cupsd will populate it on startup 70 # Remove /var/run from package as cupsd will populate it on startup
69 rm -fr ${D}/${localstatedir}/run 71 rm -fr ${D}/${localstatedir}/run
72 rm -fr ${D}/${localstatedir}/log
70 rmdir ${D}/${libexecdir}/${BPN}/driver 73 rmdir ${D}/${libexecdir}/${BPN}/driver
71 74
72 # Fix the pam configuration file permissions 75 # Fix the pam configuration file permissions
@@ -78,6 +81,13 @@ do_install () {
78 if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','false','true',d)}; then 81 if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','false','true',d)}; then
79 rm -rf ${D}${sysconfdir}/init.d/ 82 rm -rf ${D}${sysconfdir}/init.d/
80 rm -rf ${D}${sysconfdir}/rc* 83 rm -rf ${D}${sysconfdir}/rc*
84 install -d ${D}${sysconfdir}/tmpfiles.d
85 install -m 0644 ${WORKDIR}/cups-volatiles.conf \
86 ${D}${sysconfdir}/tmpfiles.d/cups.conf
87 else
88 install -d ${D}${sysconfdir}/default/volatiles
89 install -m 0644 ${WORKDIR}/volatiles.99_cups \
90 ${D}${sysconfdir}/default/volatiles/99_cups
81 fi 91 fi
82} 92}
83 93
diff --git a/meta/recipes-extended/cups/cups/cups-volatiles.conf b/meta/recipes-extended/cups/cups/cups-volatiles.conf
new file mode 100644
index 0000000000..0ede78e1c8
--- /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
index 0000000000..cc0e19e4c8
--- /dev/null
+++ b/meta/recipes-extended/cups/cups/volatiles.99_cups
@@ -0,0 +1,2 @@
1# <type> <owner> <group> <mode> <path> <linksource>
2d root root 0755 /var/log/cups none