[oe-commits] [meta-openembedded] 48/49: drbd-utils: remove /var/lock to avoid conflict
git at git.openembedded.org
git at git.openembedded.org
Wed May 17 17:19:11 UTC 2017
This is an automated email from the git hooks/post-receive script.
martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.
commit 2eeec230609e9a021c336d85f873abce6383ac0e
Author: Jackie Huang <jackie.huang at windriver.com>
AuthorDate: Wed May 17 11:20:53 2017 +0800
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 at windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
meta-networking/recipes-support/drbd/drbd-utils_8.9.6.bb | 5 +++++
1 file changed, 5 insertions(+)
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 67ed8e5..5f6c43f 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.
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list