svn commit: r324556 - in head/sys/boot: common efi/boot1 i386/gptboot libsa powerpc/boot1.chrp sparc64/boot1

[Warner Losh]

Author: imp
Date: Thu Oct 12 14:57:05 2017
New Revision: 324556
URL: https://svnweb.freebsd.org/changeset/base/324556

Log:
  Move ufsread.c
  
  Move ufsread.c from sys/boot/common (which used to be all the common
  files for /boot/loader, but grew to be all the common files for
  sys/boot, but that's now sys/boot/libsa's job) to sys/boot/libsa.
  
  Sponsored by: Netflix

Added:
  head/sys/boot/libsa/ufsread.c   (contents, props changed)
     - copied, changed from r324555, head/sys/boot/common/ufsread.c
Deleted:
  head/sys/boot/common/ufsread.c
Modified:
  head/sys/boot/efi/boot1/Makefile
  head/sys/boot/i386/gptboot/Makefile
  head/sys/boot/powerpc/boot1.chrp/Makefile
  head/sys/boot/sparc64/boot1/Makefile

Modified: head/sys/boot/efi/boot1/Makefile
==============================================================================
--- head/sys/boot/efi/boot1/Makefile	Thu Oct 12 14:57:00 2017	(r324555)
+++ head/sys/boot/efi/boot1/Makefile	Thu Oct 12 14:57:05 2017	(r324556)
@@ -2,7 +2,7 @@
 
 MAN=
 
-.include <src.opts.mk>
+.include "../Makefile.inc"
 
 MK_SSP=		no
 
@@ -120,7 +120,7 @@ boot1.efi: ${PROG}
 		-j .rela.dyn -j .reloc -j .eh_frame \
 		--output-target=${EFI_TARGET} ${.ALLSRC} ${.TARGET}
 
-boot1.o: ${.CURDIR}/../../common/ufsread.c
+boot1.o: ${SASRC}/ufsread.c
 
 # The following inserts our objects into a template FAT file system
 # created by generate-fat.sh

Modified: head/sys/boot/i386/gptboot/Makefile
==============================================================================
--- head/sys/boot/i386/gptboot/Makefile	Thu Oct 12 14:57:00 2017	(r324555)
+++ head/sys/boot/i386/gptboot/Makefile	Thu Oct 12 14:57:05 2017	(r324556)
@@ -78,7 +78,7 @@ gptboot.bin: gptboot.out
 gptboot.out: ${BTXCRT} gptboot.o sio.o crc32.o drv.o cons.o util.o ${OPENCRYPTO_XTS}
 	${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBGELIBOOT} ${LIBSA32}
 
-gptboot.o: ${.CURDIR}/../../common/ufsread.c
+gptboot.o: ${SASRC}/ufsread.c
 
 .if ${MACHINE_CPUARCH} == "amd64"
 beforedepend gptboot.o: machine

Copied and modified: head/sys/boot/libsa/ufsread.c (from r324555, head/sys/boot/common/ufsread.c)
==============================================================================

Modified: head/sys/boot/powerpc/boot1.chrp/Makefile
==============================================================================
--- head/sys/boot/powerpc/boot1.chrp/Makefile	Thu Oct 12 14:57:00 2017	(r324555)
+++ head/sys/boot/powerpc/boot1.chrp/Makefile	Thu Oct 12 14:57:05 2017	(r324556)
@@ -17,7 +17,8 @@ CFLAGS= -ffreestanding -msoft-float \
 	-D_STANDALONE
 LDFLAGS=-nostdlib -static -Wl,-N
 
-.include "${.CURDIR}/../Makefile.inc"
+.include "../Makefile.inc"
+
 .PATH:  ${.CURDIR}/../../../libkern ${.CURDIR}/../../../../lib/libc/powerpc/gen ${.CURDIR}
 
 # The following inserts out objects into a template HFS 
@@ -36,7 +37,7 @@ boot1.hfs: boot1.elf bootinfo.txt
 
 CLEANFILES= boot1.hfs
 
-boot1.o: ${.CURDIR}/../../common/ufsread.c
+boot1.o: ${SASRC}/ufsread.c
 
 .include <bsd.prog.mk>
 

Modified: head/sys/boot/sparc64/boot1/Makefile
==============================================================================
--- head/sys/boot/sparc64/boot1/Makefile	Thu Oct 12 14:57:00 2017	(r324555)
+++ head/sys/boot/sparc64/boot1/Makefile	Thu Oct 12 14:57:05 2017	(r324556)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include "../Makefile.inc"
+
 PROG=	boot1.elf
 INTERNALPROG=
 MAN=
@@ -25,6 +27,6 @@ ${FILES}: boot1.aout
 boot1.aout: boot1.elf
 	elf2aout -o ${.TARGET} ${.ALLSRC}
 
-boot1.o: ${.CURDIR}/../../common/ufsread.c
+boot1.o: ${SASRC}/ufsread.c
 
 .include <bsd.prog.mk>