summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-09-24 17:04:55 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-25 10:41:27 +0100
commit4d7fb79eef4dd81dfd7890cbfd168a6d4c6f4dc1 (patch)
treec174fe43a207d7b9d0f8eec557a8b47043e47c0d
parentf32785ae0656aa2f541824e902d49292c6ebab9d (diff)
downloadpoky-4d7fb79eef4dd81dfd7890cbfd168a6d4c6f4dc1.tar.gz
poky-4d7fb79eef4dd81dfd7890cbfd168a6d4c6f4dc1.tar.bz2
poky-4d7fb79eef4dd81dfd7890cbfd168a6d4c6f4dc1.zip
rpm: Add base-files as RDEPENDS
This solves a problem when installing rpm using the ipk pkg-management system where /var/cache was conflicting with the existing /var/cache from base-files. (From OE-Core rev: 917f57cbb0906996661eebc6656c2c083ef979e9) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.9.bb4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
index 3b005704e7..54354457b6 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.9.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
@@ -43,7 +43,7 @@ LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
DEPENDS = "libpcre attr acl popt ossp-uuid file bison-native"
-PR = "r47"
+PR = "r48"
# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed
# in order to extract the distribution SRPM into a format we can extract...
@@ -294,6 +294,8 @@ FILES_${PN}-build = "${prefix}/src/rpm \
${libdir}/rpm/vpkg-provides2.sh \
${libdir}/rpm/perfile_rpmdeps.sh \
"
+RDEPENDS_${PN} = "base-files"
+RDEPENDS_${PN}_class-native = ""
RDEPENDS_${PN}-build = "file"
FILES_python-rpm-dbg = "${libdir}/python*/rpm/.debug/_*"