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

7 files changed, 33 insertions, 7 deletions

diff --git a/release/Makefile.gce b/release/Makefile.gce
index 34c1e919..fa1f16b 100644
--- a/release/Makefile.gce
+++ b/release/Makefile.gce
@@ -17,6 +17,7 @@ GCE_UPLOAD_TGTS=	gce-do-login
 CLEANFILES+=		${GCE_UPLOAD_TGTS}
 
 GCE_BUCKET?=
+GCE_LICENSE?=
 
 .if !defined(GCE_FAMILY) || empty(GCE_FAMILY)
 GCE_FAMILY=		${TYPE:tl}-${REVISION:S,.,-,}
@@ -69,7 +70,7 @@ gce-do-upload:
 	/usr/local/bin/gsutil cp ${.OBJDIR}/${GCE_TARGET}.tar.gz \
 		gs://${GCE_BUCKET}/
 	/usr/local/bin/gcloud compute images create ${GCE_TARGET} \
-		--family=${GCE_FAMILY}${GCE_FAMILY_SUFX} \
+		--family=${GCE_FAMILY}${GCE_FAMILY_SUFX} ${GCE_LICENSE} \
 		--source-uri gs://${GCE_BUCKET}/${GCE_TARGET}.tar.gz
 	touch ${.OBJDIR}/${.TARGET}
 
diff --git a/release/arm/BANANAPI.conf b/release/arm/BANANAPI.conf
index fbde45e..2af9961 100644
--- a/release/arm/BANANAPI.conf
+++ b/release/arm/BANANAPI.conf
@@ -30,6 +30,8 @@ arm_install_uboot() {
 	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
 	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \
 		${FATMOUNT}/ubldr.bin
+	chroot ${CHROOTDIR} ln ${UFSMOUNT}/boot/dtb/bananapi.dtb \
+		${UFSMOUNT}/boot/dtb/sun7i-a20-bananapi.dtb
 	chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
 	sync
 	umount_loop ${CHROOTDIR}/${FATMOUNT}
diff --git a/release/doc/en_US.ISO8859-1/errata/article.xml b/release/doc/en_US.ISO8859-1/errata/article.xml
index 2a9ff68..2a20c14 100644
--- a/release/doc/en_US.ISO8859-1/errata/article.xml
+++ b/release/doc/en_US.ISO8859-1/errata/article.xml
@@ -23,7 +23,7 @@
     <pubdate>$FreeBSD$</pubdate>
 
     <copyright>
-      <year>2017</year>
+      <year>2018</year>
 
       <holder role="mailto:doc@FreeBSD.org">The &os; Documentation
 	Project</holder>
diff --git a/release/doc/share/xml/errata.xml b/release/doc/share/xml/errata.xml
index 40ed187..7936c47 100644
--- a/release/doc/share/xml/errata.xml
+++ b/release/doc/share/xml/errata.xml
@@ -72,6 +72,22 @@
 	<entry><para>Multiple small kernel memory
 	    disclosures</para></entry>
       </row>
+
+      <row>
+	<entry><link
+	    xlink:href="&security.url;/FreeBSD-EN-18:05.mem.asc">FreeBSD-EN-18:05.mem</link></entry>
+	<entry>08&nbsp;May&nbsp;2018</entry>
+	<entry><para>Multiple small kernel memory
+	    disclosures</para></entry>
+      </row>
+
+      <row>
+	<entry><link
+	    xlink:href="&security.url;/FreeBSD-EN-18:06.tzdata.asc">FreeBSD-EN-18:06.tzdata</link></entry>
+	<entry>08&nbsp;May&nbsp;2018</entry>
+	<entry><para>Update timezone database
+	    information</para></entry>
+      </row>
     </tbody>
   </tgroup>
 </informaltable>
diff --git a/release/doc/share/xml/security.xml b/release/doc/share/xml/security.xml
index 9d24d8d..bc90a06 100644
--- a/release/doc/share/xml/security.xml
+++ b/release/doc/share/xml/security.xml
@@ -106,6 +106,14 @@
 	<entry>04&nbsp;April&nbsp;2018</entry>
 	<entry><para>Fix denial of service</para></entry>
       </row>
+
+      <row>
+	<entry><link
+	    xlink:href="&security.url;/FreeBSD-SA-18:06.debugreg.asc">FreeBSD-SA-18:06.debugreg</link></entry>
+	<entry>08&nbsp;May&nbsp;2018</entry>
+	<entry><para>Mishandling of x86 debug
+	    exceptions</para></entry>
+      </row>
     </tbody>
   </tgroup>
 </informaltable>
diff --git a/release/i386/make-memstick.sh b/release/i386/make-memstick.sh
index 6aa1b50..6774e86 100755
--- a/release/i386/make-memstick.sh
+++ b/release/i386/make-memstick.sh
@@ -36,11 +36,9 @@ makefs -B little -o label=FreeBSD_Install -o version=2 ${2}.part ${1}
 rm ${1}/etc/fstab
 rm ${1}/etc/rc.conf.local
 
-mkimg -s gpt \
-    -b ${1}/boot/pmbr \
-    -p freebsd-boot:=${1}/boot/gptboot \
-    -p freebsd-ufs:=${2}.part \
-    -p freebsd-swap::1M \
+mkimg -s mbr \
+    -b ${1}/boot/mbr \
+    -p freebsd:-"mkimg -s bsd -b ${1}/boot/boot -p freebsd-ufs:=${2}.part" \
     -o ${2}
 rm ${2}.part
 
diff --git a/release/tools/arm.subr b/release/tools/arm.subr
index c5adbaf..4bf2f06 100644
--- a/release/tools/arm.subr
+++ b/release/tools/arm.subr
@@ -122,6 +122,7 @@ arm_install_base() {
 	echo 'sendmail_outbound_enable="NO"' >> ${CHROOTDIR}/${DESTDIR}/etc/rc.conf
 	echo 'sendmail_msp_queue_enable="NO"' >> ${CHROOTDIR}/${DESTDIR}/etc/rc.conf
 	echo 'growfs_enable="YES"' >> ${CHROOTDIR}/${DESTDIR}/etc/rc.conf
+	echo 'kldxref_enable="YES"' >> ${CHROOTDIR}/${DESTDIR}/etc/rc.conf
 
 	sync
 	umount_loop ${CHROOTDIR}/${DESTDIR}