1
0
mirror of https://git.yoctoproject.org/poky synced 2026-06-03 01:40:07 +00:00

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>
This commit is contained in:
Mark Hatle
2010-09-03 12:43:41 -05:00
committed by Saul Wold
parent a9b715736f
commit c849ec75e7
5 changed files with 102 additions and 50 deletions
+1 -1
View File
@@ -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:
+2 -2
View File
@@ -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"
+1 -1
View File
@@ -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