diff options
| author | nia <nia@NetBSD.org> | 2022-05-27 07:28:20 +0000 |
|---|---|---|
| committer | nia <nia@NetBSD.org> | 2022-05-27 07:28:20 +0000 |
| commit | aa9bc1445fdbfac0e78c33d2e7007cfc8d29d1b4 (patch) | |
| tree | f521b5c58c1b3eb79493018f0d64ad6159e59171 | |
| parent | 8725cfcecc30fe91e8eb8ebd71b72a5d687648f5 (diff) | |
mk: Add a MKLFS flag for excluding the log-structured filesystem userspace
tools from the build.
| -rw-r--r-- | distrib/sets/lists/base/mi | 20 | ||||
| -rw-r--r-- | distrib/sets/lists/base/shl.mi | 8 | ||||
| -rw-r--r-- | distrib/sets/lists/comp/mi | 6 | ||||
| -rw-r--r-- | distrib/sets/lists/debug/mi | 22 | ||||
| -rw-r--r-- | distrib/sets/lists/debug/shl.mi | 4 | ||||
| -rw-r--r-- | distrib/sets/lists/man/mi | 56 | ||||
| -rw-r--r-- | distrib/sets/lists/tests/mi | 10 | ||||
| -rw-r--r-- | libexec/Makefile | 8 | ||||
| -rw-r--r-- | sbin/Makefile | 9 | ||||
| -rw-r--r-- | share/mk/bsd.README | 7 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 3 | ||||
| -rw-r--r-- | tests/fs/Makefile | 8 | ||||
| -rw-r--r-- | tests/fs/vfs/Makefile | 7 | ||||
| -rw-r--r-- | usr.sbin/Makefile | 8 | ||||
| -rw-r--r-- | usr.sbin/puffs/Makefile | 8 |
15 files changed, 106 insertions, 78 deletions
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi index da3e541d268..6d0d68cb20c 100644 --- a/distrib/sets/lists/base/mi +++ b/distrib/sets/lists/base/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1301 2022/05/25 21:25:46 nia Exp $ +# $NetBSD: mi,v 1.1302 2022/05/27 07:28:21 nia Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -327,7 +327,7 @@ ./libexec/dhcpcd-hooks/30-hostname base-dhcpcd-root ./libexec/dhcpcd-hooks/50-ntp.conf base-dhcpcd-root ./libexec/dhcpcd-run-hooks base-dhcpcd-root -./libexec/lfs_cleanerd base-sysutil-bin +./libexec/lfs_cleanerd base-sysutil-bin lfs ./libexec/resolvconf base-resolvconf-root ./libexec/resolvconf/dnsmasq base-resolvconf-root ./libexec/resolvconf/libc base-resolvconf-root @@ -371,7 +371,7 @@ ./sbin/dmsetup base-lvm-root lvm ./sbin/drvctl base-sysutil-root ./sbin/dump base-sysutil-root -./sbin/dump_lfs base-sysutil-root +./sbin/dump_lfs base-sysutil-root lfs ./sbin/dumpfs base-obsolete obsolete ./sbin/dumplfs base-obsolete obsolete ./sbin/fastboot base-sysutil-root @@ -381,7 +381,7 @@ ./sbin/fsck base-sysutil-root ./sbin/fsck_ext2fs base-ext2fs-root ./sbin/fsck_ffs base-sysutil-root -./sbin/fsck_lfs base-sysutil-root +./sbin/fsck_lfs base-sysutil-root lfs ./sbin/fsck_msdos base-sysutil-root ./sbin/fsck_udf base-sysutil-root ./sbin/fsck_v7fs base-sysutil-root @@ -417,7 +417,7 @@ ./sbin/mount_hfs base-hfs-root ./sbin/mount_hfsp base-obsolete obsolete ./sbin/mount_kernfs base-sysutil-root -./sbin/mount_lfs base-sysutil-root +./sbin/mount_lfs base-sysutil-root lfs ./sbin/mount_mfs base-sysutil-root ./sbin/mount_msdos base-sysutil-root ./sbin/mount_nfs base-nfsclient-root @@ -443,7 +443,7 @@ ./sbin/newbtconf base-sysutil-root ./sbin/newfs base-sysutil-root ./sbin/newfs_ext2fs base-sysutil-root -./sbin/newfs_lfs base-sysutil-root +./sbin/newfs_lfs base-sysutil-root lfs ./sbin/newfs_msdos base-sysutil-root ./sbin/newfs_sysvbfs base-sysutil-root ./sbin/newfs_udf base-sysutil-root @@ -466,10 +466,10 @@ ./sbin/raidctl base-sysutil-root ./sbin/rcorder base-sysutil-root ./sbin/rdump base-sysutil-root -./sbin/rdump_lfs base-sysutil-root +./sbin/rdump_lfs base-sysutil-root lfs ./sbin/reboot base-sysutil-root ./sbin/resize_ffs base-sysutil-root -./sbin/resize_lfs base-sysutil-root +./sbin/resize_lfs base-sysutil-root lfs ./sbin/resolvconf base-resolvconf-root ./sbin/restore base-sysutil-root ./sbin/rndctl base-sysutil-root @@ -1477,7 +1477,7 @@ ./usr/sbin/dtrace base-debug-bin dtrace ./usr/sbin/dtruss base-debug-bin dtrace ./usr/sbin/dumpfs base-sysutil-bin -./usr/sbin/dumplfs base-sysutil-bin +./usr/sbin/dumplfs base-sysutil-bin lfs ./usr/sbin/eaytest base-obsolete obsolete ./usr/sbin/editmap base-obsolete obsolete ./usr/sbin/edquota base-sysutil-bin @@ -1721,7 +1721,7 @@ ./usr/sbin/rump_ext2fs base-puffs-bin rump ./usr/sbin/rump_ffs base-puffs-bin rump ./usr/sbin/rump_hfs base-puffs-bin rump -./usr/sbin/rump_lfs base-puffs-bin rump +./usr/sbin/rump_lfs base-puffs-bin rump,lfs ./usr/sbin/rump_msdos base-puffs-bin rump ./usr/sbin/rump_nfs base-puffs-bin rump ./usr/sbin/rump_ntfs base-puffs-bin rump diff --git a/distrib/sets/lists/base/shl.mi b/distrib/sets/lists/base/shl.mi index b788644be43..1c087a5a756 100644 --- a/distrib/sets/lists/base/shl.mi +++ b/distrib/sets/lists/base/shl.mi @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.935 2022/04/15 14:01:19 christos Exp $ +# $NetBSD: shl.mi,v 1.936 2022/05/27 07:28:21 nia Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -666,9 +666,9 @@ ./usr/lib/librumpfs_kernfs.so base-rump-shlib rump ./usr/lib/librumpfs_kernfs.so.0 base-rump-shlib rump ./usr/lib/librumpfs_kernfs.so.0.0 base-rump-shlib rump -./usr/lib/librumpfs_lfs.so base-rump-shlib rump -./usr/lib/librumpfs_lfs.so.0 base-rump-shlib rump -./usr/lib/librumpfs_lfs.so.0.0 base-rump-shlib rump +./usr/lib/librumpfs_lfs.so base-rump-shlib rump,lfs +./usr/lib/librumpfs_lfs.so.0 base-rump-shlib rump,lfs +./usr/lib/librumpfs_lfs.so.0.0 base-rump-shlib rump,lfs ./usr/lib/librumpfs_mfs.so base-rump-shlib rump ./usr/lib/librumpfs_mfs.so.0 base-rump-shlib rump ./usr/lib/librumpfs_mfs.so.0.0 base-rump-shlib rump diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi index 7365d42509a..4c744e8e51f 100644 --- a/distrib/sets/lists/comp/mi +++ b/distrib/sets/lists/comp/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2413 2022/04/09 23:32:52 riastradh Exp $ +# $NetBSD: mi,v 1.2414 2022/05/27 07:28:21 nia Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.comp comp-sys-root @@ -4037,8 +4037,8 @@ ./usr/lib/librumpfs_hfs_p.a comp-c-proflib rump,profile ./usr/lib/librumpfs_kernfs.a comp-c-lib rump ./usr/lib/librumpfs_kernfs_p.a comp-c-proflib rump,profile -./usr/lib/librumpfs_lfs.a comp-c-lib rump -./usr/lib/librumpfs_lfs_p.a comp-c-proflib rump,profile +./usr/lib/librumpfs_lfs.a comp-c-lib rump,lfs +./usr/lib/librumpfs_lfs_p.a comp-c-proflib rump,profile,lfs ./usr/lib/librumpfs_mfs.a comp-c-lib rump ./usr/lib/librumpfs_mfs_p.a comp-c-proflib rump,profile ./usr/lib/librumpfs_msdos.a comp-c-lib rump diff --git a/distrib/sets/lists/debug/mi b/distrib/sets/lists/debug/mi index ea73aa908af..3e47f1840f5 100644 --- a/distrib/sets/lists/debug/mi +++ b/distrib/sets/lists/debug/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.380 2022/05/25 21:25:46 nia Exp $ +# $NetBSD: mi,v 1.381 2022/05/27 07:28:22 nia Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib comp-sys-usr compatdir ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile @@ -323,7 +323,7 @@ ./usr/libdata/debug/bin/systrace.debug comp-obsolete obsolete ./usr/libdata/debug/bin/tar.debug comp-util-debug debug,bsdtar ./usr/libdata/debug/bin/test.debug comp-util-debug debug -./usr/libdata/debug/libexec/lfs_cleanerd.debug comp-sysutil-debug debug +./usr/libdata/debug/libexec/lfs_cleanerd.debug comp-sysutil-debug debug,lfs ./usr/libdata/debug/netbsd comp-sysutil-debug debug,kernel_dir ./usr/libdata/debug/netbsd-@CONFIG@.debug comp-sysutil-debug debug ./usr/libdata/debug/sbin/amrctl.debug comp-sysutil-debug debug @@ -353,12 +353,12 @@ ./usr/libdata/debug/sbin/dmsetup.debug comp-sysutil-debug lvm,debug ./usr/libdata/debug/sbin/drvctl.debug comp-sysutil-debug debug ./usr/libdata/debug/sbin/dump.debug comp-sysutil-debug debug -./usr/libdata/debug/sbin/dump_lfs.debug comp-sysutil-debug debug +./usr/libdata/debug/sbin/dump_lfs.debug comp-sysutil-debug lfs,debug ./usr/libdata/debug/sbin/fdisk.debug comp-sysutil-debug debug ./usr/libdata/debug/sbin/fsck.debug comp-sysutil-debug debug ./usr/libdata/debug/sbin/fsck_ext2fs.debug comp-ext2fs-debug debug ./usr/libdata/debug/sbin/fsck_ffs.debug comp-sysutil-debug debug -./usr/libdata/debug/sbin/fsck_lfs.debug comp-sysutil-debug debug +./usr/libdata/debug/sbin/fsck_lfs.debug comp-sysutil-debug lfs,debug ./usr/libdata/debug/sbin/fsck_msdos.debug comp-sysutil-debug debug ./usr/libdata/debug/sbin/fsck_udf.debug comp-sysutil-debug debug ./usr/libdata/debug/sbin/fsck_v7fs.debug comp-sysutil-debug debug @@ -389,7 +389,7 @@ ./usr/libdata/debug/sbin/mount_filecore.debug comp-filecorefs-debug debug ./usr/libdata/debug/sbin/mount_hfs.debug comp-hfs-debug debug ./usr/libdata/debug/sbin/mount_kernfs.debug comp-sysutil-debug debug -./usr/libdata/debug/sbin/mount_lfs.debug comp-sysutil-debug debug +./usr/libdata/debug/sbin/mount_lfs.debug comp-sysutil-debug lfs,debug ./usr/libdata/debug/sbin/mount_msdos.debug comp-sysutil-debug debug ./usr/libdata/debug/sbin/mount_nfs.debug comp-nfsclient-debug debug ./usr/libdata/debug/sbin/mount_nilfs.debug comp-sysutil-debug debug @@ -410,7 +410,7 @@ ./usr/libdata/debug/sbin/mount_v7fs.debug comp-sysutil-debug debug ./usr/libdata/debug/sbin/newfs.debug comp-sysutil-debug debug ./usr/libdata/debug/sbin/newfs_ext2fs.debug comp-sysutil-debug debug -./usr/libdata/debug/sbin/newfs_lfs.debug comp-sysutil-debug debug +./usr/libdata/debug/sbin/newfs_lfs.debug comp-sysutil-debug lfs,debug ./usr/libdata/debug/sbin/newfs_msdos.debug comp-sysutil-debug debug ./usr/libdata/debug/sbin/newfs_sysvbfs.debug comp-sysutil-debug debug ./usr/libdata/debug/sbin/newfs_udf.debug comp-sysutil-debug debug @@ -428,7 +428,7 @@ ./usr/libdata/debug/sbin/rcorder.debug comp-sysutil-debug debug ./usr/libdata/debug/sbin/reboot.debug comp-sysutil-debug debug ./usr/libdata/debug/sbin/resize_ffs.debug comp-sysutil-debug debug -./usr/libdata/debug/sbin/resize_lfs.debug comp-sysutil-debug debug +./usr/libdata/debug/sbin/resize_lfs.debug comp-sysutil-debug lfs,debug ./usr/libdata/debug/sbin/restore.debug comp-sysutil-debug debug ./usr/libdata/debug/sbin/rndctl.debug comp-sysutil-debug debug ./usr/libdata/debug/sbin/route.debug comp-netutil-debug debug @@ -1102,7 +1102,7 @@ ./usr/libdata/debug/usr/sbin/dtmfdecode.debug comp-obsolete obsolete ./usr/libdata/debug/usr/sbin/dtrace.debug comp-util-debug dtrace,debug ./usr/libdata/debug/usr/sbin/dumpfs.debug comp-sysutil-debug debug -./usr/libdata/debug/usr/sbin/dumplfs.debug comp-sysutil-debug debug +./usr/libdata/debug/usr/sbin/dumplfs.debug comp-sysutil-debug lfs,debug ./usr/libdata/debug/usr/sbin/edquota.debug comp-sysutil-debug debug ./usr/libdata/debug/usr/sbin/envstat.debug comp-sysutil-debug debug ./usr/libdata/debug/usr/sbin/eshconfig.debug comp-obsolete obsolete @@ -1295,7 +1295,7 @@ ./usr/libdata/debug/usr/sbin/rump_ext2fs.debug comp-puffs-debug debug,rump ./usr/libdata/debug/usr/sbin/rump_ffs.debug comp-puffs-debug debug,rump ./usr/libdata/debug/usr/sbin/rump_hfs.debug comp-puffs-debug debug,rump -./usr/libdata/debug/usr/sbin/rump_lfs.debug comp-puffs-debug debug,rump +./usr/libdata/debug/usr/sbin/rump_lfs.debug comp-puffs-debug debug,rump,lfs ./usr/libdata/debug/usr/sbin/rump_msdos.debug comp-puffs-debug debug,rump ./usr/libdata/debug/usr/sbin/rump_nfs.debug comp-puffs-debug debug,rump ./usr/libdata/debug/usr/sbin/rump_ntfs.debug comp-puffs-debug debug,rump @@ -1692,8 +1692,8 @@ ./usr/libdata/debug/usr/tests/fs/fifofs/t_fifo.debug tests-fs-debug debug,atf,rump ./usr/libdata/debug/usr/tests/fs/hfs/t_pathconvert.debug tests-fs-debug debug,atf,rump ./usr/libdata/debug/usr/tests/fs/kernfs/t_basic.debug tests-fs-debug debug,atf,rump -./usr/libdata/debug/usr/tests/fs/lfs/t_pr.debug tests-fs-debug debug,atf,rump -./usr/libdata/debug/usr/tests/fs/lfs/t_rfw.debug tests-fs-debug debug,atf,rump +./usr/libdata/debug/usr/tests/fs/lfs/t_pr.debug tests-fs-debug debug,atf,rump,lfs +./usr/libdata/debug/usr/tests/fs/lfs/t_rfw.debug tests-fs-debug debug,atf,rump,lfs ./usr/libdata/debug/usr/tests/fs/msdosfs/t_snapshot.debug tests-fs-debug debug,atf,rump ./usr/libdata/debug/usr/tests/fs/nfs/nfsservice/rumpnfsd.debug tests-fs-debug debug,atf,rump ./usr/libdata/debug/usr/tests/fs/nfs/t_mountd.debug tests-fs-debug debug,atf,rump diff --git a/distrib/sets/lists/debug/shl.mi b/distrib/sets/lists/debug/shl.mi index 61e714232a1..ed57e1f8b55 100644 --- a/distrib/sets/lists/debug/shl.mi +++ b/distrib/sets/lists/debug/shl.mi @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.292 2022/04/15 14:01:19 christos Exp $ +# $NetBSD: shl.mi,v 1.293 2022/05/27 07:28:22 nia Exp $ ./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils ./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir ./usr/libdata/debug/lib/libavl.so.0.0.debug comp-zfs-debug debug,dynamicroot,zfs @@ -240,7 +240,7 @@ ./usr/libdata/debug/usr/lib/librumpfs_ffs.so.0.0.debug comp-rump-debug debug,rump ./usr/libdata/debug/usr/lib/librumpfs_hfs.so.0.0.debug comp-rump-debug debug,rump ./usr/libdata/debug/usr/lib/librumpfs_kernfs.so.0.0.debug comp-rump-debug debug,rump -./usr/libdata/debug/usr/lib/librumpfs_lfs.so.0.0.debug comp-rump-debug debug,rump +./usr/libdata/debug/usr/lib/librumpfs_lfs.so.0.0.debug comp-rump-debug debug,rump,lfs ./usr/libdata/debug/usr/lib/librumpfs_mfs.so.0.0.debug comp-rump-debug debug,rump ./usr/libdata/debug/usr/lib/librumpfs_msdos.so.0.0.debug comp-rump-debug debug,rump ./usr/libdata/debug/usr/lib/librumpfs_nfs.so.0.0.debug comp-rump-debug debug,rump diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi index 427b3cf8edd..c3f8382570e 100644 --- a/distrib/sets/lists/man/mi +++ b/distrib/sets/lists/man/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1742 2022/05/25 21:25:46 nia Exp $ +# $NetBSD: mi,v 1.1743 2022/05/27 07:28:22 nia Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -2583,9 +2583,9 @@ ./usr/share/man/cat8/dreamcast/makedev.0 man-obsolete obsolete ./usr/share/man/cat8/drvctl.0 man-sysutil-catman .cat ./usr/share/man/cat8/dump.0 man-sysutil-catman .cat -./usr/share/man/cat8/dump_lfs.0 man-sysutil-catman .cat +./usr/share/man/cat8/dump_lfs.0 man-sysutil-catman lfs,.cat ./usr/share/man/cat8/dumpfs.0 man-sysutil-catman .cat -./usr/share/man/cat8/dumplfs.0 man-sysutil-catman .cat +./usr/share/man/cat8/dumplfs.0 man-sysutil-catman lfs,.cat ./usr/share/man/cat8/editmap.0 man-obsolete obsolete ./usr/share/man/cat8/edquota.0 man-sysutil-catman .cat ./usr/share/man/cat8/eeprom.0 man-sysutil-catman .cat @@ -2624,7 +2624,7 @@ ./usr/share/man/cat8/fsck.0 man-sysutil-catman .cat ./usr/share/man/cat8/fsck_ext2fs.0 man-ext2fs-catman .cat ./usr/share/man/cat8/fsck_ffs.0 man-sysutil-catman .cat -./usr/share/man/cat8/fsck_lfs.0 man-sysutil-catman .cat +./usr/share/man/cat8/fsck_lfs.0 man-sysutil-catman lfs,.cat ./usr/share/man/cat8/fsck_msdos.0 man-sysutil-catman .cat ./usr/share/man/cat8/fsck_udf.0 man-sysutil-catman .cat ./usr/share/man/cat8/fsck_v7fs.0 man-sysutil-catman .cat @@ -2761,7 +2761,7 @@ ./usr/share/man/cat8/lastlogin.0 man-sysutil-catman .cat ./usr/share/man/cat8/ldconfig.0 man-sysutil-catman .cat ./usr/share/man/cat8/ldpd.0 man-router-catman .cat -./usr/share/man/cat8/lfs_cleanerd.0 man-sysutil-catman .cat +./usr/share/man/cat8/lfs_cleanerd.0 man-sysutil-catman lfs,.cat ./usr/share/man/cat8/link.0 man-sysutil-catman .cat ./usr/share/man/cat8/lmcconfig.0 man-obsolete obsolete ./usr/share/man/cat8/lmcctl.0 man-obsolete obsolete @@ -2848,7 +2848,7 @@ ./usr/share/man/cat8/mount_hfs.0 man-hfs-catman .cat ./usr/share/man/cat8/mount_hfsp.0 man-obsolete obsolete ./usr/share/man/cat8/mount_kernfs.0 man-sysutil-catman .cat -./usr/share/man/cat8/mount_lfs.0 man-sysutil-catman .cat +./usr/share/man/cat8/mount_lfs.0 man-sysutil-catman lfs,.cat ./usr/share/man/cat8/mount_mfs.0 man-sysutil-catman .cat ./usr/share/man/cat8/mount_msdos.0 man-sysutil-catman .cat ./usr/share/man/cat8/mount_nfs.0 man-nfsclient-catman .cat @@ -2907,7 +2907,7 @@ ./usr/share/man/cat8/newbtconf.0 man-sysutil-catman .cat ./usr/share/man/cat8/newfs.0 man-sysutil-catman .cat ./usr/share/man/cat8/newfs_ext2fs.0 man-sysutil-catman .cat -./usr/share/man/cat8/newfs_lfs.0 man-sysutil-catman .cat +./usr/share/man/cat8/newfs_lfs.0 man-sysutil-catman lfs,.cat ./usr/share/man/cat8/newfs_msdos.0 man-sysutil-catman .cat ./usr/share/man/cat8/newfs_sysvbfs.0 man-sysutil-catman .cat ./usr/share/man/cat8/newfs_udf.0 man-sysutil-catman .cat @@ -3061,13 +3061,13 @@ ./usr/share/man/cat8/rdconfig.0 man-obsolete obsolete ./usr/share/man/cat8/rdisc.0 man-netutil-catman .cat ./usr/share/man/cat8/rdump.0 man-netutil-catman .cat -./usr/share/man/cat8/rdump_lfs.0 man-netutil-catman .cat +./usr/share/man/cat8/rdump_lfs.0 man-netutil-catman lfs,.cat ./usr/share/man/cat8/reboot.0 man-sysutil-catman .cat ./usr/share/man/cat8/renice.0 man-sysutil-catman .cat ./usr/share/man/cat8/repquota.0 man-sysutil-catman .cat ./usr/share/man/cat8/rescue.0 man-sysutil-catman .cat ./usr/share/man/cat8/resize_ffs.0 man-sysutil-catman .cat -./usr/share/man/cat8/resize_lfs.0 man-sysutil-catman .cat +./usr/share/man/cat8/resize_lfs.0 man-sysutil-catman lfs,.cat ./usr/share/man/cat8/resolvconf.0 man-resolvconf-catman .cat ./usr/share/man/cat8/restore.0 man-sysutil-catman .cat ./usr/share/man/cat8/revnetgroup.0 man-nis-catman yp,.cat @@ -3109,7 +3109,7 @@ ./usr/share/man/cat8/rump_ext2fs.0 man-puffs-catman .cat,rump ./usr/share/man/cat8/rump_ffs.0 man-puffs-catman .cat,rump ./usr/share/man/cat8/rump_hfs.0 man-puffs-catman .cat,rump -./usr/share/man/cat8/rump_lfs.0 man-puffs-catman .cat,rump +./usr/share/man/cat8/rump_lfs.0 man-puffs-catman lfs,.cat,rump ./usr/share/man/cat8/rump_msdos.0 man-puffs-catman .cat,rump ./usr/share/man/cat8/rump_nfs.0 man-puffs-catman .cat,rump ./usr/share/man/cat8/rump_ntfs.0 man-puffs-catman .cat,rump @@ -5695,9 +5695,9 @@ ./usr/share/man/html8/dreamcast/boot.html man-sysutil-htmlman html ./usr/share/man/html8/drvctl.html man-sysutil-htmlman html ./usr/share/man/html8/dump.html man-sysutil-htmlman html -./usr/share/man/html8/dump_lfs.html man-sysutil-htmlman html +./usr/share/man/html8/dump_lfs.html man-sysutil-htmlman lfs,html ./usr/share/man/html8/dumpfs.html man-sysutil-htmlman html -./usr/share/man/html8/dumplfs.html man-sysutil-htmlman html +./usr/share/man/html8/dumplfs.html man-sysutil-htmlman lfs,html ./usr/share/man/html8/edquota.html man-sysutil-htmlman html ./usr/share/man/html8/eeprom.html man-sysutil-htmlman html ./usr/share/man/html8/emips/boot.html man-sys-htmlman html @@ -5722,7 +5722,7 @@ ./usr/share/man/html8/fsck.html man-sysutil-htmlman html ./usr/share/man/html8/fsck_ext2fs.html man-ext2fs-htmlman html ./usr/share/man/html8/fsck_ffs.html man-sysutil-htmlman html -./usr/share/man/html8/fsck_lfs.html man-sysutil-htmlman html +./usr/share/man/html8/fsck_lfs.html man-sysutil-htmlman lfs,html ./usr/share/man/html8/fsck_msdos.html man-sysutil-htmlman html ./usr/share/man/html8/fsck_udf.html man-sysutil-htmlman html ./usr/share/man/html8/fsck_v7fs.html man-sysutil-htmlman html @@ -5828,7 +5828,7 @@ ./usr/share/man/html8/lastlogin.html man-sysutil-htmlman html ./usr/share/man/html8/ldconfig.html man-sysutil-htmlman html ./usr/share/man/html8/ldpd.html man-router-htmlman html -./usr/share/man/html8/lfs_cleanerd.html man-sysutil-htmlman html +./usr/share/man/html8/lfs_cleanerd.html man-sysutil-htmlman lfs,html ./usr/share/man/html8/link.html man-sysutil-htmlman html ./usr/share/man/html8/lmcconfig.html man-obsolete obsolete ./usr/share/man/html8/lmtp.html man-postfix-htmlman postfix,html @@ -5900,7 +5900,7 @@ ./usr/share/man/html8/mount_filecore.html man-filecorefs-htmlman html ./usr/share/man/html8/mount_hfs.html man-hfs-htmlman html ./usr/share/man/html8/mount_kernfs.html man-sysutil-htmlman html -./usr/share/man/html8/mount_lfs.html man-sysutil-htmlman html +./usr/share/man/html8/mount_lfs.html man-sysutil-htmlman lfs,html ./usr/share/man/html8/mount_mfs.html man-sysutil-htmlman html ./usr/share/man/html8/mount_msdos.html man-sysutil-htmlman html ./usr/share/man/html8/mount_nfs.html man-nfsclient-htmlman html @@ -5947,7 +5947,7 @@ ./usr/share/man/html8/newbtconf.html man-sysutil-htmlman html ./usr/share/man/html8/newfs.html man-sysutil-htmlman html ./usr/share/man/html8/newfs_ext2fs.html man-sysutil-htmlman html -./usr/share/man/html8/newfs_lfs.html man-sysutil-htmlman html +./usr/share/man/html8/newfs_lfs.html man-sysutil-htmlman lfs,html ./usr/share/man/html8/newfs_msdos.html man-sysutil-htmlman html ./usr/share/man/html8/newfs_sysvbfs.html man-sysutil-htmlman html ./usr/share/man/html8/newfs_udf.html man-sysutil-htmlman html @@ -6066,13 +6066,13 @@ ./usr/share/man/html8/rdate.html man-netutil-htmlman html ./usr/share/man/html8/rdisc.html man-netutil-htmlman html ./usr/share/man/html8/rdump.html man-netutil-htmlman html -./usr/share/man/html8/rdump_lfs.html man-netutil-htmlman html +./usr/share/man/html8/rdump_lfs.html man-netutil-htmlman lfs,html ./usr/share/man/html8/reboot.html man-sysutil-htmlman html ./usr/share/man/html8/renice.html man-sysutil-htmlman html ./usr/share/man/html8/repquota.html man-sysutil-htmlman html ./usr/share/man/html8/rescue.html man-sysutil-htmlman html ./usr/share/man/html8/resize_ffs.html man-sysutil-htmlman html -./usr/share/man/html8/resize_lfs.html man-sysutil-htmlman html +./usr/share/man/html8/resize_lfs.html man-sysutil-htmlman lfs,html ./usr/share/man/html8/resolvconf.html man-resolvconf-htmlman html ./usr/share/man/html8/restore.html man-sysutil-htmlman html ./usr/share/man/html8/revnetgroup.html man-nis-htmlman yp,html @@ -6113,7 +6113,7 @@ ./usr/share/man/html8/rump_ext2fs.html man-puffs-htmlman html,rump ./usr/share/man/html8/rump_ffs.html man-puffs-htmlman html,rump ./usr/share/man/html8/rump_hfs.html man-puffs-htmlman html,rump -./usr/share/man/html8/rump_lfs.html man-puffs-htmlman html,rump +./usr/share/man/html8/rump_lfs.html man-puffs-htmlman lfs,html,rump ./usr/share/man/html8/rump_msdos.html man-puffs-htmlman html,rump ./usr/share/man/html8/rump_nfs.html man-puffs-htmlman html,rump ./usr/share/man/html8/rump_ntfs.html man-puffs-htmlman html,rump @@ -8868,9 +8868,9 @@ ./usr/share/man/man8/dreamcast/makedev.8 man-obsolete obsolete ./usr/share/man/man8/drvctl.8 man-sysutil-man .man ./usr/share/man/man8/dump.8 man-sysutil-man .man -./usr/share/man/man8/dump_lfs.8 man-sysutil-man .man +./usr/share/man/man8/dump_lfs.8 man-sysutil-man lfs,.man ./usr/share/man/man8/dumpfs.8 man-sysutil-man .man -./usr/share/man/man8/dumplfs.8 man-sysutil-man .man +./usr/share/man/man8/dumplfs.8 man-sysutil-man lfs,.man ./usr/share/man/man8/editmap.8 man-obsolete obsolete ./usr/share/man/man8/edquota.8 man-sysutil-man .man ./usr/share/man/man8/eeprom.8 man-sysutil-man .man @@ -8909,7 +8909,7 @@ ./usr/share/man/man8/fsck.8 man-sysutil-man .man ./usr/share/man/man8/fsck_ext2fs.8 man-ext2fs-man .man ./usr/share/man/man8/fsck_ffs.8 man-sysutil-man .man -./usr/share/man/man8/fsck_lfs.8 man-sysutil-man .man +./usr/share/man/man8/fsck_lfs.8 man-sysutil-man lfs,.man ./usr/share/man/man8/fsck_msdos.8 man-sysutil-man .man ./usr/share/man/man8/fsck_udf.8 man-sysutil-man .man ./usr/share/man/man8/fsck_v7fs.8 man-sysutil-man .man @@ -9047,7 +9047,7 @@ ./usr/share/man/man8/lastlogin.8 man-sysutil-man .man ./usr/share/man/man8/ldconfig.8 man-sysutil-man .man ./usr/share/man/man8/ldpd.8 man-router-man .man -./usr/share/man/man8/lfs_cleanerd.8 man-sysutil-man .man +./usr/share/man/man8/lfs_cleanerd.8 man-sysutil-man lfs,.man ./usr/share/man/man8/link.8 man-sysutil-man .man ./usr/share/man/man8/lmcconfig.8 man-obsolete obsolete ./usr/share/man/man8/lmcctl.8 man-obsolete obsolete @@ -9134,7 +9134,7 @@ ./usr/share/man/man8/mount_hfs.8 man-hfs-man .man ./usr/share/man/man8/mount_hfsp.8 man-obsolete obsolete ./usr/share/man/man8/mount_kernfs.8 man-sysutil-man .man -./usr/share/man/man8/mount_lfs.8 man-sysutil-man .man +./usr/share/man/man8/mount_lfs.8 man-sysutil-man lfs,.man ./usr/share/man/man8/mount_mfs.8 man-sysutil-man .man ./usr/share/man/man8/mount_msdos.8 man-sysutil-man .man ./usr/share/man/man8/mount_nfs.8 man-nfsclient-man .man @@ -9193,7 +9193,7 @@ ./usr/share/man/man8/newbtconf.8 man-sysutil-man .man ./usr/share/man/man8/newfs.8 man-sysutil-man .man ./usr/share/man/man8/newfs_ext2fs.8 man-sysutil-man .man -./usr/share/man/man8/newfs_lfs.8 man-sysutil-man .man +./usr/share/man/man8/newfs_lfs.8 man-sysutil-man lfs,.man ./usr/share/man/man8/newfs_msdos.8 man-sysutil-man .man ./usr/share/man/man8/newfs_sysvbfs.8 man-sysutil-man .man ./usr/share/man/man8/newfs_udf.8 man-sysutil-man .man @@ -9347,13 +9347,13 @@ ./usr/share/man/man8/rdconfig.8 man-obsolete obsolete ./usr/share/man/man8/rdisc.8 man-netutil-man .man ./usr/share/man/man8/rdump.8 man-netutil-man .man -./usr/share/man/man8/rdump_lfs.8 man-netutil-man .man +./usr/share/man/man8/rdump_lfs.8 man-netutil-man lfs,.man ./usr/share/man/man8/reboot.8 man-sysutil-man .man ./usr/share/man/man8/renice.8 man-sysutil-man .man ./usr/share/man/man8/repquota.8 man-sysutil-man .man ./usr/share/man/man8/rescue.8 man-sysutil-man .man ./usr/share/man/man8/resize_ffs.8 man-sysutil-man .man -./usr/share/man/man8/resize_lfs.8 man-sysutil-man .man +./usr/share/man/man8/resize_lfs.8 man-sysutil-man lfs,.man ./usr/share/man/man8/resolvconf.8 man-resolvconf-man .man ./usr/share/man/man8/restore.8 man-sysutil-man .man ./usr/share/man/man8/revnetgroup.8 man-nis-man yp,.man @@ -9395,7 +9395,7 @@ ./usr/share/man/man8/rump_ext2fs.8 man-puffs-man .man,rump ./usr/share/man/man8/rump_ffs.8 man-puffs-man .man,rump ./usr/share/man/man8/rump_hfs.8 man-puffs-man .man,rump -./usr/share/man/man8/rump_lfs.8 man-puffs-man .man,rump +./usr/share/man/man8/rump_lfs.8 man-puffs-man lfs,.man,rump ./usr/share/man/man8/rump_msdos.8 man-puffs-man .man,rump ./usr/share/man/man8/rump_nfs.8 man-puffs-man .man,rump ./usr/share/man/man8/rump_ntfs.8 man-puffs-man .man,rump diff --git a/distrib/sets/lists/tests/mi b/distrib/sets/lists/tests/mi index 567e09b025c..d1a3d4278e9 100644 --- a/distrib/sets/lists/tests/mi +++ b/distrib/sets/lists/tests/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1207 2022/05/23 22:33:56 rillig Exp $ +# $NetBSD: mi,v 1.1208 2022/05/27 07:28:22 nia Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1507,10 +1507,10 @@ ./usr/tests/fs/kernfs/Kyuafile tests-fs-tests atf,rump,kyua ./usr/tests/fs/kernfs/t_basic tests-fs-tests atf,rump ./usr/tests/fs/lfs tests-fs-tests compattestfile,atf -./usr/tests/fs/lfs/Atffile tests-fs-tests atf,rump -./usr/tests/fs/lfs/Kyuafile tests-fs-tests atf,rump,kyua -./usr/tests/fs/lfs/t_pr tests-fs-tests atf,rump -./usr/tests/fs/lfs/t_rfw tests-fs-tests atf,rump +./usr/tests/fs/lfs/Atffile tests-fs-tests atf,rump,lfs +./usr/tests/fs/lfs/Kyuafile tests-fs-tests atf,rump,kyua,lfs +./usr/tests/fs/lfs/t_pr tests-fs-tests atf,rump,lfs +./usr/tests/fs/lfs/t_rfw tests-fs-tests atf,rump,lfs ./usr/tests/fs/msdosfs tests-fs-tests compattestfile,atf ./usr/tests/fs/msdosfs/Atffile tests-fs-tests atf,rump ./usr/tests/fs/msdosfs/Kyuafile tests-fs-tests atf,rump,kyua diff --git a/libexec/Makefile b/libexec/Makefile index 83364a0e0b6..6cbcacf4dd4 100644 --- a/libexec/Makefile +++ b/libexec/Makefile @@ -1,14 +1,18 @@ -# $NetBSD: Makefile,v 1.61 2012/02/07 19:13:31 joerg Exp $ +# $NetBSD: Makefile,v 1.62 2022/05/27 07:28:20 nia Exp $ # @(#)Makefile 8.1 (Berkeley) 6/4/93 .include <bsd.own.mk> SUBDIR= atrun \ comsat fingerd ftpd getty httpd identd ld.aout_so \ - ld.elf_so lfs_cleanerd mail.local makekey rexecd \ + ld.elf_so mail.local makekey rexecd \ rlogind rshd rpc.rquotad rpc.rstatd rpc.rusersd rpc.rwalld \ rpc.sprayd talkd telnetd tftpd utmp_update +.if ${MKLFS} != "no" +SUBDIR+= lfs_cleanerd +.endif + .if ${MKMAKEMANDB} == "no" SUBDIR+= getNAME makewhatis .endif diff --git a/sbin/Makefile b/sbin/Makefile index 1b3c09b1583..a6d0569b6ec 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.136 2022/04/06 14:20:07 reinoud Exp $ +# $NetBSD: Makefile,v 1.137 2022/05/27 07:28:20 nia Exp $ # @(#)Makefile 8.5 (Berkeley) 3/31/94 # Not ported: XNSrouted enpload scsiformat startslip @@ -19,7 +19,6 @@ SUBDIR= amrctl apmlabel atactl badsect bioctl blkdiscard brconfig \ # support for various file systems SUBDIR+= newfs_ext2fs fsck_ext2fs SUBDIR+= newfs fsck_ffs fsdb dump restore clri tunefs resize_ffs -SUBDIR+= newfs_lfs fsck_lfs dump_lfs resize_lfs SUBDIR+= newfs_msdos fsck_msdos SUBDIR+= newfs_sysvbfs SUBDIR+= newfs_udf fsck_udf @@ -35,7 +34,6 @@ SUBDIR+= mount_filecore SUBDIR+= mount_ffs SUBDIR+= mount_hfs SUBDIR+= mount_kernfs -SUBDIR+= mount_lfs SUBDIR+= mount_msdos SUBDIR+= mount_udf SUBDIR+= mount_nfs @@ -62,6 +60,11 @@ SUBDIR+= ping6 SUBDIR+= iscsictl iscsid .endif +.if (${MKLFS} != "no") +SUBDIR+= newfs_lfs fsck_lfs dump_lfs resize_lfs +SUBDIR+= mount_lfs +.endif + # IPsec SUBDIR+= setkey diff --git a/share/mk/bsd.README b/share/mk/bsd.README index 6f956e47386..2577b5a4e5a 100644 --- a/share/mk/bsd.README +++ b/share/mk/bsd.README @@ -1,4 +1,4 @@ -# $NetBSD: bsd.README,v 1.433 2022/05/26 06:23:57 nia Exp $ +# $NetBSD: bsd.README,v 1.434 2022/05/27 07:28:21 nia Exp $ # @(#)bsd.README 8.2 (Berkeley) 4/2/94 This is the README file for the make "include" files for the NetBSD @@ -303,6 +303,11 @@ MKLDAP If "no", disables building of LDAP infrastructure (libraries and support programs). Default: yes +MKLFS If "no", disables building and installation of programs for + the log-structured file system - mount_lfs(8), newfs_lfs(8), + dumplfs(8), etc. + Default: yes + MKLIBCSANITIZER If "yes", use the selected sanitizer inside libc to compile userland programs and libraries as defined in USE_LIBCSANITIZER, which defaults to "undefined". diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index ffa075b92c8..3cfb0aaa819 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.1279 2022/05/25 21:25:47 nia Exp $ +# $NetBSD: bsd.own.mk,v 1.1280 2022/05/27 07:28:21 nia Exp $ # This needs to be before bsd.init.mk .if defined(BSD_MK_COMPAT_FILE) @@ -1158,6 +1158,7 @@ _MKVARS.yes= \ MKIEEEFP MKINET6 MKINFO MKIPFILTER MKISCSI \ MKKERBEROS \ MKKMOD \ + MKLFS \ MKLDAP MKLIBSTDCXX MKLINKLIB MKLVM \ MKMAN MKMANDOC \ MKMROUTING \ diff --git a/tests/fs/Makefile b/tests/fs/Makefile index eb53869041b..95c89686c72 100644 --- a/tests/fs/Makefile +++ b/tests/fs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2014/05/10 14:15:25 martin Exp $ +# $NetBSD: Makefile,v 1.24 2022/05/27 07:28:21 nia Exp $ .include <bsd.own.mk> @@ -6,10 +6,14 @@ TESTSDIR= ${TESTSBASE}/fs SUBDIR+= common .WAIT -TESTS_SUBDIRS+= ffs fifofs hfs kernfs lfs msdosfs nfs nullfs psshfs ptyfs puffs +TESTS_SUBDIRS+= ffs fifofs hfs kernfs msdosfs nfs nullfs psshfs ptyfs puffs TESTS_SUBDIRS+= tmpfs umapfs union TESTS_SUBDIRS+= vfs cd9660 +.if ${MKLFS} != "no" +TESTS_SUBDIRS+= lfs +.endif + .if ${MKZFS} != "no" TESTS_SUBDIRS+= zfs .endif diff --git a/tests/fs/vfs/Makefile b/tests/fs/vfs/Makefile index 6ebac6bd0f5..721f1e282ef 100644 --- a/tests/fs/vfs/Makefile +++ b/tests/fs/vfs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2022/03/28 20:51:04 christos Exp $ +# $NetBSD: Makefile,v 1.29 2022/05/27 07:28:21 nia Exp $ # .include <bsd.own.mk> @@ -30,7 +30,6 @@ LDADD+=-lrumpnet_shmif -lrumpnet -lrumpnet_net -lrumpnet_netinet# TCP/IP LDADD+=-lrumpfs_nfs # NFS LDADD+=-lrumpfs_ext2fs # ext2fs LDADD+=-lrumpfs_ffs # ffs -LDADD+=-lrumpfs_lfs # lfs LDADD+=-lrumpfs_msdos # msdos LDADD+=-lrumpfs_syspuffs # puffs LDADD+=-lrumpdev_putter -lrumpdev # \ putter @@ -51,6 +50,10 @@ LDADD+=-lrumpnet # static linking LDADD+=-lutil +.if (${MKLFS} != "no") +LDADD+=-lrumpfs_lfs +.endif + .if (${MKZFS} != "no") LDADD+=-lrumpfs_zfs -lrumpkern_solaris -lrumpdev_rnd -lrumpkern_sysproxy CPPFLAGS+=-DWANT_ZFS_TESTS diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 8211d28534f..f9ac403b17a 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.288 2022/05/25 21:25:47 nia Exp $ +# $NetBSD: Makefile,v 1.289 2022/05/27 07:28:21 nia Exp $ # from: @(#)Makefile 5.20 (Berkeley) 6/12/93 .include <bsd.own.mk> @@ -6,7 +6,7 @@ SUBDIR= ac accton acpitools altq apm apmd arp autofs \ bad144 bootp bta2dpd btattach btconfig btdevctl bthcid btpand catman \ chroot cnwctl cpuctl crash \ - dev_mkdb diskpart dumpfs dumplfs \ + dev_mkdb diskpart dumpfs \ edquota eeprom envstat etcupdate extattrctl \ flashctl fssconfig fstyp fusermount fwctl \ gpioctl grfconfig gspa \ @@ -34,6 +34,10 @@ SUBDIR= ac accton acpitools altq apm apmd arp autofs \ wsconscfg wsfontload wsmoused wsmuxctl \ zdump zic +.if ${MKLFS} != "no" +SUBDIR+= dumplfs +.endif + .if ${MKMAKEMANDB} != "no" SUBDIR+= makemandb .endif diff --git a/usr.sbin/puffs/Makefile b/usr.sbin/puffs/Makefile index ee965096b8a..03ed583678d 100644 --- a/usr.sbin/puffs/Makefile +++ b/usr.sbin/puffs/Makefile @@ -1,14 +1,18 @@ -# $NetBSD: Makefile,v 1.19 2020/04/04 17:05:06 christos Exp $ +# $NetBSD: Makefile,v 1.20 2022/05/27 07:28:21 nia Exp $ .include <bsd.own.mk> SUBDIR= mount_9p mount_psshfs mount_sysctlfs .if (${MKRUMP} != "no") -SUBDIR+=rump_cd9660 rump_efs rump_ext2fs rump_ffs rump_hfs rump_lfs +SUBDIR+=rump_cd9660 rump_efs rump_ext2fs rump_ffs rump_hfs SUBDIR+=rump_msdos rump_nfs rump_ntfs rump_syspuffs rump_sysvbfs SUBDIR+=rump_tmpfs rump_udf rump_v7fs +. if ${MKLFS} != "no" +SUBDIR+=rump_lfs +. endif + # # The following are not built by default # |
