svn commit: r323436 - in head: release/amd64 release/arm64 release/i386 release/powerpc sys/boot/efi/boot1

[Ed Maste]

Author: emaste
Date: Mon Sep 11 14:33:04 2017
New Revision: 323436
URL: https://svnweb.freebsd.org/changeset/base/323436

Log:
  boot1: remove BOOT1_MAXSIZE default value
  
  This Makefile relies on Makefile.fat providing the correct value for
  BOOT1_MAXSIZE and BOOT1_OFFSET. Since BOOT1_OFFSET had no default value
  here the build would already fail if Makefile.fat did not provide
  correct values.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/amd64/make-memstick.sh
  head/release/arm64/make-memstick.sh
  head/release/i386/make-memstick.sh
  head/release/powerpc/make-memstick.sh
  head/sys/boot/efi/boot1/Makefile

Modified: head/release/amd64/make-memstick.sh
==============================================================================
--- head/release/amd64/make-memstick.sh	Mon Sep 11 12:15:49 2017	(r323435)
+++ head/release/amd64/make-memstick.sh	Mon Sep 11 14:33:04 2017	(r323436)
@@ -32,7 +32,7 @@ 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}
+makefs -B little -o label=FreeBSD_Install -o version=2 ${2}.part ${1}
 rm ${1}/etc/fstab
 rm ${1}/etc/rc.conf.local
 

Modified: head/release/arm64/make-memstick.sh
==============================================================================
--- head/release/arm64/make-memstick.sh	Mon Sep 11 12:15:49 2017	(r323435)
+++ head/release/arm64/make-memstick.sh	Mon Sep 11 14:33:04 2017	(r323436)
@@ -32,7 +32,7 @@ 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}
+makefs -B little -o label=FreeBSD_Install -o version=2 ${2}.part ${1}
 rm ${1}/etc/fstab
 rm ${1}/etc/rc.conf.local
 

Modified: head/release/i386/make-memstick.sh
==============================================================================
--- head/release/i386/make-memstick.sh	Mon Sep 11 12:15:49 2017	(r323435)
+++ head/release/i386/make-memstick.sh	Mon Sep 11 14:33:04 2017	(r323436)
@@ -32,7 +32,7 @@ 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}
+makefs -B little -o label=FreeBSD_Install -o version=2 ${2}.part ${1}
 rm ${1}/etc/fstab
 rm ${1}/etc/rc.conf.local
 

Modified: head/release/powerpc/make-memstick.sh
==============================================================================
--- head/release/powerpc/make-memstick.sh	Mon Sep 11 12:15:49 2017	(r323435)
+++ head/release/powerpc/make-memstick.sh	Mon Sep 11 14:33:04 2017	(r323436)
@@ -37,7 +37,7 @@ 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}
+makefs -B big -o version=2 ${tempfile} ${1}
 rm ${1}/etc/fstab
 rm ${1}/etc/rc.conf.local
 

Modified: head/sys/boot/efi/boot1/Makefile
==============================================================================
--- head/sys/boot/efi/boot1/Makefile	Mon Sep 11 12:15:49 2017	(r323435)
+++ head/sys/boot/efi/boot1/Makefile	Mon Sep 11 14:33:04 2017	(r323436)
@@ -126,7 +126,6 @@ boot1.o: ${.CURDIR}/../../common/ufsread.c
 # created by generate-fat.sh
 
 .include "${.CURDIR}/Makefile.fat"
-BOOT1_MAXSIZE?=	131072
 
 boot1.efifat: boot1.efi
 	@set -- `ls -l ${.ALLSRC}`; \