From 1acda3f94cb4a2bcb6fba7c1a5707786bd6c724b Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Sat, 9 Jan 2016 00:31:24 +0000
Subject: MFC r293173, r293231:  r293173:   Fix path to include .OBJDIR to
 avoid polluting the source   tree during 'make release'.

 r293231:
  Add a new target to touch the ${.OBJDIR}/release file, which
  indicates the 'release' target has run (in order to prevent
  subsequent invocations that may clobber original build output).

Sponsored by:	The FreeBSD Foundation
---
 release/Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'release')

diff --git a/release/Makefile b/release/Makefile
index 976f651..a29d84c 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -318,7 +318,11 @@ ftp: packagesystem
 	cp *.txz MANIFEST ftp
 
 release:	real-release vm-release cloudware-release
-	touch ${.TARGET}
+	${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} release-done
+	true
+
+release-done:
+	touch release
 
 real-release:
 	${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} obj
-- 
cgit v1.1


From 5d3275e0a0985a086d790dfa9e3d01edadeefaeb Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Tue, 12 Jan 2016 02:12:40 +0000
Subject: MFC r293188:  Prevent memstick installation medium from attempting to
 mount  the root filesystem read-write.  This causes problems booting  the
 memstick installation medium from write-protected USB flash  drives.

PR:		187161, 205886
Sponsored by:	The FreeBSD Foundation
---
 release/amd64/make-memstick.sh      | 2 ++
 release/amd64/make-uefi-memstick.sh | 2 ++
 release/i386/make-memstick.sh       | 2 ++
 release/powerpc/make-memstick.sh    | 2 ++
 4 files changed, 8 insertions(+)

(limited to 'release')

diff --git a/release/amd64/make-memstick.sh b/release/amd64/make-memstick.sh
index e10b892..2dd8372 100755
--- a/release/amd64/make-memstick.sh
+++ b/release/amd64/make-memstick.sh
@@ -29,12 +29,14 @@ if [ -e ${2} ]; then
 fi
 
 echo '/dev/ufs/FreeBSD_Install / ufs ro,noatime 1 1' > ${1}/etc/fstab
+echo 'root_rw_mount="NO"' > ${1}/etc/rc.conf.local
 makefs -B little -o label=FreeBSD_Install ${2} ${1}
 if [ $? -ne 0 ]; then
 	echo "makefs failed"
 	exit 1
 fi
 rm ${1}/etc/fstab
+rm ${1}/etc/rc.conf.local
 
 unit=$(mdconfig -a -t vnode -f ${2})
 if [ $? -ne 0 ]; then
diff --git a/release/amd64/make-uefi-memstick.sh b/release/amd64/make-uefi-memstick.sh
index 6c289e0..52e17cc 100755
--- a/release/amd64/make-uefi-memstick.sh
+++ b/release/amd64/make-uefi-memstick.sh
@@ -29,12 +29,14 @@ if [ -e ${2} ]; then
 fi
 
 echo '/dev/ufs/FreeBSD_Install / ufs ro,noatime 1 1' > ${1}/etc/fstab
+echo 'root_rw_mount="NO"' > ${1}/etc/rc.conf.local
 makefs -B little -o label=FreeBSD_Install ${2}.part ${1}
 if [ $? -ne 0 ]; then
 	echo "makefs failed"
 	exit 1
 fi
 rm ${1}/etc/fstab
+rm ${1}/etc/rc.conf.local
 
 mkimg -s gpt -b ${1}/boot/pmbr -p efi:=${1}/boot/boot1.efifat -p freebsd-boot:=${1}/boot/gptboot -p freebsd-ufs:=${2}.part -p freebsd-swap::1M -o ${2}
 rm ${2}.part
diff --git a/release/i386/make-memstick.sh b/release/i386/make-memstick.sh
index 27979ae7..f824382 100755
--- a/release/i386/make-memstick.sh
+++ b/release/i386/make-memstick.sh
@@ -29,12 +29,14 @@ if [ -e ${2} ]; then
 fi
 
 echo '/dev/ufs/FreeBSD_Install / ufs ro,noatime 1 1' > ${1}/etc/fstab
+echo 'root_rw_mount="NO"' > ${1}/etc/rc.conf.local
 makefs -B little -o label=FreeBSD_Install ${2}.part ${1}
 if [ $? -ne 0 ]; then
 	echo "makefs failed"
 	exit 1
 fi
 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 -o ${2}
 rm ${2}.part
diff --git a/release/powerpc/make-memstick.sh b/release/powerpc/make-memstick.sh
index 4f6b69d..3c1cfa4 100755
--- a/release/powerpc/make-memstick.sh
+++ b/release/powerpc/make-memstick.sh
@@ -33,6 +33,7 @@ if [ -e ${2} ]; then
 fi
 
 echo '/dev/da0s3 / ufs ro,noatime 1 1' > ${1}/etc/fstab
+echo 'root_rw_mount="NO"' > ${1}/etc/rc.conf.local
 rm -f ${tempfile}
 makefs -B big ${tempfile} ${1}
 if [ $? -ne 0 ]; then
@@ -40,6 +41,7 @@ if [ $? -ne 0 ]; then
   exit 1
 fi
 rm ${1}/etc/fstab
+rm ${1}/etc/rc.conf.local
 
 mkimg -s apm -p freebsd-boot:=${1}/boot/boot1.hfs -p freebsd-ufs/FreeBSD_Install:=${tempfile} -o ${2}
 
-- 
cgit v1.1