aboutsummaryrefslogtreecommitdiffstats
path: root/meta-networking
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2017-05-17 11:20:53 +0800
committerJoe MacDonald <joe_macdonald@mentor.com>2017-06-28 10:24:41 -0400
commit8f7f3eb7f6b1ec358708cc108e56749fe8b45f1b (patch)
tree6ae2609bc03990f96922e889bc749aafd5dca21a /meta-networking
parent07df35147d9d223f9ab8778527b16bd481192f72 (diff)
downloadmeta-openembedded-8f7f3eb7f6b1ec358708cc108e56749fe8b45f1b.tar.gz
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 <jackie.huang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking')
-rw-r--r--meta-networking/recipes-support/drbd/drbd-utils_8.9.6.bb5
1 files changed, 5 insertions, 0 deletions
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.