From e9346a94d12bef37f57e958dfafb7e2a9f1211a8 Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Mon, 11 Sep 2017 14:33:04 +0000 Subject: 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 --- release/amd64/make-memstick.sh | 2 +- release/arm64/make-memstick.sh | 2 +- release/i386/make-memstick.sh | 2 +- release/powerpc/make-memstick.sh | 2 +- sys/boot/efi/boot1/Makefile | 1 - 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/release/amd64/make-memstick.sh b/release/amd64/make-memstick.sh index 64edb733c43d..3a151579abe7 100755 --- a/release/amd64/make-memstick.sh +++ b/release/amd64/make-memstick.sh @@ -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 diff --git a/release/arm64/make-memstick.sh b/release/arm64/make-memstick.sh index 760f362a0d18..8bcbb4677e04 100755 --- a/release/arm64/make-memstick.sh +++ b/release/arm64/make-memstick.sh @@ -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 diff --git a/release/i386/make-memstick.sh b/release/i386/make-memstick.sh index c8f6f13de6cf..1d2ce552427a 100755 --- a/release/i386/make-memstick.sh +++ b/release/i386/make-memstick.sh @@ -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 diff --git a/release/powerpc/make-memstick.sh b/release/powerpc/make-memstick.sh index 92f27a23e194..ae78783cc192 100755 --- a/release/powerpc/make-memstick.sh +++ b/release/powerpc/make-memstick.sh @@ -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 diff --git a/sys/boot/efi/boot1/Makefile b/sys/boot/efi/boot1/Makefile index 598f4275ac77..1d23d9b96721 100644 --- a/sys/boot/efi/boot1/Makefile +++ b/sys/boot/efi/boot1/Makefile @@ -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}`; \ -- cgit v1.2.3