helium-3rd-party/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky synced 2026-08-14 21:19:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Yi Zhao 2020-04-15 12:47:20 +08:00 committed by Richard Purdie
parent 13cad0f5c4
commit f8c41e8e03
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
meta/recipes-extended/cups/cups.inc
View File

@ -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
}

1
meta/recipes-extended/cups/cups/cups-volatiles.conf Normal file
View File

@ -0,0 +1 @@
d /var/log/cups 0755 root root -

2
meta/recipes-extended/cups/cups/volatiles.99_cups Normal file
View File

@ -0,0 +1,2 @@
# <type> <owner> <group> <mode> <path> <linksource>
d root root 0755 /var/log/cups none