[src/trunk]: src/distrib/amd64 fix building amd64 with USE_XZ_SETS=no.

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/06ab9cfd2070
branches:  trunk
changeset: 365999:06ab9cfd2070
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun May 08 08:12:45 2022 +0000

description:
fix building amd64 with USE_XZ_SETS=no.

bump the size of images if USE_XZ_SETS != no.  consolidate a lot of
the code between installimage/Makefile and installimage-bios/Makefile
into installimage/installimage.mk.

diffstat:

 distrib/amd64/installimage-bios/Makefile   |  27 +----------------------
 distrib/amd64/installimage/Makefile        |  26 +---------------------
 distrib/amd64/installimage/installimage.mk |  33 ++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 49 deletions(-)

diffs (118 lines):

diff -r 2d324c15a273 -r 06ab9cfd2070 distrib/amd64/installimage-bios/Makefile
--- a/distrib/amd64/installimage-bios/Makefile  Sun May 08 07:27:50 2022 +0000
+++ b/distrib/amd64/installimage-bios/Makefile  Sun May 08 08:12:45 2022 +0000
@@ -1,32 +1,9 @@
-#      $NetBSD: Makefile,v 1.5 2022/01/03 12:10:17 martin Exp $
+#      $NetBSD: Makefile,v 1.6 2022/05/08 08:12:45 mrg Exp $
 
 .include <bsd.own.mk>
 
 INSTIMGBASE=   NetBSD-${DISTRIBVER}-amd64-bios-install # gives ${IMGBASE}.img
 
-INSTIMAGEMB?=  2250                    # for all installation binaries
-
-PRIMARY_BOOT=          bootxx_ffsv1
-SECONDARY_BOOT=                boot
-SECONDARY_BOOT_ARG=    # unnecessary
+.include "../installimage/installimage.mk"
 
 USE_MBR=               yes
-
-CLEANFILES+=   boot.cfg
-
-prepare_md_post:
-       ${TOOL_SED}                                                     \
-           -e "s/@@MACHINE@@/${MACHINE}/"                              \
-           -e "s/@@VERSION@@/${DISTRIBVER}/"                           \
-           < ${.CURDIR}/boot.cfg.in > boot.cfg
-
-DISTRIBDIR!= cd ${.CURDIR}/../.. ; pwd
-
-SPEC_EXTRA=            ${.CURDIR}/spec.inst
-IMGFILE_EXTRA=                                                         \
-       ${.CURDIR}/etc.ttys             etc/ttys                        \
-       ${.CURDIR}/etc.rc               etc/rc                          \
-       ${.CURDIR}/install.sh           .                               \
-       ${.OBJDIR}/boot.cfg             .
-
-.include "${NETBSDSRCDIR}/distrib/common/bootimage//Makefile.installimage"
diff -r 2d324c15a273 -r 06ab9cfd2070 distrib/amd64/installimage/Makefile
--- a/distrib/amd64/installimage/Makefile       Sun May 08 07:27:50 2022 +0000
+++ b/distrib/amd64/installimage/Makefile       Sun May 08 08:12:45 2022 +0000
@@ -1,14 +1,11 @@
-#      $NetBSD: Makefile,v 1.21 2022/01/03 12:10:17 martin Exp $
+#      $NetBSD: Makefile,v 1.22 2022/05/08 08:12:45 mrg Exp $
 
 .include <bsd.own.mk>
 
 INSTIMGBASE=   NetBSD-${DISTRIBVER}-amd64-install      # gives ${IMGBASE}.img
 
-INSTIMAGEMB?=  2250                    # for all installation binaries
+.include "installimage.mk"
 
-PRIMARY_BOOT=          bootxx_ffsv1
-SECONDARY_BOOT=                boot
-SECONDARY_BOOT_ARG=    # unnecessary
 EFIBOOT=               ${WORKDIR}/usr/mdec/bootx64.efi
 EFIBOOT+=              ${WORKDIR}/usr/mdec/bootia32.efi
 #EFIBOOT=              ${.OBJDIR}/../../../sys/arch/i386/stand/efiboot/bootx64/bootx64.efi
@@ -17,22 +14,3 @@
 USE_MBR=               yes
 USE_GPT=               yes
 USE_GPTMBR=            yes
-
-CLEANFILES+=   boot.cfg
-
-prepare_md_post:
-       ${TOOL_SED}                                                     \
-           -e "s/@@MACHINE@@/${MACHINE}/"                              \
-           -e "s/@@VERSION@@/${DISTRIBVER}/"                           \
-           < ${.CURDIR}/boot.cfg.in > boot.cfg
-
-DISTRIBDIR!= cd ${.CURDIR}/../.. ; pwd
-
-SPEC_EXTRA=            ${.CURDIR}/spec.inst
-IMGFILE_EXTRA=                                                         \
-       ${.CURDIR}/etc.ttys             etc/ttys                        \
-       ${.CURDIR}/etc.rc               etc/rc                          \
-       ${.CURDIR}/install.sh           .                               \
-       ${.OBJDIR}/boot.cfg             .
-
-.include "${NETBSDSRCDIR}/distrib/common/bootimage//Makefile.installimage"
diff -r 2d324c15a273 -r 06ab9cfd2070 distrib/amd64/installimage/installimage.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/amd64/installimage/installimage.mk        Sun May 08 08:12:45 2022 +0000
@@ -0,0 +1,33 @@
+#      $NetBSD: installimage.mk,v 1.1 2022/05/08 08:12:45 mrg Exp $
+
+# common code between distrib/amd64/installimage/Makefile and
+# distrib/amd64/installimage-bios/Makefile.
+
+.if ${USE_XZ_SETS:Uno} != "no"
+INSTIMAGEMB?=  2250                    # for all installation binaries
+.else
+INSTIMAGEMB?=  3500                    # for all installation binaries
+.endif
+
+PRIMARY_BOOT=          bootxx_ffsv1
+SECONDARY_BOOT=                boot
+SECONDARY_BOOT_ARG=    # unnecessary
+
+CLEANFILES+=   boot.cfg
+
+prepare_md_post:
+       ${TOOL_SED}                                                     \
+           -e "s/@@MACHINE@@/${MACHINE}/"                              \
+           -e "s/@@VERSION@@/${DISTRIBVER}/"                           \
+           < ${.CURDIR}/boot.cfg.in > boot.cfg
+
+DISTRIBDIR!= cd ${.CURDIR}/../.. ; pwd
+
+SPEC_EXTRA=            ${.CURDIR}/spec.inst
+IMGFILE_EXTRA=                                                         \
+       ${.CURDIR}/etc.ttys             etc/ttys                        \
+       ${.CURDIR}/etc.rc               etc/rc                          \
+       ${.CURDIR}/install.sh           .                               \
+       ${.OBJDIR}/boot.cfg             .
+
+.include "${NETBSDSRCDIR}/distrib/common/bootimage/Makefile.installimage"