Module Name: src
Committed By: tsutsui
Date: Sat Jun 8 13:03:41 UTC 2024
Modified Files:
src/distrib/cdrom: Makefile
src/distrib/cdrom/macppc_installboot: Makefile
src/share/mk: bsd.own.mk
src/tools: Makefile
Added Files:
src/tools/macppc_installboot: Makefile
Log Message:
Build src/distrib/cdrom/macppc_installboot in src/tools as a tool.
Also use the tools version ${TOOLS_MACPPC_INSTALLBOOT} to create
bootable ISO9660/HFS hybrid installcd image for macppc.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/distrib/cdrom/Makefile
cvs rdiff -u -r1.13 -r1.14 src/distrib/cdrom/macppc_installboot/Makefile
cvs rdiff -u -r1.1375 -r1.1376 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.221 -r1.222 src/tools/Makefile
cvs rdiff -u -r0 -r1.1 src/tools/macppc_installboot/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/cdrom/Makefile
diff -u src/distrib/cdrom/Makefile:1.56 src/distrib/cdrom/Makefile:1.57
--- src/distrib/cdrom/Makefile:1.56 Fri May 31 20:57:32 2024
+++ src/distrib/cdrom/Makefile Sat Jun 8 13:03:40 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2024/05/31 20:57:32 tsutsui Exp $
+# $NetBSD: Makefile,v 1.57 2024/06/08 13:03:40 tsutsui Exp $
#
# Consult "*.conf" for the configuration variables; this Makefile is typically
# not edited for basic configuration changes.
@@ -67,10 +67,6 @@ SUBDIR=
MKISOFS= ${TOOL_MKHYBRID}
.endif
-.if !empty(ALL_PORTS:Mmacppc)
-SUBDIR+= macppc_installboot
-.endif
-
.if !empty(SUBDIR)
.include <bsd.subdir.mk>
.endif
@@ -85,9 +81,6 @@ RSYNC?= /usr/pkg/bin/rsync
ALPHA_IBOOT?= ${TOOL_INSTALLBOOT} -m alpha -o sunsum,append
PMAX_IBOOT?= ${TOOL_INSTALLBOOT} -m pmax -o sunsum,append
VAX_IBOOT?= ${TOOL_INSTALLBOOT} -m vax -o sunsum,append
-.if !empty(ALL_PORTS:Mmacppc)
-MACPPC_IBOOTDIR!= cd ${.CURDIR}/macppc_installboot && ${PRINTOBJDIR}
-.endif
.if !empty(ALL_PORTS:Msgimips)
SGIMIPS_SGIVOL?= ${TOOLDIR}/bin/nbsgivol
.endif
@@ -472,10 +465,6 @@ size-${image}: stage-${image} extfilepre
# Actually build the image with all the bootstrap goo....
-.if !empty(BASE_PORTS.${image}:Mmacppc)
-${IMAGEDIR}/${image}.iso: all-macppc_installboot
-.endif
-
${IMAGEDIR}/${image}.iso: size-${image} check_mkisofs
@sort -o ${contents.${image}} ${contents.${image}}
.if defined(LOG_MKISOFS)
@@ -489,8 +478,7 @@ ${IMAGEDIR}/${image}.iso: size-${image}
${.TARGET} ${SUN_BOOT_ARGS.${image}}
.endif
.if !empty(BASE_PORTS.${image}:Mmacppc)
- ${MACPPC_IBOOTDIR}/macppc_installboot \
- $@ ${EXTFILEDIR}/macppc.bootxx /ofwboot
+ ${TOOL_MACPPCINSTALLBOOT} $@ ${EXTFILEDIR}/macppc.bootxx /ofwboot
.endif
.if !empty(BASE_PORTS.${image}:Mpmax)
${PMAX_IBOOT} $@ ${BOOTFILE.pmax}
Index: src/distrib/cdrom/macppc_installboot/Makefile
diff -u src/distrib/cdrom/macppc_installboot/Makefile:1.13 src/distrib/cdrom/macppc_installboot/Makefile:1.14
--- src/distrib/cdrom/macppc_installboot/Makefile:1.13 Fri May 24 10:13:44 2024
+++ src/distrib/cdrom/macppc_installboot/Makefile Sat Jun 8 13:03:40 2024
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile,v 1.13 2024/05/24 10:13:44 tsutsui Exp $
+# $NetBSD: Makefile,v 1.14 2024/06/08 13:03:40 tsutsui Exp $
-.include <bsd.hostinit.mk>
-HOSTPROG= macppc_installboot
-SRCS= installboot.c cd9660.c cd9660_util.c
+NOMAN= # defined
+PROG= macppc_installboot
+SRCS= installboot.c cd9660.c cd9660_util.c
+.PATH.c: ${.CURDIR}
.PATH.c: ${NETBSDSRCDIR}/usr.sbin/installboot ${NETBSDSRCDIR}/sys/fs/cd9660
-HOST_CPPFLAGS+= -I. -I${.CURDIR}
-#HOST_CPPFLAGS+= -DDEBUG
+CPPFLAGS+= -I. -I${.CURDIR}
+#CPPFLAGS+= -DDEBUG
+.if !defined(HOSTPROGNAME)
.if !make(obj) && !make(clean) && !make(cleandir)
.BEGIN:
-rm -rf fs
@@ -23,11 +25,6 @@ cleandir distclean: cleaninc
cleaninc:
-rm -rf fs
+.endif # !defined(HOSTPROGNAME)
-.include <bsd.own.mk>
-
-.ifndef NOCOMPATLIB
-.-include "${TOOLDIR}/share/compat/defs.mk"
-.endif
-
-.include <bsd.hostprog.mk>
+.include <bsd.prog.mk>
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1375 src/share/mk/bsd.own.mk:1.1376
--- src/share/mk/bsd.own.mk:1.1375 Fri May 31 20:52:58 2024
+++ src/share/mk/bsd.own.mk Sat Jun 8 13:03:41 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1375 2024/05/31 20:52:58 tsutsui Exp $
+# $NetBSD: bsd.own.mk,v 1.1376 2024/06/08 13:03:41 tsutsui Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -473,6 +473,7 @@ TOOL_JOIN= ${TOOLDIR}/bin/${_TOOL_PREFI
TOOL_LLVM_TBLGEN= ${TOOLDIR}/bin/${_TOOL_PREFIX}llvm-tblgen
TOOL_M4= ${TOOLDIR}/bin/${_TOOL_PREFIX}m4
TOOL_MACPPCFIXCOFF= ${TOOLDIR}/bin/${_TOOL_PREFIX}macppc-fixcoff
+TOOL_MACPPCINSTALLBOOT= ${TOOLDIR}/bin/${_TOOL_PREFIX}macppc_installboot
TOOL_MAKEFS= ${TOOLDIR}/bin/${_TOOL_PREFIX}makefs
TOOL_MAKEINFO= ${TOOLDIR}/bin/${_TOOL_PREFIX}makeinfo
TOOL_MAKEKEYS= ${TOOLDIR}/bin/${_TOOL_PREFIX}makekeys
Index: src/tools/Makefile
diff -u src/tools/Makefile:1.221 src/tools/Makefile:1.222
--- src/tools/Makefile:1.221 Fri May 31 20:52:58 2024
+++ src/tools/Makefile Sat Jun 8 13:03:41 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.221 2024/05/31 20:52:58 tsutsui Exp $
+# $NetBSD: Makefile,v 1.222 2024/06/08 13:03:41 tsutsui Exp $
.include <bsd.own.mk>
.include <bsd.endian.mk>
@@ -172,6 +172,7 @@ SUBDIR+= ibmnws-ncdcs
.if ${MACHINE} == "macppc"
SUBDIR+= macppc-fixcoff
+SUBDIR+= macppc_installboot
.endif
.if (${MACHINE} == "prep" || ${MACHINE} == "rs6000" || ${MACHINE} == "bebox")
Added files:
Index: src/tools/macppc_installboot/Makefile
diff -u /dev/null src/tools/macppc_installboot/Makefile:1.1
--- /dev/null Sat Jun 8 13:03:41 2024
+++ src/tools/macppc_installboot/Makefile Sat Jun 8 13:03:41 2024
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile,v 1.1 2024/06/08 13:03:41 tsutsui Exp $
+
+.include <bsd.hostinit.mk>
+
+HOSTPROGNAME= ${_TOOL_PREFIX}macppc_installboot
+HOST_SRCDIR= distrib/cdrom/macppc_installboot
+
+.include "${.CURDIR}/../Makefile.nbincludes"
+.include "${.CURDIR}/../Makefile.host"
