diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-08-25 19:41:15 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-08-25 19:41:15 +0000 |
| commit | 3beeb0307aaaf083aba55898b36d1b0ce22277e3 (patch) | |
| tree | 9edd8bc5ec668622e06329b06d18b16c3117906c | |
| parent | 50ad5de8b8af13ea2c8b8398239ab76d2d3e3047 (diff) | |
| download | portage-3beeb0307aaaf083aba55898b36d1b0ce22277e3.tar.gz portage-3beeb0307aaaf083aba55898b36d1b0ce22277e3.tar.bz2 portage-3beeb0307aaaf083aba55898b36d1b0ce22277e3.zip | |
Bug #190214 - Make the rpm phase use /usr/src/rpm instead of /usr/src/redhat.
Bug #190144 - Use the realpath of DISTDIR so that things like subversion.eclass are compatible with sandbox.
svn path=/main/trunk/; revision=7700
| -rwxr-xr-x | bin/misc-functions.sh | 12 | ||||
| -rw-r--r-- | pym/portage/__init__.py | 3 |
2 files changed, 11 insertions, 4 deletions
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index 1c79822d2..04c73fc65 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -523,7 +523,9 @@ dyn_package() { } dyn_spec() { - tar czf "/usr/src/redhat/SOURCES/${PF}.tar.gz" "${O}/${PF}.ebuild" "${O}/files" || die "Failed to create base rpm tarball." + tar czf "/usr/src/rpm/SOURCES/${PF}.tar.gz" \ + "${O}/${PF}.ebuild" "${O}/files" || \ + die "Failed to create base rpm tarball." cat <<__END1__ > ${PF}.spec Summary: ${DESCRIPTION} @@ -555,11 +557,13 @@ __END1__ } dyn_rpm() { - addwrite /usr/src/redhat/ - addwrite ${RPMDIR} + addwrite /usr/src/rpm + addwrite "${RPMDIR}" dyn_spec rpmbuild -bb "${PF}.spec" || die "Failed to integrate rpm spec file" - install -D "/usr/src/redhat/RPMS/i386/${PN}-${PV}-${PR}.i386.rpm" "${RPMDIR}/${CATEGORY}/${PN}-${PV}-${PR}.rpm" || die "Failed to move rpm" + install -D "/usr/src/rpm/RPMS/i386/${PN}-${PV}-${PR}.i386.rpm" \ + "${RPMDIR}/${CATEGORY}/${PN}-${PV}-${PR}.rpm" || \ + die "Failed to move rpm" } if [ -n "${MISC_FUNCTIONS_ARGS}" ]; then diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 1f6d49c22..e11b8f419 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -3342,6 +3342,9 @@ def doebuild_environment(myebuild, mydo, myroot, mysettings, debug, use_cache, m mysettings["PF"] = mypv mysettings["PORTDIR"] = os.path.realpath(mysettings["PORTDIR"]) + mysettings["DISTDIR"] = os.path.realpath(mysettings["DISTDIR"]) + mysettings["RPMDIR"] = os.path.realpath(mysettings["RPMDIR"]) + mysettings["ECLASSDIR"] = mysettings["PORTDIR"]+"/eclass" mysettings["SANDBOX_LOG"] = mycpv.replace("/", "_-_") |