Check-in [72609db144]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Allow DISTFILES_CACHE=PORTSDIR/distfiles again This was disallowed due to 2.x mounting the DISTFILES_CACHE at MNT/usr/ports/distfiles which would mount on top of itself in a read-only ports dir. This is not a problem in 3.x since the distfiles are mounted at MNT/distfiles Reported by: mat
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 72609db1440e1fc8837c6a3443649629eb442740
User & Date: bdrewery 2013-05-31 16:38:11
Context
2013-06-01
01:08
make_index: Make jail attachment optional so this can be reused outside of poudriere check-in: 41659b4b96 user: bdrewery tags: trunk
2013-05-31
16:38
Allow DISTFILES_CACHE=PORTSDIR/distfiles again This was disallowed due to 2.x mounting the DISTFILES_CACHE at MNT/usr/ports/distfiles which would mount on top of itself in a read-only ports dir. This is not a problem in 3.x since the distfiles are mounted at MNT/distfiles Reported by: mat check-in: 72609db144 user: bdrewery tags: trunk
2013-05-30
00:57
build_port: Fail the build if unable to read distfiles check-in: c120d812e3 user: bdrewery tags: trunk
Changes

Changes to src/share/poudriere/common.sh.

784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
	local ptname=$3
	local setname=$4
	local portsdir=$(pget ${ptname} mnt)
	local optionsdir

	[ -d ${portsdir}/ports ] && portsdir=${portsdir}/ports

	[ "$(realpath ${DISTFILES_CACHE})" != \
		"$(realpath -q ${portsdir}/distfiles)" ] || err 1 \
		"DISTFILES_CACHE cannot be in the portsdir as the portsdir will be mounted read-only"

	mkdir -p ${POUDRIERE_DATA}/packages/${MASTERNAME}/All
	[ -d "${CCACHE_DIR:-/nonexistent}" ] &&
		mount -t nullfs ${CCACHE_DIR} ${mnt}${HOME}/.ccache
	[ -n "${MFSSIZE}" ] && mdmfs -M -S -o async -s ${MFSSIZE} md ${mnt}/wrkdirs
	[ ${TMPFS_WRKDIR} -eq 1 ] && mount -t tmpfs tmpfs ${mnt}/wrkdirs
	# Only show mounting messages once, not for every builder
	if [ ${mnt##*/} = "ref" ]; then







<
<
<
<







784
785
786
787
788
789
790




791
792
793
794
795
796
797
	local ptname=$3
	local setname=$4
	local portsdir=$(pget ${ptname} mnt)
	local optionsdir

	[ -d ${portsdir}/ports ] && portsdir=${portsdir}/ports





	mkdir -p ${POUDRIERE_DATA}/packages/${MASTERNAME}/All
	[ -d "${CCACHE_DIR:-/nonexistent}" ] &&
		mount -t nullfs ${CCACHE_DIR} ${mnt}${HOME}/.ccache
	[ -n "${MFSSIZE}" ] && mdmfs -M -S -o async -s ${MFSSIZE} md ${mnt}/wrkdirs
	[ ${TMPFS_WRKDIR} -eq 1 ] && mount -t tmpfs tmpfs ${mnt}/wrkdirs
	# Only show mounting messages once, not for every builder
	if [ ${mnt##*/} = "ref" ]; then