Check-in [c120d812e3]

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

Overview
Comment:build_port: Fail the build if unable to read distfiles
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: c120d812e3b1f97b8f08fcb3224af55aeb75bf0d
User & Date: bdrewery 2013-05-30 00:57:41
Context
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
2013-05-29
18:38
ports -c: Allow -m svn+file to work check-in: fecfe5a0d8 user: bdrewery tags: trunk
Changes

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

1113
1114
1115
1116
1117
1118
1119
1120

1121
1122
1123
1124
1125
1126
1127
....
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
	sub=$(injail make -C ${portdir} -VDIST_SUBDIR)
	dists=$(injail make -C ${portdir} -V_DISTFILES -V_PATCHFILES)
	specials=$(injail make -C ${portdir} -V_DEPEND_SPECIALS)
	job_msg_verbose "Providing distfiles for ${portdir}"
	for d in ${dists}; do
		[ -f ${DISTFILES_CACHE}/${sub}/${d} ] || continue
		echo ${DISTFILES_CACHE}/${sub}/${d}
	done | pax -rw -p p -s ",${DISTFILES_CACHE},,g" ${mnt}/portdistfiles


	for special in ${specials}; do
		gather_distfiles ${special} ${distfiles}
	done

	return 0
}
................................................................................
			jstart 0
		fi
		print_phase_footer

		if [ "${phase}" = "checksum" ]; then
			mkdir -p ${mnt}/portdistfiles
			echo "DISTDIR=/portdistfiles" >> ${mnt}/etc/make.conf
			gather_distfiles ${portdir} ${mnt}/portdistfiles
		fi

		if [ "${phase}" = "deinstall" ]; then
			msg "Checking for extra files and directories"
			PREFIX=$(injail env ${PORT_FLAGS} make -C ${portdir} -VPREFIX)
			bset ${MY_JOBID} status "leftovers:${port}"
			local add=$(mktemp ${mnt}/tmp/add.XXXXXX)







|
>







 







|







1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
....
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
	sub=$(injail make -C ${portdir} -VDIST_SUBDIR)
	dists=$(injail make -C ${portdir} -V_DISTFILES -V_PATCHFILES)
	specials=$(injail make -C ${portdir} -V_DEPEND_SPECIALS)
	job_msg_verbose "Providing distfiles for ${portdir}"
	for d in ${dists}; do
		[ -f ${DISTFILES_CACHE}/${sub}/${d} ] || continue
		echo ${DISTFILES_CACHE}/${sub}/${d}
	done | pax -rw -p p -s ",${DISTFILES_CACHE},,g" ${mnt}/portdistfiles ||
		return 1

	for special in ${specials}; do
		gather_distfiles ${special} ${distfiles}
	done

	return 0
}
................................................................................
			jstart 0
		fi
		print_phase_footer

		if [ "${phase}" = "checksum" ]; then
			mkdir -p ${mnt}/portdistfiles
			echo "DISTDIR=/portdistfiles" >> ${mnt}/etc/make.conf
			gather_distfiles ${portdir} ${mnt}/portdistfiles || return 1
		fi

		if [ "${phase}" = "deinstall" ]; then
			msg "Checking for extra files and directories"
			PREFIX=$(injail env ${PORT_FLAGS} make -C ${portdir} -VPREFIX)
			bset ${MY_JOBID} status "leftovers:${port}"
			local add=$(mktemp ${mnt}/tmp/add.XXXXXX)