Date: Sun, 22 Oct 2017 22:50:08 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r324877 - in head/sys/boot: . arm/uboot ficl i386/gptboot i386/gptzfsboot i386/libi386 i386/loader mips/beri/loader mips/uboot powerpc/kboot powerpc/ofw powerpc/ps3 powerpc/uboot sparc6... Message-ID: <201710222250.v9MMo8gJ001598@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Sun Oct 22 22:50:08 2017 New Revision: 324877 URL: https://svnweb.freebsd.org/changeset/base/324877 Log: End source directories with SRC rather than a hodgepodge of names BOOTDIR->BOOTSRC FICLDIR->FICLSRC LDR_MI->LDRSRC This matches the patterns used in the rest of the system a bit vetter. Suggested by: rgrimes@ Sponsored by: Netflix Modified: head/sys/boot/arm/uboot/Makefile head/sys/boot/defs.mk head/sys/boot/ficl.mk head/sys/boot/ficl/Makefile head/sys/boot/i386/gptboot/Makefile head/sys/boot/i386/gptzfsboot/Makefile head/sys/boot/i386/libi386/Makefile head/sys/boot/i386/loader/Makefile head/sys/boot/loader.mk head/sys/boot/mips/beri/loader/Makefile head/sys/boot/mips/uboot/Makefile head/sys/boot/powerpc/kboot/Makefile head/sys/boot/powerpc/ofw/Makefile head/sys/boot/powerpc/ps3/Makefile head/sys/boot/powerpc/uboot/Makefile head/sys/boot/sparc64/loader/Makefile Modified: head/sys/boot/arm/uboot/Makefile ============================================================================== --- head/sys/boot/arm/uboot/Makefile Sun Oct 22 22:49:51 2017 (r324876) +++ head/sys/boot/arm/uboot/Makefile Sun Oct 22 22:50:08 2017 (r324877) @@ -53,7 +53,7 @@ OBJS+= ${SRCS:N*.h:R:S/$/.o/g} loader.help: help.common help.uboot ${.CURDIR}/../../fdt/help.fdt cat ${.ALLSRC} | \ - awk -f ${LDR_MI}/merge_help.awk > ${.TARGET} + awk -f ${LDRSRC}/merge_help.awk > ${.TARGET} ldscript.abs: echo "UBLDR_LOADADDR = ${UBLDR_LOADADDR};" >${.TARGET} Modified: head/sys/boot/defs.mk ============================================================================== --- head/sys/boot/defs.mk Sun Oct 22 22:49:51 2017 (r324876) +++ head/sys/boot/defs.mk Sun Oct 22 22:50:08 2017 (r324877) @@ -5,13 +5,13 @@ .if !defined(__BOOT_DEFS_MK__) __BOOT_DEFS_MK__=${MFILE} -BOOTDIR= ${SRCTOP}/sys/boot -FICLDIR= ${BOOTDIR}/ficl -LDR_MI= ${BOOTDIR}/common -SASRC= ${BOOTDIR}/libsa +BOOTSRC= ${SRCTOP}/sys/boot +FDTSRC= ${BOOTSRC}/fdt +FICLSRC= ${BOOTSRC}/ficl +LDRSRC= ${BOOTSRC}/common +SASRC= ${BOOTSRC}/libsa SYSDIR= ${SRCTOP}/sys -FDTSRC= ${BOOTDIR}/fdt -UBOOTSRC= ${BOOTDIR}/uboot +UBOOTSRC= ${BOOTSRC}/uboot BOOTOBJ= ${OBJTOP}/sys/boot Modified: head/sys/boot/ficl.mk ============================================================================== --- head/sys/boot/ficl.mk Sun Oct 22 22:49:51 2017 (r324876) +++ head/sys/boot/ficl.mk Sun Oct 22 22:50:08 2017 (r324877) @@ -12,7 +12,7 @@ FICL_CPUARCH= mips64 FICL_CPUARCH= ${MACHINE_CPUARCH} .endif -.PATH: ${FICLDIR} ${FICLDIR}/${FICL_CPUARCH} +.PATH: ${FICLSRC} ${FICLSRC}/${FICL_CPUARCH} .if ${MACHINE_CPUARCH} == "amd64" .if defined(FICL32) @@ -26,7 +26,7 @@ CFLAGS+= -fPIC CFLAGS+= -m32 -mcpu=powerpc -I. .endif -CFLAGS+= -I${FICLDIR} -I${FICLDIR}/${FICL_CPUARCH} -I${LDR_MI} +CFLAGS+= -I${FICLSRC} -I${FICLSRC}/${FICL_CPUARCH} -I${LDRSRC} CFLAGS+= -DBOOT_FORTH CFLAGS+= -DBF_DICTSIZE=15000 Modified: head/sys/boot/ficl/Makefile ============================================================================== --- head/sys/boot/ficl/Makefile Sun Oct 22 22:49:51 2017 (r324876) +++ head/sys/boot/ficl/Makefile Sun Oct 22 22:50:08 2017 (r324877) @@ -28,12 +28,12 @@ INTERNALLIB= .endif # Standard softwords -.PATH: ${FICLDIR}/softwords +.PATH: ${FICLSRC}/softwords SOFTWORDS= softcore.fr jhlocal.fr marker.fr freebsd.fr ficllocal.fr \ ifbrack.fr # Optional OO extension softwords #SOFTWORDS+= oo.fr classes.fr softcore.c: ${SOFTWORDS} softcore.awk - (cd ${FICLDIR}/softwords; cat ${SOFTWORDS} \ + (cd ${FICLSRC}/softwords; cat ${SOFTWORDS} \ | awk -f softcore.awk -v datestamp="`LC_ALL=C date`") > ${.TARGET} Modified: head/sys/boot/i386/gptboot/Makefile ============================================================================== --- head/sys/boot/i386/gptboot/Makefile Sun Oct 22 22:49:51 2017 (r324876) +++ head/sys/boot/i386/gptboot/Makefile Sun Oct 22 22:50:08 2017 (r324877) @@ -43,7 +43,7 @@ CFLAGS.gcc+= --param max-inline-insns-single=100 .if ${LOADER_GELI_SUPPORT:Uyes} == "yes" CFLAGS+= -DLOADER_GELI_SUPPORT -CFLAGS+= -I${BOOTDIR}/geli +CFLAGS+= -I${BOOTSRC}/geli CFLAGS+= -I${.CURDIR}/../../.. LIBGELIBOOT= ${BOOTOBJ}/geli/libgeliboot.a .PATH: ${.CURDIR}/../../../opencrypto Modified: head/sys/boot/i386/gptzfsboot/Makefile ============================================================================== --- head/sys/boot/i386/gptzfsboot/Makefile Sun Oct 22 22:49:51 2017 (r324876) +++ head/sys/boot/i386/gptzfsboot/Makefile Sun Oct 22 22:50:08 2017 (r324877) @@ -50,7 +50,7 @@ CFLAGS+= -DSKEIN_LOOP=111 .if ${LOADER_GELI_SUPPORT:Uyes} == "yes" CFLAGS+= -DLOADER_GELI_SUPPORT -CFLAGS+= -I${BOOTDIR}/geli +CFLAGS+= -I${BOOTSRC}/geli LIBGELIBOOT= ${BOOTOBJ}/geli/libgeliboot.a .PATH: ${.CURDIR}/../../../opencrypto OPENCRYPTO_XTS= xform_aes_xts.o Modified: head/sys/boot/i386/libi386/Makefile ============================================================================== --- head/sys/boot/i386/libi386/Makefile Sun Oct 22 22:49:51 2017 (r324876) +++ head/sys/boot/i386/libi386/Makefile Sun Oct 22 22:50:08 2017 (r324877) @@ -28,7 +28,7 @@ CFLAGS+= -DDISK_DEBUG .if ${LOADER_GELI_SUPPORT:Uyes} == "yes" # Decrypt encrypted drives CFLAGS+= -DLOADER_GELI_SUPPORT -CFLAGS+= -I${BOOTDIR}/geli +CFLAGS+= -I${BOOTSRC}/geli .endif .if !defined(BOOT_HIDE_SERIAL_NUMBERS) Modified: head/sys/boot/i386/loader/Makefile ============================================================================== --- head/sys/boot/i386/loader/Makefile Sun Oct 22 22:49:51 2017 (r324876) +++ head/sys/boot/i386/loader/Makefile Sun Oct 22 22:50:08 2017 (r324877) @@ -42,7 +42,7 @@ HAVE_ISABUS= yes .if ${LOADER_GELI_SUPPORT:Uyes} == "yes" CFLAGS+= -DLOADER_GELI_SUPPORT -CFLAGS+= -I${BOOTDIR}/geli +CFLAGS+= -I${BOOTSRC}/geli LIBGELIBOOT= ${BOOTOBJ}/geli/libgeliboot.a .PATH: ${.CURDIR}/../../../opencrypto SRCS+= xform_aes_xts.c @@ -80,7 +80,7 @@ ${LOADER}.bin: ${LOADER}.sym strip -R .comment -R .note -o ${.TARGET} ${.ALLSRC} loader.help: help.common help.i386 - cat ${.ALLSRC} | awk -f ${LDR_MI}/merge_help.awk > ${.TARGET} + cat ${.ALLSRC} | awk -f ${LDRSRC}/merge_help.awk > ${.TARGET} FILES= ${LOADER} # XXX INSTALLFLAGS_loader= -b Modified: head/sys/boot/loader.mk ============================================================================== --- head/sys/boot/loader.mk Sun Oct 22 22:49:51 2017 (r324876) +++ head/sys/boot/loader.mk Sun Oct 22 22:50:08 2017 (r324877) @@ -2,9 +2,9 @@ .include "defs.mk" -.PATH: ${LDR_MI} ${BOOTDIR}/libsa +.PATH: ${LDRSRC} ${BOOTSRC}/libsa -CFLAGS+=-I${LDR_MI} +CFLAGS+=-I${LDRSRC} SRCS+= boot.c commands.c console.c devopen.c interp.c SRCS+= interp_backslash.c interp_parse.c ls.c misc.c @@ -58,7 +58,7 @@ SRCS+= pnp.c # Forth interpreter .if ${MK_FORTH} != "no" SRCS+= interp_forth.c -.include "${BOOTDIR}/ficl.mk" +.include "${BOOTSRC}/ficl.mk" .endif .if defined(BOOT_PROMPT_123) @@ -74,6 +74,6 @@ VERSION_FILE?= ${.CURDIR}/version .if ${MK_REPRODUCIBLE_BUILD} != no REPRO_FLAG= -r .endif -vers.c: ${LDR_MI}/newvers.sh ${VERSION_FILE} - sh ${LDR_MI}/newvers.sh ${REPRO_FLAG} ${VERSION_FILE} \ +vers.c: ${LDRSRC}/newvers.sh ${VERSION_FILE} + sh ${LDRSRC}/newvers.sh ${REPRO_FLAG} ${VERSION_FILE} \ ${NEWVERSWHAT} Modified: head/sys/boot/mips/beri/loader/Makefile ============================================================================== --- head/sys/boot/mips/beri/loader/Makefile Sun Oct 22 22:49:51 2017 (r324876) +++ head/sys/boot/mips/beri/loader/Makefile Sun Oct 22 22:50:08 2017 (r324877) @@ -96,7 +96,7 @@ LDADD= ${LIBFICL} ${LIBSA} loader.help: help.common help.mips cat ${.ALLSRC} | \ - awk -f ${LDR_MI}/merge_help.awk > ${.TARGET} + awk -f ${LDRSRC}/merge_help.awk > ${.TARGET} .PATH: ${.CURDIR}/../../../forth .include "${.CURDIR}/../../../forth/Makefile.inc" Modified: head/sys/boot/mips/uboot/Makefile ============================================================================== --- head/sys/boot/mips/uboot/Makefile Sun Oct 22 22:49:51 2017 (r324876) +++ head/sys/boot/mips/uboot/Makefile Sun Oct 22 22:50:08 2017 (r324877) @@ -45,7 +45,7 @@ OBJS+= ${SRCS:N*.h:R:S/$/.o/g} loader.help: help.common help.uboot ${.CURDIR}/../../fdt/help.fdt cat ${.ALLSRC} | \ - awk -f ${LDR_MI}/merge_help.awk > ${.TARGET} + awk -f ${LDRSRC}/merge_help.awk > ${.TARGET} ldscript.abs: echo "UBLDR_LOADADDR = ${UBLDR_LOADADDR};" >${.TARGET} Modified: head/sys/boot/powerpc/kboot/Makefile ============================================================================== --- head/sys/boot/powerpc/kboot/Makefile Sun Oct 22 22:49:51 2017 (r324876) +++ head/sys/boot/powerpc/kboot/Makefile Sun Oct 22 22:50:08 2017 (r324877) @@ -62,7 +62,7 @@ LDADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA32} loader.help: help.common help.kboot ${.CURDIR}/../../fdt/help.fdt cat ${.ALLSRC} | \ - awk -f ${LDR_MI}/merge_help.awk > ${.TARGET} + awk -f ${LDRSRC}/merge_help.awk > ${.TARGET} .PATH: ${.CURDIR}/../../forth .include "${.CURDIR}/../../forth/Makefile.inc" Modified: head/sys/boot/powerpc/ofw/Makefile ============================================================================== --- head/sys/boot/powerpc/ofw/Makefile Sun Oct 22 22:49:51 2017 (r324876) +++ head/sys/boot/powerpc/ofw/Makefile Sun Oct 22 22:50:08 2017 (r324877) @@ -62,7 +62,7 @@ LDADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA32} loader.help: help.common help.ofw ${.CURDIR}/../../fdt/help.fdt cat ${.ALLSRC} | \ - awk -f ${LDR_MI}/merge_help.awk > ${.TARGET} + awk -f ${LDRSRC}/merge_help.awk > ${.TARGET} .PATH: ${.CURDIR}/../../forth .include "${.CURDIR}/../../forth/Makefile.inc" Modified: head/sys/boot/powerpc/ps3/Makefile ============================================================================== --- head/sys/boot/powerpc/ps3/Makefile Sun Oct 22 22:49:51 2017 (r324876) +++ head/sys/boot/powerpc/ps3/Makefile Sun Oct 22 22:50:08 2017 (r324877) @@ -63,7 +63,7 @@ font.h: loader.help: help.common help.ps3 ${.CURDIR}/../../fdt/help.fdt cat ${.ALLSRC} | \ - awk -f ${LDR_MI}/merge_help.awk > ${.TARGET} + awk -f ${LDRSRC}/merge_help.awk > ${.TARGET} .PATH: ${.CURDIR}/../../forth .include "${.CURDIR}/../../forth/Makefile.inc" Modified: head/sys/boot/powerpc/uboot/Makefile ============================================================================== --- head/sys/boot/powerpc/uboot/Makefile Sun Oct 22 22:49:51 2017 (r324876) +++ head/sys/boot/powerpc/uboot/Makefile Sun Oct 22 22:50:08 2017 (r324877) @@ -41,7 +41,7 @@ LDADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FD loader.help: help.common help.uboot ${.CURDIR}/../../fdt/help.fdt cat ${.ALLSRC} | \ - awk -f ${LDR_MI}/merge_help.awk > ${.TARGET} + awk -f ${LDRSRC}/merge_help.awk > ${.TARGET} .PATH: ${.CURDIR}/../../forth FILES= loader.help Modified: head/sys/boot/sparc64/loader/Makefile ============================================================================== --- head/sys/boot/sparc64/loader/Makefile Sun Oct 22 22:49:51 2017 (r324876) +++ head/sys/boot/sparc64/loader/Makefile Sun Oct 22 22:50:08 2017 (r324877) @@ -55,7 +55,7 @@ LDADD= ${LIBFICL} ${LIBZFSBOOT} ${LIBOFW} ${LIBSA} loader.help: help.common help.sparc64 cat ${.ALLSRC} | \ - awk -f ${LDR_MI}/merge_help.awk > ${.TARGET} + awk -f ${LDRSRC}/merge_help.awk > ${.TARGET} .PATH: ${.CURDIR}/../../forth .include "${.CURDIR}/../../forth/Makefile.inc"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710222250.v9MMo8gJ001598>