D1780.id3648.diff
No OneTemporary
Actions

Size

738 B

Referenced Files

None

Subscribers

None

D1780.id3648.diff
View Options

	Index: tools/tools/makeroot/makeroot.sh
	===================================================================
	--- tools/tools/makeroot/makeroot.sh
	+++ tools/tools/makeroot/makeroot.sh
	@@ -165,13 +165,15 @@
	awk '
	!/ type=/ { file = $1 }
	/ type=/ { if ($1 == file) {print} }' >> ${manifest}
	-else
	+elif [ -n "${EXTRAS}" ]; then
	# Start with all the files in BSDROOT/METALOG except those in
	# one of the EXTRAS manifests.
	grep -h type=file ${EXTRAS} \| cut -d' ' -f1 \| \
	sort -u ${BSDROOT}/METALOG - \| awk '
	!/ type=/ { file = $1 }
	/ type=/ { if ($1 != file) {print} }' >> ${manifest}
	+else
	+ sort -u ${BSDROOT}/METALOG >> ${manifest}
	fi

	# For each extras file, add contents keys relative to the directory the