rpm: Fix autoconf/libtool usage

In order to resolve a host-contamination problem, we re-work the way that
autoconf and friends are invoked during the compilation of RPM.

This has a side effect of fixing another bug where RPM was being renamed
HOST_ARCH-HOST_OS-rpm.  So we remove the "fixes" for that behavior as well.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>

3 files changed, 4 insertions, 4 deletions

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index f0a8748023..4951220cba 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -558,7 +558,7 @@ if [ x"$D" = "x" ]; then
 fi
 }
 
-RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/${BUILD_ARCH}-${BUILD_OS}-rpmdeps"
+RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/rpmdeps"
 
 # Collect perfile run-time dependency metadata
 # Output:
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 3967ae294e..b70575cea0 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -2,8 +2,8 @@ inherit package
 
 IMAGE_PKGTYPE ?= "rpm"
 
-RPM="${BUILD_ARCH}-${BUILD_OS}-rpm"
-RPMBUILD="${BUILD_ARCH}-${BUILD_OS}-rpmbuild"
+RPM="rpm"
+RPMBUILD="rpmbuild"
 
 PKGWRITEDIRRPM = "${WORKDIR}/deploy-rpms"
 
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index 09afa58103..55c851c463 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -26,7 +26,7 @@ rpmlibdir = "/var/lib/rpm"
 opkglibdir = "${localstatedir}/lib/opkg"
 
 RPMOPTS="--dbpath ${rpmlibdir} --define='_openall_before_chroot 1'"
-RPM="${BUILD_ARCH}-${BUILD_OS}-rpm ${RPMOPTS}"
+RPM="rpm ${RPMOPTS}"
 
 fakeroot rootfs_rpm_do_rootfs () {
         set +x