Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/distrib/macppc/floppies/ramdisk macppc/floppies: Use x_ vari...



details:   https://anonhg.NetBSD.org/src/rev/835a2aaa48b6
branches:  trunk
changeset: 378162:835a2aaa48b6
user:      rin <rin%NetBSD.org@localhost>
date:      Mon Jul 24 08:21:09 2023 +0000

description:
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.

diffstat:

 distrib/macppc/floppies/ramdisk/Makefile |  4 +++-
 distrib/macppc/floppies/ramdisk/list     |  5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diffs (41 lines):

diff -r 00b6881fd77a -r 835a2aaa48b6 distrib/macppc/floppies/ramdisk/Makefile
--- a/distrib/macppc/floppies/ramdisk/Makefile  Mon Jul 24 01:56:59 2023 +0000
+++ b/distrib/macppc/floppies/ramdisk/Makefile  Mon Jul 24 08:21:09 2023 +0000
@@ -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 <bsd.own.mk>
 .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 -r 00b6881fd77a -r 835a2aaa48b6 distrib/macppc/floppies/ramdisk/list
--- a/distrib/macppc/floppies/ramdisk/list      Mon Jul 24 01:56:59 2023 +0000
+++ b/distrib/macppc/floppies/ramdisk/list      Mon Jul 24 08:21:09 2023 +0000
@@ -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



Home | Main Index | Thread Index | Old Index