diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-07-26 06:36:28 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-07-26 06:36:28 +0000 |
| commit | 12db02c2d286057968a37159da7e6f651a53de6a (patch) | |
| tree | a6829d50dc1b546387cdbbbad60849b08e9cd725 | |
| parent | c74f9cb7d12e1ef8d361106cd430f097f0449e8b (diff) | |
| download | portage-12db02c2d286057968a37159da7e6f651a53de6a.tar.gz portage-12db02c2d286057968a37159da7e6f651a53de6a.tar.bz2 portage-12db02c2d286057968a37159da7e6f651a53de6a.zip | |
Replace hardcoded i386 machine name in dyn_rpm() with the result of `uname -m`.
svn path=/main/trunk/; revision=11195
| -rwxr-xr-x | bin/misc-functions.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index 80dd9d724..b27c81e86 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -661,11 +661,13 @@ __END1__ dyn_rpm() { cd "${T}" || die "cd failed" + local machine_name=$(uname -m) + local dest_dir=/usr/src/rpm/RPMS/${machine_name} addwrite /usr/src/rpm addwrite "${RPMDIR}" dyn_spec rpmbuild -bb --clean --rmsource "${PF}.spec" || die "Failed to integrate rpm spec file" - install -D "/usr/src/rpm/RPMS/i386/${PN}-${PV}-${PR}.i386.rpm" \ + install -D "${dest_dir}/${PN}-${PV}-${PR}.${machine_name}.rpm" \ "${RPMDIR}/${CATEGORY}/${PN}-${PV}-${PR}.rpm" || \ die "Failed to move rpm" } |