From patchwork Tue Dec 13 16:19:48 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [4/9] consolekit: fix sdk generation issues Date: Tue, 13 Dec 2011 16:19:48 -0000 From: lumag X-Patchwork-Id: 16829 Message-Id: <1323793193-31090-4-git-send-email-dbaryshkov@gmail.com> To: openembedded-core@lists.openembedded.org Currently sdk generation might fail with the following error: | Collected errors: | * extract_archive: Cannot create symlink from ./var/log to 'volatile/log': File exists. ERROR: Function 'do_populate_sdk' failed This happens as consolekit package will include both /var/log/ConsoleKit and /var/volatile/log/ConsoleKit files: lumag@fangorn:~/OE-scripts$ dpkg-deb -c build/tmp--eglibc/deploy/ipk/core2/consolekit_0.4.5-r7_core2.ipk | grep var drwxr-xr-x root/root 0 2011-12-07 22:12 ./var/ drwxr-xr-x root/root 0 2011-12-07 22:12 ./var/log/ drwxr-xr-x root/root 0 2011-12-07 22:12 ./var/log/ConsoleKit/ lrwxrwxrwx root/root 0 2011-12-07 22:12 ./var/run -> volatile/run drwxr-xr-x root/root 0 2011-12-07 22:12 ./var/volatile/ drwxr-xr-x root/root 0 2011-12-07 22:12 ./var/volatile/log/ drwxr-xr-x root/root 0 2011-12-07 22:12 ./var/volatile/log/ConsoleKit/ drwxr-xr-x root/root 0 2011-12-07 22:12 ./var/volatile/run/ drwxr-xr-x root/root 0 2011-12-07 22:12 ./var/volatile/run/ConsoleKit/ Inclusion of both log directories causes this error. Drop the /var/log/ConsoleKit in favour of /var/volatile/log Signed-off-by: Dmitry Eremin-Solenikov --- .../recipes-support/consolekit/consolekit_0.4.5.bb | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/consolekit/consolekit_0.4.5.bb b/meta/recipes-support/consolekit/consolekit_0.4.5.bb index 45f6ad3..9406d88 100644 --- a/meta/recipes-support/consolekit/consolekit_0.4.5.bb +++ b/meta/recipes-support/consolekit/consolekit_0.4.5.bb @@ -2,7 +2,7 @@ DESCRIPTION = "ConsoleKit is a framework for defining and tracking users, login HOMEPAGE="http://www.freedesktop.org/wiki/Software/ConsoleKit" BUGTRACKER="https://bugs.freedesktop.org/buglist.cgi?query_format=specific&product=ConsoleKit" -PR = "r7" +PR = "r8" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ @@ -24,7 +24,7 @@ EXTRA_OECONF = "--with-systemdsystemunitdir=${base_libdir}/systemd/system/ \ ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam-module --with-pam-module-dir=${base_libdir}/security', '--disable-pam-module', d)} \ " -FILES_${PN} += "${localstatedir}/log/ConsoleKit ${libdir}/ConsoleKit ${base_libdir} ${datadir}/dbus-1 ${datadir}/PolicyKit ${datadir}/polkit*" +FILES_${PN} += "${libdir}/ConsoleKit ${base_libdir} ${datadir}/dbus-1 ${datadir}/PolicyKit ${datadir}/polkit*" FILES_${PN}-dbg += "${base_libdir}/security/.debug" PACKAGES =+ "pam-plugin-ck-connector"