Merge remote-tracking branch 'origin/stable/10' into devel

2 files changed, 63 insertions, 1 deletions

diff --git a/release/doc/share/xml/errata.xml b/release/doc/share/xml/errata.xml
index f5c93bc..a1453e9 100644
--- a/release/doc/share/xml/errata.xml
+++ b/release/doc/share/xml/errata.xml
@@ -48,6 +48,62 @@
 	<entry><para>Fix &man.freebsd-update.8; support of
 	    &os;&nbsp;11.0-RELEASE</para></entry>
       </row>
+
+      <row>
+	<entry><link
+	    xlink:href="&security.url;/FreeBSD-EN-16:10.dhclient.asc">FreeBSD-EN-16:10.dhclient</link></entry>
+	<entry>11&nbsp;August&nbsp;2016</entry>
+	<entry><para>Better handle unknown options received from
+	    aDHCP server</para></entry>
+      </row>
+
+      <row>
+	<entry><link
+	    xlink:href="&security.url;/FreeBSD-EN-16:11.vmbus.asc">FreeBSD-EN-16:11.vmbus</link></entry>
+	<entry>11&nbsp;August&nbsp;2016</entry>
+	<entry><para>Avoid using spin locks for channel message
+	    locks</para></entry>
+      </row>
+
+      <row>
+	<entry><link
+	    xlink:href="&security.url;/FreeBSD-EN-16:12.hv_storvsc.asc">FreeBSD-EN-16:12.hv_storvsc</link></entry>
+	<entry>11&nbsp;August&nbsp;2016</entry>
+	<entry><para>Enable INQUIRY result check only on
+	    Windows&nbsp;10 host systems</para></entry>
+      </row>
+
+      <row>
+	<entry><link
+	    xlink:href="&security.url;/FreeBSD-EN-16:13.vmbus.asc">FreeBSD-EN-16:13.vmbus</link></entry>
+	<entry>11&nbsp;August&nbsp;2016</entry>
+	<entry><para>Register time counter early enough for TSC freq
+	    calibration</para></entry>
+      </row>
+
+      <row>
+	<entry><link
+	    xlink:href="&security.url;/FreeBSD-EN-16:14.hv_storvsc.asc">FreeBSD-EN-16:14.hv_storvsc</link></entry>
+	<entry>11&nbsp;August&nbsp;2016</entry>
+	<entry><para>Disable incorrect callout in
+	    &man.hv.storvsc.4;</para></entry>
+      </row>
+
+      <row>
+	<entry><link
+	    xlink:href="&security.url;/FreeBSD-EN-16:15.vmbus.asc">FreeBSD-EN-16:15.vmbus</link></entry>
+	<entry>11&nbsp;August&nbsp;2016</entry>
+	<entry><para>Better handle the GPADL setup failure in
+	    Hyper-V</para></entry>
+      </row>
+
+      <row>
+	<entry><link
+	    xlink:href="&security.url;/FreeBSD-EN-16:16.hv_storvsc.asc">FreeBSD-EN-16:16.hv_storvsc</link></entry>
+	<entry>11&nbsp;August&nbsp;2016</entry>
+	<entry><para>Fix SCSI INQUIRY checks and error
+	    handling</para></entry>
+      </row>
     </tbody>
   </tgroup>
 </informaltable>
diff --git a/release/release.sh b/release/release.sh
index caa6f26..6dc4a28 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -281,9 +281,15 @@ extra_chroot_setup() {
 	fi
 
 	if [ ! -z "${EMBEDDEDPORTS}" ]; then
+		_OSVERSION=$(chroot ${CHROOTDIR} /usr/bin/uname -U)
+		REVISION=$(chroot ${CHROOTDIR} make -C /usr/src/release -V REVISION)
+		BRANCH=$(chroot ${CHROOTDIR} make -C /usr/src/release -V BRANCH)
+		PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes"
+		PBUILD_FLAGS="${PBUILD_FLAGS} UNAME_r=${UNAME_r}"
+		PBUILD_FLAGS="${PBUILD_FLAGS} OSREL=${REVISION}"
 		for _PORT in ${EMBEDDEDPORTS}; do
 			eval chroot ${CHROOTDIR} make -C /usr/ports/${_PORT} \
-				BATCH=1 FORCE_PKG_REGISTER=1 install clean distclean
+				FORCE_PKG_REGISTER=1 ${PBUILD_FLAGS} install clean distclean
 		done
 	fi