diff options
| author | Kai Kang <kai.kang@windriver.com> | 2019-04-17 02:13:12 -0400 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2019-04-18 11:22:32 -0700 |
| commit | 5494c6a5c8a6f7426aa7fb21bad15643b95fa200 (patch) | |
| tree | 2019b77841d9ce4f67ca3db8dcbd33ab7b183e6a /meta-networking | |
| parent | ab8911fd0a8597b6db070099238490879a0f136d (diff) | |
| download | meta-openembedded-5494c6a5c8a6f7426aa7fb21bad15643b95fa200.tar.gz | |
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@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking')
| -rw-r--r-- | meta-networking/recipes-support/drbd/drbd-utils_9.8.0.bb | 3 |
1 files changed, 2 insertions, 1 deletions
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 a781e2791b..70e04b943c 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() { | |||
| 47 | 47 | ||
| 48 | } | 48 | } |
| 49 | do_install_append() { | 49 | do_install_append() { |
| 50 | # don't install empty /var/lock to avoid conflict with base-files | 50 | # don't install empty /var/lock and /var/run to avoid conflict with base-files |
| 51 | rm -rf ${D}${localstatedir}/lock | 51 | rm -rf ${D}${localstatedir}/lock |
| 52 | rm -rf ${D}${localstatedir}/run | ||
| 52 | } | 53 | } |
| 53 | 54 | ||
| 54 | RDEPENDS_${PN} += "bash perl-module-getopt-long perl-module-exporter perl-module-constant perl-module-overloading perl-module-exporter-heavy" | 55 | RDEPENDS_${PN} += "bash perl-module-getopt-long perl-module-exporter perl-module-constant perl-module-overloading perl-module-exporter-heavy" |