svn commit: r351831 - in head: . stand/efi/boot1 stand/efi/gptboot tools/build/mk

[Rebecca Cran]

Author: bcran
Date: Wed Sep  4 20:55:48 2019
New Revision: 351831
URL: https://svnweb.freebsd.org/changeset/base/351831

Log:
  The efifat files are no longer used: remove the code to build them
  
  Reviewed by:	imp, tsoome, emaste
  Differential Revision:	https://reviews.freebsd.org/D20562

Deleted:
  head/stand/efi/boot1/Makefile.fat
  head/stand/efi/boot1/fat-amd64.tmpl.xz
  head/stand/efi/boot1/fat-arm.tmpl.xz
  head/stand/efi/boot1/fat-arm64.tmpl.xz
  head/stand/efi/boot1/fat-i386.tmpl.xz
  head/stand/efi/boot1/generate-fat.sh
Modified:
  head/ObsoleteFiles.inc
  head/stand/efi/boot1/Makefile
  head/stand/efi/gptboot/Makefile
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Wed Sep  4 20:28:16 2019	(r351830)
+++ head/ObsoleteFiles.inc	Wed Sep  4 20:55:48 2019	(r351831)
@@ -37,7 +37,9 @@
 #   -V OLD_FILES -V OLD_LIBS -V OLD_DIRS check-old | \
 #   xargs -n1 | sort | uniq -d;
 # done
- 
+
+# 20190904: Remove boot1.efifat
+OLD_FILES+=boot/boot1.efifat
 # 20190903: pc-sysinstall(8) removed
 OLD_FILES+=usr/share/examples/pc-sysinstall/README
 OLD_FILES+=usr/share/examples/pc-sysinstall/pc-autoinstall.conf

Modified: head/stand/efi/boot1/Makefile
==============================================================================
--- head/stand/efi/boot1/Makefile	Wed Sep  4 20:28:16 2019	(r351830)
+++ head/stand/efi/boot1/Makefile	Wed Sep  4 20:55:48 2019	(r351831)
@@ -62,9 +62,6 @@ CFLAGS+=	-I${LDRSRC}
 
 FILES=	${BOOT1}.efi
 FILESMODE_${BOOT1}.efi=	${BINMODE}
-.ifndef(NOFAT)
-FILES+= ${BOOT1}.efifat
-.endif
 
 LDSCRIPT=	${EFISRC}/loader/arch/${MACHINE}/ldscript.${MACHINE}
 LDFLAGS+=	-Wl,-T${LDSCRIPT},-Bsymbolic,-znotext -shared
@@ -99,25 +96,5 @@ ${BOOT1}.efi: ${PROG}
 		-j .dynamic -j .dynsym -j .rel.dyn \
 		-j .rela.dyn -j .reloc -j .eh_frame \
 		--output-target=${EFI_TARGET} ${.ALLSRC} ${.TARGET}
-
-.ifndef(NOFAT)
-# The following inserts our objects into a template FAT file system
-# created by generate-fat.sh
-
-.include "Makefile.fat"
-
-${BOOT1}.efifat: ${BOOT1}.efi
-	@set -- `ls -l ${.ALLSRC}`; \
-	x=$$(($$5-${BOOT1_MAXSIZE})); \
-	if [ $$x -ge 0 ]; then \
-	    echo "boot1 $$x bytes too large; regenerate FAT templates?" >&2 ;\
-	    exit 1; \
-	fi
-	echo ${.OBJDIR}
-	xz -d -c ${BOOTSRC}/efi/boot1/fat-${MACHINE}.tmpl.xz > ${.TARGET}
-	${DD} if=${.ALLSRC} of=${.TARGET} seek=${BOOT1_OFFSET} conv=notrunc
-
-CLEANFILES+= ${BOOT1}.efi ${BOOT1}.efifat
-.endif
 
 .include <bsd.prog.mk>

Modified: head/stand/efi/gptboot/Makefile
==============================================================================
--- head/stand/efi/gptboot/Makefile	Wed Sep  4 20:28:16 2019	(r351830)
+++ head/stand/efi/gptboot/Makefile	Wed Sep  4 20:55:48 2019	(r351831)
@@ -4,7 +4,6 @@
 # we don't want the gptboot.efifat thing created.
 MK_LOADER_ZFS=no
 EFI_DEBUG=yes
-NOFAT=yes
 
 BOOT1?=		gptboot
 .PATH:		${SRCTOP}/stand/efi/boot1 ${SRCTOP}/stand/libsa

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Wed Sep  4 20:28:16 2019	(r351830)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Wed Sep  4 20:55:48 2019	(r351831)
@@ -618,7 +618,6 @@ OLD_FILES+=boot/boot0
 OLD_FILES+=boot/boot0sio
 OLD_FILES+=boot/boot1
 OLD_FILES+=boot/boot1.efi
-OLD_FILES+=boot/boot1.efifat
 OLD_FILES+=boot/boot2
 OLD_FILES+=boot/brand.4th
 OLD_FILES+=boot/cdboot