From a8da2d92538f78cb50aa5b5370bc79a37c8dddf8 Mon Sep 17 00:00:00 2001
From: Kris Kennaway <kris@FreeBSD.org>
Date: Tue, 28 Dec 2004 04:30:11 +0000
Subject: /rescue/mount_linprocfs isn't functional when called by /rescue/mount
 -t linprocfs, so assume that the i386 build hosts have statically-built
 copies of the necessary binaries in /sbin, until this is fixed.

Create /usr/X11R6 inside the chroot so that mtree has something to do, since
this directory is otherwise orphaned.
---
 Tools/portbuild/scripts/portbuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Tools')

diff --git a/Tools/portbuild/scripts/portbuild b/Tools/portbuild/scripts/portbuild
index 31ae8f7840e1..05825f612627 100755
--- a/Tools/portbuild/scripts/portbuild
+++ b/Tools/portbuild/scripts/portbuild
@@ -194,7 +194,7 @@ if [ -f ${chroot}/.notready ]; then
     mkdir -p ${chroot}/libexec
     mkdir -p ${chroot}/lib
     if [ "${arch}" = "i386" ]; then
-      cp -p /rescue/mount_linprocfs /rescue/mount /rescue/umount ${chroot}/sbin
+      cp -p /sbin/mount_linprocfs /sbin/mount /sbin/umount ${chroot}/sbin
       cp -p /lib/libufs.so.2 ${chroot}/lib
     fi
     cp -p /libexec/ld-elf.so.1 ${chroot}/libexec
@@ -267,6 +267,7 @@ mtree -deU -f ${chroot}/usr/src/etc/mtree/BSD.usr.dist -p ${chroot}/usr \
 mtree -deU -f ${chroot}/usr/src/etc/mtree/BSD.local.dist -p ${chroot}/usr/local \
   >/dev/null 2>&1
 
+mkdir ${chroot}/usr/X11R6
 if [ $X_WINDOW_SYSTEM = "xfree86-3" ]; then
   mtree -deU -f ${chroot}/usr/src/etc/mtree/BSD.x11.dist -p ${chroot}/usr/X11R6 \
     >/dev/null 2>&1
-- 
cgit v1.2.3