Author: imp
Date: Fri Jan 12 17:21:48 2018
New Revision: 327881
URL: https://svnweb.freebsd.org/changeset/base/327881
Log:
Allow this file to be included
Use simple "foo" rather than "${.CURDIR}/foo" to include Makefile.fat
since the former works when including this Makefile from else
where. Also, use full path from ${BOOTSRC} to the FAT templates for
similar reasons. It doesn't change anything in base FreeBSD, but
allows us to have a custom boot1.efi more easily (though that will be
short-lived for us, it may also be helpful for others).
Sponsored by: Netflix
Modified:
head/stand/efi/boot1/Makefile
Modified: head/stand/efi/boot1/Makefile
==============================================================================
--- head/stand/efi/boot1/Makefile Fri Jan 12 16:28:51 2018
(r327880)
+++ head/stand/efi/boot1/Makefile Fri Jan 12 17:21:48 2018
(r327881)
@@ -110,7 +110,7 @@ boot1.efi: ${PROG}
# The following inserts our objects into a template FAT file system
# created by generate-fat.sh
-.include "${.CURDIR}/Makefile.fat"
+.include "Makefile.fat"
boot1.efifat: boot1.efi
@set -- `ls -l ${.ALLSRC}`; \
@@ -120,7 +120,7 @@ boot1.efifat: boot1.efi
exit 1; \
fi
echo ${.OBJDIR}
- xz -d -c ${.CURDIR}/fat-${MACHINE}.tmpl.xz > ${.TARGET}
+ 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
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
