diff options
author | Kris Kennaway <kris@FreeBSD.org> | 2004-12-05 00:17:18 +0000 |
---|---|---|
committer | Kris Kennaway <kris@FreeBSD.org> | 2004-12-05 00:17:18 +0000 |
commit | f977b82737280e974377130ba9166dca55d2c0a4 (patch) | |
tree | 8876a97b76d721d7951290f737b0eca63dc5df2a /Tools | |
parent | Be silent about attempts to unmount filesystems from within the chroot (diff) |
Copy the statically-linked binaries from /rescue on the host, instead
of needing to also include the dynamic libraries that were confusing
some ports. We still need libc.so.[56] for killall to work, though :(
Notes
Notes:
svn path=/head/; revision=123154
Diffstat (limited to 'Tools')
-rwxr-xr-x | Tools/portbuild/scripts/portbuild | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/Tools/portbuild/scripts/portbuild b/Tools/portbuild/scripts/portbuild index ff86aa2f0628..f3866de4cf7d 100755 --- a/Tools/portbuild/scripts/portbuild +++ b/Tools/portbuild/scripts/portbuild @@ -194,13 +194,20 @@ if [ -f ${chroot}/.notready ]; then mkdir -p ${chroot}/libexec mkdir -p ${chroot}/lib if [ "${arch}" = "i386" ]; then - cp -p /sbin/mount_linprocfs /sbin/mount /sbin/umount ${chroot}/sbin + cp -p /rescue/mount_linprocfs /rescue/mount /rescue/umount ${chroot}/sbin cp -p /lib/libufs.so.2 ${chroot}/lib fi cp -p /libexec/ld-elf.so.1 ${chroot}/libexec - cp -p /lib/libc.so.5 /lib/libkvm.so.2 /lib/libm.so.2 ${chroot}/lib + cp -p /lib/libkvm.so.2 /lib/libm.so.3 ${chroot}/lib + if [ -f /lib/libc.so.6 ]; then + cp -p /lib/libc.so.6 ${chroot}/lib + else + cp -p /lib/libc.so.5 ${chroot}/lib + fi + elif [ "${branch}" = "6" ]; then + cp -p /lib/libc.so.5 ${chroot}/lib fi - cp -p /bin/ps ${chroot}/bin + cp -p /rescue/ps ${chroot}/bin cp -p /usr/bin/killall ${chroot}/usr/bin rm ${chroot}/.notready touch ${chroot}/.ready @@ -271,7 +278,7 @@ fi if [ ${arch} = "i386" ]; then # JDK ports need linprocfs :( mkdir -p ${chroot}/compat/linux/proc - chroot ${chroot} mount -t linprocfs linprocfs /compat/linux/proc + chroot ${chroot} mount_linprocfs linprocfs /compat/linux/proc fi _ldconfig_dirs="/lib /usr/lib /usr/lib/compat" |