svn commit: r294533 - projects/release-pkg

[Glen Barber]

Author: gjb
Date: Thu Jan 21 21:42:06 2016
New Revision: 294533
URL: https://svnweb.freebsd.org/changeset/base/294533

Log:
  Ensure pkg(8) is bootstrapped, and avoid prompting for confirmation
  to install, in case the 'packages' target is run non-interactively.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-pkg/Makefile.inc1

Modified: projects/release-pkg/Makefile.inc1
==============================================================================
--- projects/release-pkg/Makefile.inc1	Thu Jan 21 21:16:57 2016	(r294532)
+++ projects/release-pkg/Makefile.inc1	Thu Jan 21 21:42:06 2016	(r294533)
@@ -1384,7 +1384,7 @@ create-world-packages:
 			/^name/ { printf("===> Creating %s-", $$2); next } \
 			/^version/ { print $$2; next } \
 			' ${DESTDIR}/$${pkgname}.ucl ; \
-		pkg -o ABI_FILE=${DESTDIR}/bin/sh \
+		env ASSUME_ALWAYS_YES="YES" pkg -o ABI_FILE=${DESTDIR}/bin/sh \
 			create -M ${DESTDIR}/$${pkgname}.ucl \
 			-p ${DESTDIR}/$${pkgname}.plist \
 			-r ${DESTDIR} -o ${DESTDIR} ; \
@@ -1415,7 +1415,7 @@ create-kernel-packages:
 		${DESTDIR}/${DISTDIR}/${flavor}-manifestdir/+MANIFEST
 	@awk -F\" '/name/ { printf("===> Creating %s-", $$2) } /version/ {print $$2 }' \
 		${DESTDIR}/${DISTDIR}/${flavor}-manifestdir/+MANIFEST
-	@pkg create -m ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir \
+	@env ASSUME_ALWAYS_YES="YES" pkg create -m ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir \
 		-p ${DESTDIR}/${DISTDIR}/${flavor}.plist \
 		-r ${DESTDIR}/${DISTDIR}/kernel \
 		-o ${DESTDIR}
@@ -1438,7 +1438,7 @@ create-kernel-packages:
 		${DESTDIR}/${DISTDIR}/${flavor}-manifestdir/+MANIFEST
 	@awk -F\" '/name/ { printf("===> Creating %s-", $$2) } /version/ {print $$2 }' \
 		${DESTDIR}/${DISTDIR}/${flavor}-manifestdir/+MANIFEST
-	@pkg create -m ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir \
+	@env ASSUME_ALWAYS_YES="YES" pkg create -m ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir \
 		-p ${DESTDIR}/${DISTDIR}/${flavor}.plist \
 		-r ${DESTDIR}/${DISTDIR}/kernel.${_kernel} \
 		-o ${DESTDIR}