From 1de614c8d085bcbd0fec968d4349d5d72ca51f79 Mon Sep 17 00:00:00 2001 From: tsutsui Date: Fri, 24 May 2024 13:26:35 +0000 Subject: [PATCH] Remove installboot(8) calls against emips install media. XXX: maybe we should also remove blindly copied bootxx binaries. --- distrib/emips/cdroms/installcd/Makefile | 6 +----- distrib/emips/instkernel/Makefile | 6 ++---- distrib/emips/miniroot/Makefile.inc | 4 +--- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/distrib/emips/cdroms/installcd/Makefile b/distrib/emips/cdroms/installcd/Makefile index 186e178fa353..dfbd045cda33 100644 --- a/distrib/emips/cdroms/installcd/Makefile +++ b/distrib/emips/cdroms/installcd/Makefile @@ -1,12 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2019/09/23 13:42:31 christos Exp $ +# $NetBSD: Makefile,v 1.5 2024/05/24 13:26:35 tsutsui Exp $ CDBASE= emipscd # gives ${CDBASE}.iso CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR CDRELEASE_NODEBUG= true CDKERNELS= netbsd-INSTALL.gz netbsd CDINSTKERNEL= ../../instkernel -#make the CD bootable -image_md_post: - ${TOOL_INSTALLBOOT} -m${MACHINE} ${CDIMAGE} bootxx.${MACHINE} - .include "${.CURDIR}/../../../common/Makefile.bootcd" diff --git a/distrib/emips/instkernel/Makefile b/distrib/emips/instkernel/Makefile index d836655043f9..cb712a37eeb4 100644 --- a/distrib/emips/instkernel/Makefile +++ b/distrib/emips/instkernel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2019/06/14 16:34:31 martin Exp $ +# $NetBSD: Makefile,v 1.6 2024/05/24 13:26:35 tsutsui Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -10,9 +10,7 @@ IMAGESIZE= 2600k LISTS= ${.CURDIR}/list MTREECONF= ${DISTRIBDIR}/common/mtree.dot IMAGEENDIAN= be -PRIMARYBOOT= ${DESTDIR}/usr/mdec/bootxx_ffs -IMAGEDEPENDS= netbsd-INSTALL.gz ${DESTDIR}/usr/mdec/boot.emips ${PRIMARYBOOT} -IMAGEPOSTBUILD= ${TOOL_INSTALLBOOT} -v -m ${MACHINE} ${IMAGE} ${PRIMARYBOOT} +IMAGEDEPENDS= netbsd-INSTALL.gz ${DESTDIR}/usr/mdec/boot.emips RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR} RAMDISK= ${RAMDISKDIR}/ramdisk.fs diff --git a/distrib/emips/miniroot/Makefile.inc b/distrib/emips/miniroot/Makefile.inc index 3eee8035b2cf..e67bce1fa7de 100644 --- a/distrib/emips/miniroot/Makefile.inc +++ b/distrib/emips/miniroot/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.4 2017/01/24 18:04:01 christos Exp $ +# $NetBSD: Makefile.inc,v 1.5 2024/05/24 13:26:35 tsutsui Exp $ DBG= -Os @@ -12,5 +12,3 @@ IMAGEDEPENDS+= ${ARCHDIR}/dot.profile \ ${DESTDIR}/.profile ${DESTDIR}/boot.emips \ ${DESTDIR}/etc/disktab \ ${KERNOBJDIR}/GENERIC/netbsd - -IMAGEPOSTBUILD= ${TOOL_INSTALLBOOT} -v -m ${MACHINE} ${IMAGE} ${DESTDIR}/usr/mdec/bootxx_ffs