diff options
author | Kris Kennaway <kris@FreeBSD.org> | 2002-09-15 21:55:08 +0000 |
---|---|---|
committer | Kris Kennaway <kris@FreeBSD.org> | 2002-09-15 21:55:08 +0000 |
commit | 17048bd5046bacd36eb68c959dfd353527c0a7c5 (patch) | |
tree | e2d63bf5ba1f5c9471dd11877df1e94db4d957da /Tools | |
parent | Some GNU (and GNU-style) programs assume that the presence of the (diff) |
* Support multiple arches and conditionalize i386-only stuff
* Fetch perl package on -current
Notes
Notes:
svn path=/head/; revision=66382
Diffstat (limited to 'Tools')
-rwxr-xr-x | Tools/portbuild/scripts/mkbindist | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/Tools/portbuild/scripts/mkbindist b/Tools/portbuild/scripts/mkbindist index 48c49b14651d..716bf4af6b67 100755 --- a/Tools/portbuild/scripts/mkbindist +++ b/Tools/portbuild/scripts/mkbindist @@ -38,7 +38,7 @@ if [ "${ftp}" != 0 ]; then mkdir -p bindist/ftp cd bindist/ftp for i in ${ftpdists}; do - /usr/bin/ftp -a "ftp://${ftpserver}/pub/FreeBSD/snapshots/i386/${rel}/$i.??" + /usr/bin/ftp -a "ftp://${ftpserver}/pub/FreeBSD/snapshots/${arch}/${rel}/$i.??" done cd ${here} fi @@ -69,6 +69,13 @@ rm -rf $(cat ${here}/bindist/delete) mkdir -p $(cat ${here}/bindist/dirlist) (cd ${here}/bindist/files; find -dx . | cpio -dump ${tmpdir}) +# Prepare needed packages +mkdir ${tmpdir}/packages +if [ "$branch" = 5 ]; then + cd ${tmpdir}/packages + fetch ftp://${ftpsite}/pub/FreeBSD/ports/${arch}/packages-5-current/Latest/perl.tbz +fi + # Post-processing of installed world date '+%Y%m%d' > var/db/port.mkversion @@ -79,7 +86,9 @@ rm -f /usr/lib/aout/lib*_p.a mkdir ${tmpdir}/var/run chroot ${tmpdir} /sbin/ldconfig /usr/lib -chroot ${tmpdir} /sbin/ldconfig -aout /usr/lib/aout +if [ "${arch}" = "i386" ]; then + chroot ${tmpdir} /sbin/ldconfig -aout /usr/lib/aout +fi #sed -e "s/%%KERNEL%%/${kernel}/g" ${here}/dokernel > ${tmpdir}/dokernel # XXX Rebuild kernel for some reason. No idea why, and @@ -113,6 +122,7 @@ fi # Create the tarballs mkdir -p ${here}/tarballs +cd ${tmpdir} tar cf ${here}/tarballs/bindist.tar.new . mv -f ${here}/tarballs/bindist.tar.new ${here}/tarballs/bindist.tar |