diff options
author | Saul Wold <sgw@linux.intel.com> | 2012-09-24 17:04:55 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-25 10:41:27 +0100 |
commit | 4d7fb79eef4dd81dfd7890cbfd168a6d4c6f4dc1 (patch) | |
tree | c174fe43a207d7b9d0f8eec557a8b47043e47c0d /meta | |
parent | f32785ae0656aa2f541824e902d49292c6ebab9d (diff) | |
download | poky-4d7fb79eef4dd81dfd7890cbfd168a6d4c6f4dc1.tar.gz |
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>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.4.9.bb | 4 |
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" | |||
43 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" | 43 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" |
44 | 44 | ||
45 | DEPENDS = "libpcre attr acl popt ossp-uuid file bison-native" | 45 | DEPENDS = "libpcre attr acl popt ossp-uuid file bison-native" |
46 | PR = "r47" | 46 | PR = "r48" |
47 | 47 | ||
48 | # rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed | 48 | # rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed |
49 | # in order to extract the distribution SRPM into a format we can extract... | 49 | # in order to extract the distribution SRPM into a format we can extract... |
@@ -294,6 +294,8 @@ FILES_${PN}-build = "${prefix}/src/rpm \ | |||
294 | ${libdir}/rpm/vpkg-provides2.sh \ | 294 | ${libdir}/rpm/vpkg-provides2.sh \ |
295 | ${libdir}/rpm/perfile_rpmdeps.sh \ | 295 | ${libdir}/rpm/perfile_rpmdeps.sh \ |
296 | " | 296 | " |
297 | RDEPENDS_${PN} = "base-files" | ||
298 | RDEPENDS_${PN}_class-native = "" | ||
297 | RDEPENDS_${PN}-build = "file" | 299 | RDEPENDS_${PN}-build = "file" |
298 | 300 | ||
299 | FILES_python-rpm-dbg = "${libdir}/python*/rpm/.debug/_*" | 301 | FILES_python-rpm-dbg = "${libdir}/python*/rpm/.debug/_*" |