Module Name: src
Committed By: jmcneill
Date: Sun May 22 19:32:42 UTC 2022
Modified Files:
src/distrib/amd64/installimage: Makefile installimage.mk
src/distrib/amd64/installimage-bios: Makefile
Log Message:
Restore Makefile.installimage include after variables are set. Makes amd64
USB install images bootable again.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/distrib/amd64/installimage/Makefile
cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/installimage/installimage.mk
cvs rdiff -u -r1.6 -r1.7 src/distrib/amd64/installimage-bios/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/installimage/Makefile
diff -u src/distrib/amd64/installimage/Makefile:1.22 src/distrib/amd64/installimage/Makefile:1.23
--- src/distrib/amd64/installimage/Makefile:1.22 Sun May 8 08:12:45 2022
+++ src/distrib/amd64/installimage/Makefile Sun May 22 19:32:41 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2022/05/08 08:12:45 mrg Exp $
+# $NetBSD: Makefile,v 1.23 2022/05/22 19:32:41 jmcneill Exp $
.include <bsd.own.mk>
@@ -14,3 +14,5 @@ EFIBOOT+= ${WORKDIR}/usr/mdec/bootia32.
USE_MBR= yes
USE_GPT= yes
USE_GPTMBR= yes
+
+.include "${NETBSDSRCDIR}/distrib/common/bootimage/Makefile.installimage"
Index: src/distrib/amd64/installimage/installimage.mk
diff -u src/distrib/amd64/installimage/installimage.mk:1.1 src/distrib/amd64/installimage/installimage.mk:1.2
--- src/distrib/amd64/installimage/installimage.mk:1.1 Sun May 8 08:12:45 2022
+++ src/distrib/amd64/installimage/installimage.mk Sun May 22 19:32:41 2022
@@ -1,4 +1,4 @@
-# $NetBSD: installimage.mk,v 1.1 2022/05/08 08:12:45 mrg Exp $
+# $NetBSD: installimage.mk,v 1.2 2022/05/22 19:32:41 jmcneill Exp $
# common code between distrib/amd64/installimage/Makefile and
# distrib/amd64/installimage-bios/Makefile.
@@ -29,5 +29,3 @@ IMGFILE_EXTRA= \
${.CURDIR}/etc.rc etc/rc \
${.CURDIR}/install.sh . \
${.OBJDIR}/boot.cfg .
-
-.include "${NETBSDSRCDIR}/distrib/common/bootimage/Makefile.installimage"
Index: src/distrib/amd64/installimage-bios/Makefile
diff -u src/distrib/amd64/installimage-bios/Makefile:1.6 src/distrib/amd64/installimage-bios/Makefile:1.7
--- src/distrib/amd64/installimage-bios/Makefile:1.6 Sun May 8 08:12:45 2022
+++ src/distrib/amd64/installimage-bios/Makefile Sun May 22 19:32:41 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2022/05/08 08:12:45 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2022/05/22 19:32:41 jmcneill Exp $
.include <bsd.own.mk>
@@ -7,3 +7,5 @@ INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-
.include "../installimage/installimage.mk"
USE_MBR= yes
+
+.include "${NETBSDSRCDIR}/distrib/common/bootimage/Makefile.installimage"
