D4833.id12053.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D4833.id12053.diff
View Options

	Index: head/sys/boot/efi/boot1/Makefile
	===================================================================
	--- head/sys/boot/efi/boot1/Makefile
	+++ head/sys/boot/efi/boot1/Makefile
	@@ -79,8 +79,15 @@
	# created by generate-fat.sh

	.include "${.CURDIR}/Makefile.fat"
	+BOOT1_MAXSIZE?= 131072

	boot1.efifat: boot1.efi
	+ @set -- `ls -l boot1.efi`; \
	+ x=$$(($$5-${BOOT1_MAXSIZE})); \
	+ if [ $$x -ge 0 ]; then \
	+ echo "boot1 $$x bytes too large; regenerate FAT templates?" >&2 ;\
	+ exit 1; \
	+ fi
	echo ${.OBJDIR}
	uudecode ${.CURDIR}/fat-${MACHINE}.tmpl.bz2.uu
	mv fat-${MACHINE}.tmpl.bz2 ${.TARGET}.bz2
	Index: head/sys/boot/efi/boot1/generate-fat.sh
	===================================================================
	--- head/sys/boot/efi/boot1/generate-fat.sh
	+++ head/sys/boot/efi/boot1/generate-fat.sh
	@@ -55,9 +55,20 @@
	# Convert to number of blocks
	BOOT1_OFFSET=$(echo 0x$BOOT1_OFFSET \| awk '{printf("%x\n",$1/512);}')

	+# Record maximum boot1 size in bytes
	+case $BOOT1_SIZE in
	+*k)
	+ BOOT1_MAXSIZE=$(expr ${BOOT1_SIZE%k} '*' 1024)
	+ ;;
	+*)
	+ BOOT1_MAXSIZE=$BOOT1_SIZE
	+ ;;
	+esac
	+
	echo '# This file autogenerated by generate-fat.sh - DO NOT EDIT' > Makefile.fat
	echo '# $FreeBSD$' >> Makefile.fat
	echo "BOOT1_OFFSET=0x$BOOT1_OFFSET" >> Makefile.fat
	+echo "BOOT1_MAXSIZE=$BOOT1_MAXSIZE" >> Makefile.fat

	bzip2 $OUTPUT_FILE
	echo 'FAT template boot filesystem created by generate-fat.sh' > $OUTPUT_FILE.bz2.uu