[oe-commits] [meta-openembedded] 06/18: drbd-utils: fix file conflict with base-files

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit 5494c6a5c8a6f7426aa7fb21bad15643b95fa200
Author: Kai Kang <kai.kang at windriver.com>
AuthorDate: Wed Apr 17 02:13:12 2019 -0400

    drbd-utils: fix file conflict with base-files
    
    drbd-utils installs directory /var/run but is a link file installed by
    package base-files. Remove /var/run to fix the file conflict issue.
    
    Signed-off-by: Kai Kang <kai.kang at windriver.com>
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 meta-networking/recipes-support/drbd/drbd-utils_9.8.0.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-networking/recipes-support/drbd/drbd-utils_9.8.0.bb b/meta-networking/recipes-support/drbd/drbd-utils_9.8.0.bb
index a781e27..70e04b9 100644
--- a/meta-networking/recipes-support/drbd/drbd-utils_9.8.0.bb
+++ b/meta-networking/recipes-support/drbd/drbd-utils_9.8.0.bb
@@ -47,8 +47,9 @@ do_configure_prepend() {
 
 }
 do_install_append() {
-    # don't install empty /var/lock to avoid conflict with base-files
+    # don't install empty /var/lock and /var/run to avoid conflict with base-files
     rm -rf ${D}${localstatedir}/lock
+    rm -rf ${D}${localstatedir}/run
 }
 
 RDEPENDS_${PN} += "bash perl-module-getopt-long perl-module-exporter perl-module-constant perl-module-overloading perl-module-exporter-heavy"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.