]> code.ossystems Code Review - openembedded-core.git/commitdiff
consolekit: don't ship /var/log/ConsoleKit
authorRoss Burton <ross.burton@intel.com>
Fri, 5 Aug 2016 16:09:34 +0000 (17:09 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 10 Aug 2016 09:45:13 +0000 (10:45 +0100)
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>
meta/recipes-support/consolekit/consolekit_0.4.6.bb

index 2974e3664a81f3c6836d5aaeeb2697d16c1255e3..ceac0fe31a3049f8c81562b2f190bee3f3ff9db1 100644 (file)
@@ -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}
 }