From: Ross Burton <ross.burton@intel.com>
Date: Fri, 5 Aug 2016 16:09:34 +0000 (+0100)
Subject: consolekit: don't ship /var/log/ConsoleKit
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~24741
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2991efb6f4894061ee99b62cef4024be51dcdbf;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

consolekit: don't ship /var/log/ConsoleKit

This directory is created on demand, and won't be visible if /var/log is a
tmpfs, so don't bother shipping it.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/meta/recipes-support/consolekit/consolekit_0.4.6.bb b/meta/recipes-support/consolekit/consolekit_0.4.6.bb
index 2974e3664a8..ceac0fe31a3 100644
--- a/meta/recipes-support/consolekit/consolekit_0.4.6.bb
+++ b/meta/recipes-support/consolekit/consolekit_0.4.6.bb
@@ -30,7 +30,7 @@ PACKAGECONFIG[pam] = "--enable-pam-module --with-pam-module-dir=${base_libdir}/s
 PACKAGECONFIG[policykit] = "--with-polkit,--without-polkit,polkit"
 PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--with-systemdsystemunitdir="
 
-FILES_${PN} += "${localstatedir}/log/ConsoleKit ${exec_prefix}/lib/ConsoleKit \
+FILES_${PN} += "${exec_prefix}/lib/ConsoleKit \
                 ${libdir}/ConsoleKit  ${systemd_unitdir} ${base_libdir} \
                 ${datadir}/dbus-1 ${datadir}/PolicyKit ${datadir}/polkit*"
 
@@ -45,6 +45,6 @@ do_install_append() {
 			> ${D}${sysconfdir}/tmpfiles.d/consolekit.conf
 	fi
 
-	# Remove /var/run from package as console-kit-daemon will populate it on startup
-	rm -fr "${D}${localstatedir}/run"
+	# Remove /var/ directories as the daemon creates them as required
+	rm -rf ${D}${localstatedir}
 }