From 04016d3a36e81d49ae1d28bd266ef7c4a0051eb8 Mon Sep 17 00:00:00 2001 From: rin Date: Mon, 24 Jul 2023 08:21:09 +0000 Subject: [PATCH] macppc/floppies: Use x_ variants of disklabel, fsck_ffs, and newfs. Fix ramdisk overflow with clang. - For fsck_ffs(8) and newfs(8), Apple UFS is still supported. - 2.88MB of ramdisk size can be bumped if really required. --- distrib/macppc/floppies/ramdisk/Makefile | 4 +++- distrib/macppc/floppies/ramdisk/list | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/distrib/macppc/floppies/ramdisk/Makefile b/distrib/macppc/floppies/ramdisk/Makefile index 687d1e88a3ac..b58f4dba893a 100644 --- a/distrib/macppc/floppies/ramdisk/Makefile +++ b/distrib/macppc/floppies/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2021/05/25 10:58:41 martin Exp $ +# $NetBSD: Makefile,v 1.54 2023/07/24 08:21:09 rin Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -21,6 +21,8 @@ LDFLAGS+= -m32 -Wl,-melf32ppc_nbsd CRUNCHBIN= ramdiskbin CRUNCHENV+= LDFLAGS=${LDFLAGS:Q} +# Enable Apple UFS support for x_fsck_ffs and x_newfs +CRUNCHENV+= APPLE_UFS=1 LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst MTREECONF= ${DISTRIBDIR}/common/mtree.common IMAGEENDIAN= be diff --git a/distrib/macppc/floppies/ramdisk/list b/distrib/macppc/floppies/ramdisk/list index b000acfe957c..d764217ab889 100644 --- a/distrib/macppc/floppies/ramdisk/list +++ b/distrib/macppc/floppies/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.39 2013/04/24 08:04:18 msaitoh Exp $ +# $NetBSD: list,v 1.40 2023/07/24 08:21:09 rin Exp $ SRCDIRS bin sbin usr.bin usr.sbin @@ -61,10 +61,13 @@ PROG usr/sbin/installboot # init invokes the shell as -sh ARGVLN sh -sh +SPECIAL disklabel srcdir distrib/utils/x_disklabel SPECIAL ed srcdir distrib/utils/x_ed +SPECIAL fsck_ffs srcdir distrib/utils/x_fsck_ffs SPECIAL gzip srcdir distrib/utils/x_gzip SPECIAL ifconfig srcdir distrib/utils/x_ifconfig SPECIAL more srcdir distrib/utils/more +SPECIAL newfs srcdir distrib/utils/x_newfs SPECIAL pdisk srcdir external/bsd/pdisk/bin SPECIAL ping srcdir distrib/utils/x_ping SPECIAL route srcdir distrib/utils/x_route