diff options
author | Jackie Huang <jackie.huang@windriver.com> | 2017-05-17 11:20:53 +0800 |
---|---|---|
committer | Joe MacDonald <joe_macdonald@mentor.com> | 2017-06-28 10:24:41 -0400 |
commit | 8f7f3eb7f6b1ec358708cc108e56749fe8b45f1b (patch) | |
tree | 6ae2609bc03990f96922e889bc749aafd5dca21a /meta-networking/recipes-support/drbd | |
parent | 07df35147d9d223f9ab8778527b16bd481192f72 (diff) | |
download | meta-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/recipes-support/drbd')
-rw-r--r-- | meta-networking/recipes-support/drbd/drbd-utils_8.9.6.bb | 5 |
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 67ed8e5c0..5f6c43f7e 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 = " \ | |||
30 | --without-manual\ | 30 | --without-manual\ |
31 | " | 31 | " |
32 | 32 | ||
33 | do_install_append() { | ||
34 | # don't install empty /var/lock to avoid conflict with base-files | ||
35 | rm -rf ${D}${localstatedir}/lock | ||
36 | } | ||
37 | |||
33 | RDEPENDS_${PN} += "bash perl-module-getopt-long perl-module-exporter perl-module-constant perl-module-overloading perl-module-exporter-heavy" | 38 | RDEPENDS_${PN} += "bash perl-module-getopt-long perl-module-exporter perl-module-constant perl-module-overloading perl-module-exporter-heavy" |
34 | 39 | ||
35 | # The drbd items are explicitly put under /lib when installed. | 40 | # The drbd items are explicitly put under /lib when installed. |