Openembedded Devel Discussions
 help / color / mirror / Atom feed
From: <kai.kang@windriver.com>
To: <openembedded-devel@lists.openembedded.org>
Subject: [meta-networking][PATCH 2/2] drbd-utils: fix file conflict with base-files
Date: Wed, 17 Apr 2019 02:13:12 -0400	[thread overview]
Message-ID: <20190417061312.120376-2-kai.kang@windriver.com> (raw)
In-Reply-To: <20190417061312.120376-1-kai.kang@windriver.com>

From: Kai Kang <kai.kang@windriver.com>

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@windriver.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 a781e2791..70e04b943 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"
-- 
2.20.0



      reply	other threads:[~2019-04-17  6:13 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-17  6:13 [meta-networking][PATCH 1/2] drbd: fix compile errors kai.kang
2019-04-17  6:13 ` kai.kang [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190417061312.120376-2-kai.kang@windriver.com \
    --to=kai.kang@windriver.com \
    --cc=openembedded-devel@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox