From 8f7f3eb7f6b1ec358708cc108e56749fe8b45f1b Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Wed, 17 May 2017 11:20:53 +0800 Subject: drbd-utils: remove /var/lock to avoid conflict Remove the empty /var/lock to avoid conflict with base-files: | Error: Transaction check error: file /var/lock conflicts between attempted installs of drbd-utils-8.9.6-r0.core2_64 and base-files-3.0.14-r89.qemux86_64 Signed-off-by: Jackie Huang Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald --- meta-networking/recipes-support/drbd/drbd-utils_8.9.6.bb | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'meta-networking') diff --git a/meta-networking/recipes-support/drbd/drbd-utils_8.9.6.bb b/meta-networking/recipes-support/drbd/drbd-utils_8.9.6.bb index 67ed8e5c06..5f6c43f7ea 100644 --- a/meta-networking/recipes-support/drbd/drbd-utils_8.9.6.bb +++ b/meta-networking/recipes-support/drbd/drbd-utils_8.9.6.bb @@ -30,6 +30,11 @@ EXTRA_OECONF = " \ --without-manual\ " +do_install_append() { + # don't install empty /var/lock to avoid conflict with base-files + rm -rf ${D}${localstatedir}/lock +} + RDEPENDS_${PN} += "bash perl-module-getopt-long perl-module-exporter perl-module-constant perl-module-overloading perl-module-exporter-heavy" # The drbd items are explicitly put under /lib when installed. -- cgit 1.2.3-korg