mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-18 19:49:40 +00:00
Don't bother mounting doc tree, it's not needed by any ports
Use LOCALBASE/X11BASE values from buildenv xorg uses the stock BSD.x11-4.dist now.
This commit is contained in:
parent
560f97f20b
commit
f708dd4383
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=154130
@ -82,7 +82,6 @@ cleanup()
|
||||
fi
|
||||
|
||||
cleanup_mount ${chroot} /a/ports
|
||||
cleanup_mount ${chroot} /usr/opt/doc
|
||||
cleanup_mount ${chroot} /usr/src
|
||||
cleanup_mount ${chroot} /dev
|
||||
test -d ${chroot}/root/.ccache && cleanup_mount ${chroot} /root/.ccache
|
||||
@ -199,13 +198,13 @@ ulimit -f 614400
|
||||
ulimit -t 3600
|
||||
|
||||
# directories to clean
|
||||
cleandirs="/usr/local /usr/X11R6 /compat /var/db/pkg"
|
||||
cleandirs="${LOCALBASE} ${X11BASE} /compat /var/db/pkg"
|
||||
|
||||
# 15 minutes
|
||||
export FTP_TIMEOUT=900
|
||||
export HTTP_TIMEOUT=900
|
||||
|
||||
export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin
|
||||
export PATH=/sbin:/bin:/usr/sbin:/usr/bin:${LOCALBASE}/sbin:${LOCALBASE}/bin:${X11BASE}/bin
|
||||
|
||||
echo "building $pkgname in $chroot"
|
||||
|
||||
@ -281,10 +280,9 @@ fi
|
||||
mount_fs ${pb}/${arch}/${branch}/ports ${chroot}/a/ports ${master}
|
||||
ln -sf ../a/ports ${chroot}/usr/ports
|
||||
|
||||
mkdir -p ${chroot}/usr/src ${chroot}/usr/opt/doc
|
||||
mkdir -p ${chroot}/usr/src
|
||||
|
||||
mount_fs ${pb}/${arch}/${branch}/src ${chroot}/usr/src ${master}
|
||||
mount_fs ${pb}/${arch}/${branch}/doc ${chroot}/usr/opt/doc ${master}
|
||||
|
||||
mount -t devfs foo ${chroot}/dev
|
||||
|
||||
@ -306,18 +304,16 @@ mtree -deU -f ${chroot}/usr/src/etc/mtree/BSD.var.dist -p ${chroot}/var \
|
||||
>/dev/null 2>&1
|
||||
mtree -deU -f ${chroot}/usr/src/etc/mtree/BSD.usr.dist -p ${chroot}/usr \
|
||||
>/dev/null 2>&1
|
||||
mtree -deU -f ${chroot}/usr/src/etc/mtree/BSD.local.dist -p ${chroot}/usr/local \
|
||||
mkdir -p ${chroot}${LOCALBASE}
|
||||
mtree -deU -f ${chroot}/usr/src/etc/mtree/BSD.local.dist -p ${chroot}${LOCALBASE} \
|
||||
>/dev/null 2>&1
|
||||
|
||||
mkdir ${chroot}/usr/X11R6
|
||||
mkdir -p ${chroot}${X11BASE}
|
||||
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
|
||||
elif [ $X_WINDOW_SYSTEM = "xorg" ]; then
|
||||
mtree -deU -f ${chroot}/a/ports/x11-servers/xorg-server/files/BSD.x11-xorg.dist -p ${chroot}/usr/X11R6 \
|
||||
mtree -deU -f ${chroot}/usr/src/etc/mtree/BSD.x11.dist -p ${chroot}${X11BASE} \
|
||||
>/dev/null 2>&1
|
||||
else
|
||||
mtree -deU -f ${chroot}/usr/src/etc/mtree/BSD.x11-4.dist -p ${chroot}/usr/X11R6 \
|
||||
mtree -deU -f ${chroot}/usr/src/etc/mtree/BSD.x11-4.dist -p ${chroot}${X11BASE} \
|
||||
>/dev/null 2>&1
|
||||
fi
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user