Patchwork rpm: Fix FILES_${PN}

login
register
mail settings
Submitter Richard Purdie
Date Oct. 30, 2013, 1:05 p.m.
Message ID <1383138327.25877.23.camel@ted>
Download mbox | patch
Permalink /patch/60759/
State Accepted
Commit 2588a0ff43def50bdd8a2a4f85eb4c8db23ce193
Headers show

Comments

Richard Purdie - Oct. 30, 2013, 1:05 p.m.
In a recent commit, the FILES expression for rpm accidentally moved a
large portion of rpm-build into rpm:

http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=2e557556e03f4e86795cf331ccf06acd4c373045

Since rpm-build requires perl, this caused a number of build failures
when the rpm-build package was attempted to be used since it references
/usr/bin/perl. This commit restores the previous contents of the rpm
package.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

Patch

diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
index 9699639..5498541 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.9.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
@@ -224,7 +224,6 @@  FILES_${PN} =  "${bindir}/rpm \
 		${libdir}/rpm/bin/rpmrepo \
 		${libdir}/rpm/bin/rpmspecdump \
 		${libdir}/rpm/bin/wget \
-		${libdir}/rpm \
 		${localstatedir}/cache \
 		${localstatedir}/cache/rpm \
 		${localstatedir}/cache/wdj \