Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 3 May 2019 21:13:04 +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: r347061 - head/stand/efi/boot1
Message-ID:  <201905032113.x43LD4mg087155@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: imp
Date: Fri May  3 21:13:04 2019
New Revision: 347061
URL: https://svnweb.freebsd.org/changeset/base/347061

Log:
  Substitute boot1 with ${BOOT1}
  
  Allow for other names to be built, so parameterize this makefile to
  avoid hard coding boot1.

Modified:
  head/stand/efi/boot1/Makefile

Modified: head/stand/efi/boot1/Makefile
==============================================================================
--- head/stand/efi/boot1/Makefile	Fri May  3 21:09:25 2019	(r347060)
+++ head/stand/efi/boot1/Makefile	Fri May  3 21:13:04 2019	(r347061)
@@ -2,7 +2,8 @@
 
 .include <bsd.init.mk>
 
-PROG=		boot1.sym
+BOOT1?=		boot1
+PROG=		${BOOT1}.sym
 INTERNALPROG=
 WARNS?=		6
 
@@ -51,8 +52,8 @@ CFLAGS+=	-DEFI_DEBUG
 .PATH:		${LDRSRC}
 CFLAGS+=	-I${LDRSRC}
 
-FILES=	boot1.efi boot1.efifat
-FILESMODE_boot1.efi=	${BINMODE}
+FILES=	${BOOT1}.efi ${BOOT1}.efifat
+FILESMODE_${BOOT1}.efi=	${BINMODE}
 
 LDSCRIPT=	${EFISRC}/loader/arch/${MACHINE}/ldscript.${MACHINE}
 LDFLAGS+=	-Wl,-T${LDSCRIPT},-Bsymbolic,-znotext -shared
@@ -77,7 +78,7 @@ LDADD+=		${LIBEFI} ${LIBSA}
 
 DPADD+=		${LDSCRIPT}
 
-boot1.efi: ${PROG}
+${BOOT1}.efi: ${PROG}
 	if ${NM} ${.ALLSRC} | grep ' U '; then \
 		echo "Undefined symbols in ${.ALLSRC}"; \
 		exit 1; \
@@ -93,7 +94,7 @@ boot1.efi: ${PROG}
 
 .include "Makefile.fat"
 
-boot1.efifat: boot1.efi
+${BOOT1}.efifat: ${BOOT1}.efi
 	@set -- `ls -l ${.ALLSRC}`; \
 	x=$$(($$5-${BOOT1_MAXSIZE})); \
 	if [ $$x -ge 0 ]; then \
@@ -104,6 +105,6 @@ boot1.efifat: boot1.efi
 	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
+CLEANFILES+= ${BOOT1}.efi ${BOOT1}.efifat
 
 .include <bsd.prog.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905032113.x43LD4mg087155>