Current-Users archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
MKRUMP? (was Re: librump/vfs_wapbl doesn't compile)
Recent rump build failures inspired me to add a MKRUMP build variable.
Rump stuff is well documented in sys/rump/README.dirs, so I'm wondering
why this hasn't been done before. MKPUFFS and this MKRUMP have a few
things in common, but puffs doesn't have compilation issues at the
moment and rump does. This has been tested when cross-compiling to
evbarm on Linux.
-Mikko
diff --git a/Makefile b/Makefile
index 7b3ff6d..6b7f44c 100644
--- a/Makefile
+++ b/Makefile
@@ -234,7 +234,9 @@ BUILDTARGET+= do-libpcc
.endif
BUILDTARGETS+= do-lib-libc
BUILDTARGETS+= do-lib do-gnu-lib do-external-lib
+.if ${MKRUMP} != "no"
BUILDTARGETS+= do-sys-rump-fs-lib do-sys-rump-net-lib
+.endif
.if ${MKCOMPAT} != "no"
BUILDTARGETS+= do-compat-lib-csu
BUILDTARGETS+= do-compat-libgcc
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index f3382cc..795068d 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -134,8 +134,8 @@
./usr/lib/i386/libcrypto.so.4.1 base-compat-shlib
compat,pic
./usr/lib/i386/librefuse.so.0 base-compat-shlib
compat,pic,puffs
./usr/lib/i386/librefuse.so.0.0 base-compat-shlib
compat,pic,puffs
-./usr/lib/i386/libp2k.so.0 base-compat-shlib
compat,pic,puffs
-./usr/lib/i386/libp2k.so.0.0 base-compat-shlib
compat,pic,puffs
+./usr/lib/i386/libp2k.so.0 base-compat-shlib
compat,pic,puffs,rump
+./usr/lib/i386/libp2k.so.0.0 base-compat-shlib
compat,pic,puffs,rump
./usr/lib/i386/libcurses.so.6 base-compat-shlib
compat,pic
./usr/lib/i386/libcurses.so.6.4 base-compat-shlib
compat,pic
./usr/lib/i386/libdes.so.7 base-compat-shlib
compat,pic
@@ -230,12 +230,12 @@
./usr/lib/i386/librpcsvc.so.0.0 base-compat-shlib
compat,pic
./usr/lib/i386/librt.so.0 base-compat-shlib
compat,pic
./usr/lib/i386/librt.so.0.0 base-compat-shlib
compat,pic
-./usr/lib/i386/librump.so.0 base-compat-shlib
compat,pic
-./usr/lib/i386/librump.so.0.0 base-compat-shlib
compat,pic
-./usr/lib/i386/librumpnet.so.0 base-compat-shlib
compat,pic
-./usr/lib/i386/librumpnet.so.0.0 base-compat-shlib
compat,pic
-./usr/lib/i386/librumpuser.so.0 base-compat-shlib
compat,pic
-./usr/lib/i386/librumpuser.so.0.0 base-compat-shlib
compat,pic
+./usr/lib/i386/librump.so.0 base-compat-shlib
compat,pic,rump
+./usr/lib/i386/librump.so.0.0 base-compat-shlib
compat,pic,rump
+./usr/lib/i386/librumpnet.so.0 base-compat-shlib
compat,pic,rump
+./usr/lib/i386/librumpnet.so.0.0 base-compat-shlib
compat,pic,rump
+./usr/lib/i386/librumpuser.so.0 base-compat-shlib
compat,pic,rump
+./usr/lib/i386/librumpuser.so.0.0 base-compat-shlib
compat,pic,rump
./usr/lib/i386/libsdp.so.2 base-compat-shlib
compat,pic
./usr/lib/i386/libsdp.so.2.0 base-compat-shlib
compat,pic
./usr/lib/i386/libskey.so.1 base-compat-shlib
compat,pic
@@ -256,8 +256,8 @@
./usr/lib/i386/libtermcap.so.0.6 base-compat-shlib
compat,pic
./usr/lib/i386/libtermlib.so.0 base-compat-shlib
compat,pic
./usr/lib/i386/libtermlib.so.0.6 base-compat-shlib
compat,pic
-./usr/lib/i386/libukfs.so.0 base-compat-shlib
compat,pic
-./usr/lib/i386/libukfs.so.0.0 base-compat-shlib
compat,pic
+./usr/lib/i386/libukfs.so.0 base-compat-shlib
compat,pic,rump
+./usr/lib/i386/libukfs.so.0.0 base-compat-shlib
compat,pic,rump
./usr/lib/i386/libusbhid.so.1 base-compat-shlib
compat,pic
./usr/lib/i386/libusbhid.so.1.0 base-compat-shlib
compat,pic
./usr/lib/i386/libutil.so.7 base-compat-shlib
compat,pic
diff --git a/distrib/sets/lists/base/md.sparc64
b/distrib/sets/lists/base/md.sparc64
index 5f87778..ca8c5b9 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -139,8 +139,8 @@
./usr/lib/sparc/libpam.so.1.0 base-compat-shlib
compat,pic
./usr/lib/sparc/librefuse.so.0 base-compat-shlib
compat,pic,puffs
./usr/lib/sparc/librefuse.so.0.0 base-compat-shlib
compat,pic,puffs
-./usr/lib/sparc/libp2k.so.0 base-compat-shlib
compat,pic,puffs
-./usr/lib/sparc/libp2k.so.0.0 base-compat-shlib
compat,pic,puffs
+./usr/lib/sparc/libp2k.so.0 base-compat-shlib
compat,pic,puffs,rump
+./usr/lib/sparc/libp2k.so.0.0 base-compat-shlib
compat,pic,puffs,rump
./usr/lib/sparc/libpcap.so.2 base-compat-shlib
compat,pic
./usr/lib/sparc/libpcap.so.2.0 base-compat-shlib
compat,pic
./usr/lib/sparc/libpci.so.1 base-compat-shlib
compat,pic
@@ -165,12 +165,12 @@
./usr/lib/sparc/librpcsvc.so.0.0 base-compat-shlib
compat,pic
./usr/lib/sparc/librt.so.0 base-compat-shlib
compat,pic
./usr/lib/sparc/librt.so.0.0 base-compat-shlib
compat,pic
-./usr/lib/sparc/librump.so.0 base-compat-shlib
compat,pic
-./usr/lib/sparc/librump.so.0.0 base-compat-shlib
compat,pic
-./usr/lib/sparc/librumpnet.so.0 base-compat-shlib
compat,pic
-./usr/lib/sparc/librumpnet.so.0.0 base-compat-shlib
compat,pic
-./usr/lib/sparc/librumpuser.so.0 base-compat-shlib
compat,pic
-./usr/lib/sparc/librumpuser.so.0.0 base-compat-shlib
compat,pic
+./usr/lib/sparc/librump.so.0 base-compat-shlib
compat,pic,rump
+./usr/lib/sparc/librump.so.0.0 base-compat-shlib
compat,pic,rump
+./usr/lib/sparc/librumpnet.so.0 base-compat-shlib
compat,pic,rump
+./usr/lib/sparc/librumpnet.so.0.0 base-compat-shlib
compat,pic,rump
+./usr/lib/sparc/librumpuser.so.0 base-compat-shlib
compat,pic,rump
+./usr/lib/sparc/librumpuser.so.0.0 base-compat-shlib
compat,pic,rump
./usr/lib/sparc/libsdp.so.2 base-compat-shlib
compat,pic
./usr/lib/sparc/libsdp.so.2.0 base-compat-shlib
compat,pic
./usr/lib/sparc/libskey.so.1 base-compat-shlib
compat,pic
@@ -191,8 +191,8 @@
./usr/lib/sparc/libtermcap.so.0.6 base-compat-shlib
compat,pic
./usr/lib/sparc/libtermlib.so.0 base-compat-shlib
compat,pic
./usr/lib/sparc/libtermlib.so.0.6 base-compat-shlib
compat,pic
-./usr/lib/sparc/libukfs.so.0 base-compat-shlib
compat,pic
-./usr/lib/sparc/libukfs.so.0.0 base-compat-shlib
compat,pic
+./usr/lib/sparc/libukfs.so.0 base-compat-shlib
compat,pic,rump
+./usr/lib/sparc/libukfs.so.0.0 base-compat-shlib
compat,pic,rump
./usr/lib/sparc/libusbhid.so.1 base-compat-shlib
compat,pic
./usr/lib/sparc/libusbhid.so.1.0 base-compat-shlib
compat,pic
./usr/lib/sparc/libutil.so.7 base-compat-shlib
compat,pic
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index d16d6cb..3d9bfdb 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -1109,7 +1109,7 @@
./usr/include/readline base-c-usr
./usr/include/rpc base-c-usr
./usr/include/rpcsvc base-c-usr
-./usr/include/rump base-c-usr
+./usr/include/rump base-c-usr rump
./usr/include/security base-c-usr
./usr/include/ss base-obsolete obsolete
./usr/include/ssp base-c-usr
@@ -1526,19 +1526,19 @@
./usr/sbin/rtadvd base-router-bin
use_inet6
./usr/sbin/rtquery base-netutil-bin
./usr/sbin/rtsold base-netutil-bin inet6
-./usr/sbin/rump_cd9660 base-miscfs-bin puffs
-./usr/sbin/rump_efs base-miscfs-bin puffs
-./usr/sbin/rump_ext2fs base-miscfs-bin puffs
-./usr/sbin/rump_ffs base-miscfs-bin puffs
-./usr/sbin/rump_hfs base-miscfs-bin puffs
-./usr/sbin/rump_lfs base-miscfs-bin puffs
-./usr/sbin/rump_msdos base-miscfs-bin puffs
-./usr/sbin/rump_nfs base-miscfs-bin puffs
-./usr/sbin/rump_ntfs base-miscfs-bin puffs
-./usr/sbin/rump_syspuffs base-miscfs-bin puffs
-./usr/sbin/rump_sysvbfs base-miscfs-bin
puffs
-./usr/sbin/rump_tmpfs base-miscfs-bin puffs
-./usr/sbin/rump_udf base-miscfs-bin puffs
+./usr/sbin/rump_cd9660 base-miscfs-bin
puffs,rump
+./usr/sbin/rump_efs base-miscfs-bin
puffs,rump
+./usr/sbin/rump_ext2fs base-miscfs-bin
puffs,rump
+./usr/sbin/rump_ffs base-miscfs-bin
puffs,rump
+./usr/sbin/rump_hfs base-miscfs-bin
puffs,rump
+./usr/sbin/rump_lfs base-miscfs-bin
puffs,rump
+./usr/sbin/rump_msdos base-miscfs-bin
puffs,rump
+./usr/sbin/rump_nfs base-miscfs-bin
puffs,rump
+./usr/sbin/rump_ntfs base-miscfs-bin
puffs,rump
+./usr/sbin/rump_syspuffs base-miscfs-bin
puffs,rump
+./usr/sbin/rump_sysvbfs base-miscfs-bin
puffs,rump
+./usr/sbin/rump_tmpfs base-miscfs-bin
puffs,rump
+./usr/sbin/rump_udf base-miscfs-bin
puffs,rump
./usr/sbin/rwhod base-netutil-bin
./usr/sbin/sa base-sysutil-bin
./usr/sbin/screenblank base-sysutil-bin
diff --git a/distrib/sets/lists/base/shl.elf b/distrib/sets/lists/base/shl.elf
index 277b5bf..a5c2e73 100644
--- a/distrib/sets/lists/base/shl.elf
+++ b/distrib/sets/lists/base/shl.elf
@@ -180,8 +180,8 @@
./usr/lib/libobjc.so.2 base-sys-shlib gcc
./usr/lib/libossaudio.so base-sys-shlib
./usr/lib/libossaudio.so.0 base-sys-shlib
-./usr/lib/libp2k.so base-sys-shlib puffs
-./usr/lib/libp2k.so.0 base-sys-shlib puffs
+./usr/lib/libp2k.so base-sys-shlib
puffs,rump
+./usr/lib/libp2k.so.0 base-sys-shlib
puffs,rump
./usr/lib/libpam.so base-sys-shlib pam
./usr/lib/libpam.so.1 base-sys-shlib pam
./usr/lib/libpcap.so base-net-shlib
@@ -210,48 +210,48 @@
./usr/lib/librpcsvc.so.0 base-net-shlib
./usr/lib/librt.so base-sys-shlib
./usr/lib/librt.so.0 base-sys-shlib
-./usr/lib/librump.so base-sys-shlib
-./usr/lib/librump.so.0 base-sys-shlib
-./usr/lib/librumpfs_cd9660.so base-sys-shlib
-./usr/lib/librumpfs_cd9660.so.0 base-sys-shlib
-./usr/lib/librumpfs_efs.so base-sys-shlib
-./usr/lib/librumpfs_efs.so.0 base-sys-shlib
-./usr/lib/librumpfs_ext2fs.so base-sys-shlib
-./usr/lib/librumpfs_ext2fs.so.0 base-sys-shlib
-./usr/lib/librumpfs_ffs.so base-sys-shlib
-./usr/lib/librumpfs_ffs.so.0 base-sys-shlib
-./usr/lib/librumpfs_hfs.so base-sys-shlib
-./usr/lib/librumpfs_hfs.so.0 base-sys-shlib
-./usr/lib/librumpfs_lfs.so base-sys-shlib
-./usr/lib/librumpfs_lfs.so.0 base-sys-shlib
-./usr/lib/librumpfs_msdos.so base-sys-shlib
-./usr/lib/librumpfs_msdos.so.0 base-sys-shlib
-./usr/lib/librumpfs_nfs.so base-sys-shlib
-./usr/lib/librumpfs_nfs.so.0 base-sys-shlib
-./usr/lib/librumpfs_ntfs.so base-sys-shlib
-./usr/lib/librumpfs_ntfs.so.0 base-sys-shlib
-./usr/lib/librumpfs_syspuffs.so base-sys-shlib
-./usr/lib/librumpfs_syspuffs.so.0 base-sys-shlib
-./usr/lib/librumpfs_sysvbfs.so base-sys-shlib
-./usr/lib/librumpfs_sysvbfs.so.0 base-sys-shlib
-./usr/lib/librumpfs_tmpfs.so base-sys-shlib
-./usr/lib/librumpfs_tmpfs.so.0 base-sys-shlib
-./usr/lib/librumpfs_udf.so base-sys-shlib
-./usr/lib/librumpfs_udf.so.0 base-sys-shlib
-./usr/lib/librumpfs_ufs.so base-sys-shlib
-./usr/lib/librumpfs_ufs.so.0 base-sys-shlib
-./usr/lib/librumpnet.so base-sys-shlib
-./usr/lib/librumpnet.so.0 base-sys-shlib
-./usr/lib/librumpnet_net.so base-sys-shlib
-./usr/lib/librumpnet_net.so.0 base-sys-shlib
-./usr/lib/librumpnet_netinet.so base-sys-shlib
-./usr/lib/librumpnet_netinet.so.0 base-sys-shlib
-./usr/lib/librumpnet_sockin.so base-sys-shlib
-./usr/lib/librumpnet_sockin.so.0 base-sys-shlib
-./usr/lib/librumpnet_virtif.so base-sys-shlib
-./usr/lib/librumpnet_virtif.so.0 base-sys-shlib
-./usr/lib/librumpuser.so base-sys-shlib
-./usr/lib/librumpuser.so.0 base-sys-shlib
+./usr/lib/librump.so base-sys-shlib rump
+./usr/lib/librump.so.0 base-sys-shlib rump
+./usr/lib/librumpfs_cd9660.so base-sys-shlib rump
+./usr/lib/librumpfs_cd9660.so.0 base-sys-shlib
rump
+./usr/lib/librumpfs_efs.so base-sys-shlib rump
+./usr/lib/librumpfs_efs.so.0 base-sys-shlib rump
+./usr/lib/librumpfs_ext2fs.so base-sys-shlib rump
+./usr/lib/librumpfs_ext2fs.so.0 base-sys-shlib
rump
+./usr/lib/librumpfs_ffs.so base-sys-shlib rump
+./usr/lib/librumpfs_ffs.so.0 base-sys-shlib rump
+./usr/lib/librumpfs_hfs.so base-sys-shlib rump
+./usr/lib/librumpfs_hfs.so.0 base-sys-shlib rump
+./usr/lib/librumpfs_lfs.so base-sys-shlib rump
+./usr/lib/librumpfs_lfs.so.0 base-sys-shlib rump
+./usr/lib/librumpfs_msdos.so base-sys-shlib rump
+./usr/lib/librumpfs_msdos.so.0 base-sys-shlib rump
+./usr/lib/librumpfs_nfs.so base-sys-shlib rump
+./usr/lib/librumpfs_nfs.so.0 base-sys-shlib rump
+./usr/lib/librumpfs_ntfs.so base-sys-shlib rump
+./usr/lib/librumpfs_ntfs.so.0 base-sys-shlib rump
+./usr/lib/librumpfs_syspuffs.so base-sys-shlib
rump
+./usr/lib/librumpfs_syspuffs.so.0 base-sys-shlib rump
+./usr/lib/librumpfs_sysvbfs.so base-sys-shlib rump
+./usr/lib/librumpfs_sysvbfs.so.0 base-sys-shlib rump
+./usr/lib/librumpfs_tmpfs.so base-sys-shlib rump
+./usr/lib/librumpfs_tmpfs.so.0 base-sys-shlib rump
+./usr/lib/librumpfs_udf.so base-sys-shlib rump
+./usr/lib/librumpfs_udf.so.0 base-sys-shlib rump
+./usr/lib/librumpfs_ufs.so base-sys-shlib rump
+./usr/lib/librumpfs_ufs.so.0 base-sys-shlib rump
+./usr/lib/librumpnet.so base-sys-shlib
rump
+./usr/lib/librumpnet.so.0 base-sys-shlib rump
+./usr/lib/librumpnet_net.so base-sys-shlib rump
+./usr/lib/librumpnet_net.so.0 base-sys-shlib rump
+./usr/lib/librumpnet_netinet.so base-sys-shlib
rump
+./usr/lib/librumpnet_netinet.so.0 base-sys-shlib rump
+./usr/lib/librumpnet_sockin.so base-sys-shlib rump
+./usr/lib/librumpnet_sockin.so.0 base-sys-shlib rump
+./usr/lib/librumpnet_virtif.so base-sys-shlib rump
+./usr/lib/librumpnet_virtif.so.0 base-sys-shlib rump
+./usr/lib/librumpuser.so base-sys-shlib rump
+./usr/lib/librumpuser.so.0 base-sys-shlib rump
./usr/lib/libsdp.so base-sys-shlib
./usr/lib/libsdp.so.2 base-sys-shlib
./usr/lib/libskey.so base-sys-shlib skey
@@ -271,8 +271,8 @@
./usr/lib/libtermcap.so.0 base-sys-shlib
./usr/lib/libtermlib.so base-sys-shlib
./usr/lib/libtermlib.so.0 base-sys-shlib
-./usr/lib/libukfs.so base-sys-shlib
-./usr/lib/libukfs.so.0 base-sys-shlib
+./usr/lib/libukfs.so base-sys-shlib rump
+./usr/lib/libukfs.so.0 base-sys-shlib rump
./usr/lib/libusbhid.so base-sys-shlib
./usr/lib/libusbhid.so.1 base-sys-shlib
./usr/lib/libutil.so base-sys-shlib
diff --git a/distrib/sets/lists/base/shl.mi b/distrib/sets/lists/base/shl.mi
index df84bd7..a34c3e1 100644
--- a/distrib/sets/lists/base/shl.mi
+++ b/distrib/sets/lists/base/shl.mi
@@ -97,7 +97,7 @@
./usr/lib/libobjc.so.2.0 base-sys-shlib gcc=3
./usr/lib/libobjc.so.2.1 base-sys-shlib gcc=4
./usr/lib/libossaudio.so.0.0 base-sys-shlib
-./usr/lib/libp2k.so.0.0 base-sys-shlib
puffs
+./usr/lib/libp2k.so.0.0 base-sys-shlib
puffs,rump
./usr/lib/libpam.so.1.0 base-sys-shlib
pam
./usr/lib/libpcap.so.2.0 base-net-shlib
./usr/lib/libpci.so.1.0 base-sys-shlib
@@ -112,27 +112,27 @@
./usr/lib/libroken.so.13.0 base-krb5-shlib kerberos
./usr/lib/librpcsvc.so.0.0 base-net-shlib
./usr/lib/librt.so.0.0 base-sys-shlib
-./usr/lib/librump.so.0.0 base-sys-shlib
-./usr/lib/librumpfs_cd9660.so.0.0 base-sys-shlib
-./usr/lib/librumpfs_efs.so.0.0 base-sys-shlib
-./usr/lib/librumpfs_ext2fs.so.0.0 base-sys-shlib
-./usr/lib/librumpfs_ffs.so.0.0 base-sys-shlib
-./usr/lib/librumpfs_hfs.so.0.0 base-sys-shlib
-./usr/lib/librumpfs_lfs.so.0.0 base-sys-shlib
-./usr/lib/librumpfs_msdos.so.0.0 base-sys-shlib
-./usr/lib/librumpfs_nfs.so.0.0 base-sys-shlib
-./usr/lib/librumpfs_ntfs.so.0.0 base-sys-shlib
-./usr/lib/librumpfs_syspuffs.so.0.0 base-sys-shlib
-./usr/lib/librumpfs_sysvbfs.so.0.0 base-sys-shlib
-./usr/lib/librumpfs_tmpfs.so.0.0 base-sys-shlib
-./usr/lib/librumpfs_udf.so.0.0 base-sys-shlib
-./usr/lib/librumpfs_ufs.so.0.0 base-sys-shlib
-./usr/lib/librumpnet.so.0.0 base-sys-shlib
-./usr/lib/librumpnet_net.so.0.0 base-sys-shlib
-./usr/lib/librumpnet_netinet.so.0.0 base-sys-shlib
-./usr/lib/librumpnet_sockin.so.0.0 base-sys-shlib
-./usr/lib/librumpnet_virtif.so.0.0 base-sys-shlib
-./usr/lib/librumpuser.so.0.0 base-sys-shlib
+./usr/lib/librump.so.0.0 base-sys-shlib rump
+./usr/lib/librumpfs_cd9660.so.0.0 base-sys-shlib rump
+./usr/lib/librumpfs_efs.so.0.0 base-sys-shlib rump
+./usr/lib/librumpfs_ext2fs.so.0.0 base-sys-shlib rump
+./usr/lib/librumpfs_ffs.so.0.0 base-sys-shlib rump
+./usr/lib/librumpfs_hfs.so.0.0 base-sys-shlib rump
+./usr/lib/librumpfs_lfs.so.0.0 base-sys-shlib rump
+./usr/lib/librumpfs_msdos.so.0.0 base-sys-shlib rump
+./usr/lib/librumpfs_nfs.so.0.0 base-sys-shlib rump
+./usr/lib/librumpfs_ntfs.so.0.0 base-sys-shlib
rump
+./usr/lib/librumpfs_syspuffs.so.0.0 base-sys-shlib rump
+./usr/lib/librumpfs_sysvbfs.so.0.0 base-sys-shlib rump
+./usr/lib/librumpfs_tmpfs.so.0.0 base-sys-shlib rump
+./usr/lib/librumpfs_udf.so.0.0 base-sys-shlib rump
+./usr/lib/librumpfs_ufs.so.0.0 base-sys-shlib rump
+./usr/lib/librumpnet.so.0.0 base-sys-shlib rump
+./usr/lib/librumpnet_net.so.0.0 base-sys-shlib
rump
+./usr/lib/librumpnet_netinet.so.0.0 base-sys-shlib rump
+./usr/lib/librumpnet_sockin.so.0.0 base-sys-shlib rump
+./usr/lib/librumpnet_virtif.so.0.0 base-sys-shlib rump
+./usr/lib/librumpuser.so.0.0 base-sys-shlib rump
./usr/lib/libsdp.so.2.0 base-sys-shlib
./usr/lib/libskey.so.1.0 base-sys-shlib skey
./usr/lib/libsl.so.3.0 base-krb5-shlib kerberos
@@ -143,7 +143,7 @@
./usr/lib/libstdc++.so.6.0 base-sys-shlib gcc=4
./usr/lib/libtermcap.so.0.6 base-sys-shlib
./usr/lib/libtermlib.so.0.6 base-sys-shlib
-./usr/lib/libukfs.so.0.0 base-sys-shlib
+./usr/lib/libukfs.so.0.0 base-sys-shlib rump
./usr/lib/libusbhid.so.1.0 base-sys-shlib
./usr/lib/libutil.so.7.15 base-sys-shlib
./usr/lib/libwrap.so.0.2 base-net-shlib
diff --git a/distrib/sets/lists/comp/md.amd64 b/distrib/sets/lists/comp/md.amd64
index 3227d6a..c7d0e23 100644
--- a/distrib/sets/lists/comp/md.amd64
+++ b/distrib/sets/lists/comp/md.amd64
@@ -538,10 +538,10 @@
./usr/lib/i386/libossaudio.so comp-sys-shlib
compat,pic
./usr/lib/i386/libossaudio_p.a comp-c-proflib
compat,profile
./usr/lib/i386/libossaudio_pic.a comp-c-piclib
compat,pic
-./usr/lib/i386/libp2k.a comp-c-lib
compat,puffs
-./usr/lib/i386/libp2k.so comp-sys-shlib
compat,pic,puffs
-./usr/lib/i386/libp2k_p.a comp-c-proflib
compat,puffs,profile
-./usr/lib/i386/libp2k_pic.a comp-c-piclib
compat,pic,puffs
+./usr/lib/i386/libp2k.a comp-c-lib
compat,puffs,rump
+./usr/lib/i386/libp2k.so comp-sys-shlib
compat,pic,puffs,rump
+./usr/lib/i386/libp2k_p.a comp-c-proflib
compat,puffs,profile,rump
+./usr/lib/i386/libp2k_pic.a comp-c-piclib
compat,pic,puffs,rump
./usr/lib/i386/libpam.a comp-c-lib
compat
./usr/lib/i386/libpam.so comp-sys-shlib
compat,pic
./usr/lib/i386/libpam_p.a comp-c-proflib
compat,profile
@@ -601,18 +601,18 @@
./usr/lib/i386/librt.so comp-sys-shlib
compat,pic
./usr/lib/i386/librt_p.a comp-c-proflib
compat,profile
./usr/lib/i386/librt_pic.a comp-c-piclib
compat,pic
-./usr/lib/i386/librump.a comp-c-lib compat
-./usr/lib/i386/librump.so comp-sys-shlib
compat,pic
-./usr/lib/i386/librump_p.a comp-c-proflib
compat,profile
-./usr/lib/i386/librump_pic.a comp-c-piclib
compat,pic
-./usr/lib/i386/librumpnet.a comp-c-lib compat
-./usr/lib/i386/librumpnet.so comp-sys-shlib
compat,pic
-./usr/lib/i386/librumpnet_p.a comp-c-proflib
compat,profile
-./usr/lib/i386/librumpnet_pic.a comp-c-piclib
compat,pic
-./usr/lib/i386/librumpuser.a comp-c-lib compat
-./usr/lib/i386/librumpuser.so comp-sys-shlib
compat,pic
-./usr/lib/i386/librumpuser_p.a comp-c-proflib
compat,profile
-./usr/lib/i386/librumpuser_pic.a comp-c-piclib
compat,pic
+./usr/lib/i386/librump.a comp-c-lib
compat,rump
+./usr/lib/i386/librump.so comp-sys-shlib
compat,pic,rump
+./usr/lib/i386/librump_p.a comp-c-proflib
compat,profile,rump
+./usr/lib/i386/librump_pic.a comp-c-piclib
compat,pic,rump
+./usr/lib/i386/librumpnet.a comp-c-lib
compat,rump
+./usr/lib/i386/librumpnet.so comp-sys-shlib
compat,pic,rump
+./usr/lib/i386/librumpnet_p.a comp-c-proflib
compat,profile,rump
+./usr/lib/i386/librumpnet_pic.a comp-c-piclib
compat,pic,rump
+./usr/lib/i386/librumpuser.a comp-c-lib
compat,rump
+./usr/lib/i386/librumpuser.so comp-sys-shlib
compat,pic,rump
+./usr/lib/i386/librumpuser_p.a comp-c-proflib
compat,profile,rump
+./usr/lib/i386/librumpuser_pic.a comp-c-piclib
compat,pic,rump
./usr/lib/i386/libsdp.a comp-c-lib
compat
./usr/lib/i386/libsdp.so comp-sys-shlib
compat,pic
./usr/lib/i386/libsdp_p.a comp-c-proflib
compat,profile
@@ -652,10 +652,10 @@
./usr/lib/i386/libtermlib.so comp-sys-shlib
compat,pic
./usr/lib/i386/libtermlib_p.a comp-c-proflib
compat,profile
./usr/lib/i386/libtermlib_pic.a comp-c-piclib
compat,pic
-./usr/lib/i386/libukfs.a comp-c-lib compat
-./usr/lib/i386/libukfs.so comp-sys-shlib
compat,pic
-./usr/lib/i386/libukfs_p.a comp-c-proflib
compat,profile
-./usr/lib/i386/libukfs_pic.a comp-c-piclib
compat,pic
+./usr/lib/i386/libukfs.a comp-c-lib
compat,rump
+./usr/lib/i386/libukfs.so comp-sys-shlib
compat,pic,rump
+./usr/lib/i386/libukfs_p.a comp-c-proflib
compat,profile,rump
+./usr/lib/i386/libukfs_pic.a comp-c-piclib
compat,pic,rump
./usr/lib/i386/libusbhid.a comp-c-lib compat
./usr/lib/i386/libusbhid.so comp-sys-shlib
compat,pic
./usr/lib/i386/libusbhid_p.a comp-c-proflib
compat,profile
diff --git a/distrib/sets/lists/comp/md.sparc64
b/distrib/sets/lists/comp/md.sparc64
index d5c507a..9950512 100644
--- a/distrib/sets/lists/comp/md.sparc64
+++ b/distrib/sets/lists/comp/md.sparc64
@@ -437,10 +437,10 @@
./usr/lib/sparc/libossaudio.so base-sys-shlib
compat,pic
./usr/lib/sparc/libossaudio_p.a comp-c-proflib
compat,profile
./usr/lib/sparc/libossaudio_pic.a comp-c-piclib
compat,pic
-./usr/lib/sparc/libp2k.a comp-c-lib
compat,puffs
-./usr/lib/sparc/libp2k.so base-sys-shlib
compat,puffs,pic
-./usr/lib/sparc/libp2k_p.a comp-c-proflib
compat,puffs,profile
-./usr/lib/sparc/libp2k_pic.a comp-c-piclib
compat,puffs,pic
+./usr/lib/sparc/libp2k.a comp-c-lib
compat,puffs,rump
+./usr/lib/sparc/libp2k.so base-sys-shlib
compat,puffs,pic,rump
+./usr/lib/sparc/libp2k_p.a comp-c-proflib
compat,puffs,profile,rump
+./usr/lib/sparc/libp2k_pic.a comp-c-piclib
compat,puffs,pic,rump
./usr/lib/sparc/libpam.a comp-c-lib compat
./usr/lib/sparc/libpam.so base-sys-shlib
compat,pic
./usr/lib/sparc/libpam_p.a comp-c-proflib
compat,profile
@@ -500,18 +500,18 @@
./usr/lib/sparc/librt.so base-sys-shlib
compat,pic
./usr/lib/sparc/librt_p.a comp-c-proflib
compat,profile
./usr/lib/sparc/librt_pic.a comp-c-piclib
compat,pic
-./usr/lib/sparc/librump.a comp-c-lib compat
-./usr/lib/sparc/librump.so base-sys-shlib
compat,pic
-./usr/lib/sparc/librump_p.a comp-c-proflib
compat,profile
-./usr/lib/sparc/librump_pic.a comp-c-piclib
compat,pic
-./usr/lib/sparc/librumpnet.a comp-c-lib compat
-./usr/lib/sparc/librumpnet.so base-sys-shlib
compat,pic
-./usr/lib/sparc/librumpnet_p.a comp-c-proflib
compat,profile
-./usr/lib/sparc/librumpnet_pic.a comp-c-piclib
compat,pic
-./usr/lib/sparc/librumpuser.a comp-c-lib compat
-./usr/lib/sparc/librumpuser.so base-sys-shlib
compat,pic
-./usr/lib/sparc/librumpuser_p.a comp-c-proflib
compat,profile
-./usr/lib/sparc/librumpuser_pic.a comp-c-piclib
compat,pic
+./usr/lib/sparc/librump.a comp-c-lib
compat,rump
+./usr/lib/sparc/librump.so base-sys-shlib
compat,pic,rump
+./usr/lib/sparc/librump_p.a comp-c-proflib
compat,profile,rump
+./usr/lib/sparc/librump_pic.a comp-c-piclib
compat,pic,rump
+./usr/lib/sparc/librumpnet.a comp-c-lib
compat,rump
+./usr/lib/sparc/librumpnet.so base-sys-shlib
compat,pic,rump
+./usr/lib/sparc/librumpnet_p.a comp-c-proflib
compat,profile,rump
+./usr/lib/sparc/librumpnet_pic.a comp-c-piclib
compat,pic,rump
+./usr/lib/sparc/librumpuser.a comp-c-lib
compat,rump
+./usr/lib/sparc/librumpuser.so base-sys-shlib
compat,pic,rump
+./usr/lib/sparc/librumpuser_p.a comp-c-proflib
compat,profile,rump
+./usr/lib/sparc/librumpuser_pic.a comp-c-piclib
compat,pic,rump
./usr/lib/sparc/libsdp.a comp-c-lib compat
./usr/lib/sparc/libsdp.so base-sys-shlib
compat,pic
./usr/lib/sparc/libsdp_p.a comp-c-proflib
compat,profile
@@ -551,10 +551,10 @@
./usr/lib/sparc/libtermlib.so base-sys-shlib
compat,pic
./usr/lib/sparc/libtermlib_p.a comp-c-proflib
compat,profile
./usr/lib/sparc/libtermlib_pic.a comp-c-piclib
compat,pic
-./usr/lib/sparc/libukfs.a comp-c-lib compat
-./usr/lib/sparc/libukfs.so base-sys-shlib
compat,pic
-./usr/lib/sparc/libukfs_p.a comp-c-proflib
compat,profile
-./usr/lib/sparc/libukfs_pic.a comp-c-piclib
compat,pic
+./usr/lib/sparc/libukfs.a comp-c-lib
compat,rump
+./usr/lib/sparc/libukfs.so base-sys-shlib
compat,pic,rump
+./usr/lib/sparc/libukfs_p.a comp-c-proflib
compat,profile,rump
+./usr/lib/sparc/libukfs_pic.a comp-c-piclib
compat,pic,rump
./usr/lib/sparc/libusbhid.a comp-c-lib compat
./usr/lib/sparc/libusbhid.so base-sys-shlib
compat,pic
./usr/lib/sparc/libusbhid_p.a comp-c-proflib
compat,profile
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 728def8..cd67510 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1828,13 +1828,13 @@
./usr/include/rpcsvc/ypclnt.h comp-c-include
./usr/include/rpcsvc/yppasswd.h comp-c-include
./usr/include/rpcsvc/yppasswd.x comp-c-include
-./usr/include/rump/p2k.h comp-c-include puffs
-./usr/include/rump/rump.h comp-c-include
-./usr/include/rump/rump_syscalls.h comp-c-include
-./usr/include/rump/rumpdefs.h comp-c-include
-./usr/include/rump/rumpuser.h comp-c-include
-./usr/include/rump/rumpvnode_if.h comp-c-include
-./usr/include/rump/ukfs.h comp-c-include
+./usr/include/rump/p2k.h comp-c-include
puffs,rump
+./usr/include/rump/rump.h comp-c-include rump
+./usr/include/rump/rump_syscalls.h comp-c-include rump
+./usr/include/rump/rumpdefs.h comp-c-include rump
+./usr/include/rump/rumpuser.h comp-c-include rump
+./usr/include/rump/rumpvnode_if.h comp-c-include rump
+./usr/include/rump/ukfs.h comp-c-include rump
./usr/include/sa.h comp-obsolete obsolete
./usr/include/sched.h comp-c-include
./usr/include/sdp.h comp-c-include
@@ -2412,9 +2412,9 @@
./usr/lib/libossaudio.a comp-c-lib
./usr/lib/libossaudio_g.a -unknown- debuglib
./usr/lib/libossaudio_p.a comp-c-proflib profile
-./usr/lib/libp2k.a comp-c-lib puffs
-./usr/lib/libp2k_g.a -unknown- debuglib
-./usr/lib/libp2k_p.a comp-c-proflib
puffs,profile
+./usr/lib/libp2k.a comp-c-lib
puffs,rump
+./usr/lib/libp2k_g.a -unknown- debuglib rump
+./usr/lib/libp2k_p.a comp-c-proflib
puffs,profile,rump
./usr/lib/libpam.a comp-c-lib pam
./usr/lib/libpam_g.a -unknown- debuglib
./usr/lib/libpcap.a comp-c-lib
@@ -2459,69 +2459,69 @@
./usr/lib/librt.a comp-c-lib
./usr/lib/librt_g.a -unknown- debuglib
./usr/lib/librt_p.a comp-c-proflib profile
-./usr/lib/librump.a comp-c-lib
-./usr/lib/librump_g.a -unknown- debuglib
-./usr/lib/librump_p.a comp-c-proflib profile
-./usr/lib/librumpfs_cd9660.a comp-c-lib
-./usr/lib/librumpfs_cd9660_g.a -unknown- debuglib
-./usr/lib/librumpfs_cd9660_p.a comp-c-proflib profile
-./usr/lib/librumpfs_efs.a comp-c-lib
-./usr/lib/librumpfs_efs_g.a -unknown- debuglib
-./usr/lib/librumpfs_efs_p.a comp-c-proflib profile
-./usr/lib/librumpfs_ext2fs.a comp-c-lib
-./usr/lib/librumpfs_ext2fs_g.a -unknown- debuglib
-./usr/lib/librumpfs_ext2fs_p.a comp-c-proflib profile
-./usr/lib/librumpfs_ffs.a comp-c-lib
-./usr/lib/librumpfs_ffs_g.a -unknown- debuglib
-./usr/lib/librumpfs_ffs_p.a comp-c-proflib profile
-./usr/lib/librumpfs_hfs.a comp-c-lib
-./usr/lib/librumpfs_hfs_g.a -unknown- debuglib
-./usr/lib/librumpfs_hfs_p.a comp-c-proflib profile
-./usr/lib/librumpfs_lfs.a comp-c-lib
-./usr/lib/librumpfs_lfs_g.a -unknown- debuglib
-./usr/lib/librumpfs_lfs_p.a comp-c-proflib profile
-./usr/lib/librumpfs_msdos.a comp-c-lib
-./usr/lib/librumpfs_msdos_g.a -unknown- debuglib
-./usr/lib/librumpfs_msdos_p.a comp-c-proflib profile
-./usr/lib/librumpfs_nfs.a comp-c-lib
-./usr/lib/librumpfs_nfs_g.a -unknown- debuglib
-./usr/lib/librumpfs_nfs_p.a comp-c-proflib profile
-./usr/lib/librumpfs_ntfs.a comp-c-lib
-./usr/lib/librumpfs_ntfs_g.a -unknown- debuglib
-./usr/lib/librumpfs_ntfs_p.a comp-c-proflib profile
-./usr/lib/librumpfs_syspuffs.a comp-c-lib
-./usr/lib/librumpfs_syspuffs_g.a -unknown- debuglib
-./usr/lib/librumpfs_syspuffs_p.a comp-c-proflib profile
-./usr/lib/librumpfs_sysvbfs.a comp-c-lib
-./usr/lib/librumpfs_sysvbfs_g.a -unknown- debuglib
-./usr/lib/librumpfs_sysvbfs_p.a comp-c-proflib
profile
-./usr/lib/librumpfs_tmpfs.a comp-c-lib
-./usr/lib/librumpfs_tmpfs_g.a -unknown- debuglib
-./usr/lib/librumpfs_tmpfs_p.a comp-c-proflib profile
-./usr/lib/librumpfs_udf.a comp-c-lib
-./usr/lib/librumpfs_udf_g.a -unknown- debuglib
-./usr/lib/librumpfs_udf_p.a comp-c-proflib profile
-./usr/lib/librumpfs_ufs.a comp-c-lib
-./usr/lib/librumpfs_ufs_g.a -unknown- debuglib
-./usr/lib/librumpfs_ufs_p.a comp-c-proflib profile
-./usr/lib/librumpnet.a comp-c-lib
-./usr/lib/librumpnet_g.a -unknown- debuglib
-./usr/lib/librumpnet_p.a comp-c-proflib profile
-./usr/lib/librumpnet_net.a comp-c-lib
-./usr/lib/librumpnet_net_g.a -unknown- debuglib
-./usr/lib/librumpnet_net_p.a comp-c-proflib profile
-./usr/lib/librumpnet_netinet.a comp-c-lib
-./usr/lib/librumpnet_netinet_g.a -unknown- debuglib
-./usr/lib/librumpnet_netinet_p.a comp-c-proflib profile
-./usr/lib/librumpnet_sockin.a comp-c-lib
-./usr/lib/librumpnet_sockin_g.a -unknown- debuglib
-./usr/lib/librumpnet_sockin_p.a comp-c-proflib
profile
-./usr/lib/librumpnet_virtif.a comp-c-lib
-./usr/lib/librumpnet_virtif_g.a -unknown- debuglib
-./usr/lib/librumpnet_virtif_p.a comp-c-proflib
profile
-./usr/lib/librumpuser.a comp-c-lib
-./usr/lib/librumpuser_g.a -unknown- debuglib
-./usr/lib/librumpuser_p.a comp-c-proflib profile
+./usr/lib/librump.a comp-c-lib rump
+./usr/lib/librump_g.a -unknown- debuglib rump
+./usr/lib/librump_p.a comp-c-proflib
rump,profile
+./usr/lib/librumpfs_cd9660.a comp-c-lib rump
+./usr/lib/librumpfs_cd9660_g.a -unknown- rump,debuglib
+./usr/lib/librumpfs_cd9660_p.a comp-c-proflib
rump,profile
+./usr/lib/librumpfs_efs.a comp-c-lib rump
+./usr/lib/librumpfs_efs_g.a -unknown- rump,debuglib
+./usr/lib/librumpfs_efs_p.a comp-c-proflib
rump,profile
+./usr/lib/librumpfs_ext2fs.a comp-c-lib rump
+./usr/lib/librumpfs_ext2fs_g.a -unknown- rump,debuglib
+./usr/lib/librumpfs_ext2fs_p.a comp-c-proflib
rump,profile
+./usr/lib/librumpfs_ffs.a comp-c-lib rump
+./usr/lib/librumpfs_ffs_g.a -unknown- rump,debuglib
+./usr/lib/librumpfs_ffs_p.a comp-c-proflib
rump,profile
+./usr/lib/librumpfs_hfs.a comp-c-lib rump
+./usr/lib/librumpfs_hfs_g.a -unknown- rump,debuglib
+./usr/lib/librumpfs_hfs_p.a comp-c-proflib
rump,profile
+./usr/lib/librumpfs_lfs.a comp-c-lib rump
+./usr/lib/librumpfs_lfs_g.a -unknown- rump,debuglib
+./usr/lib/librumpfs_lfs_p.a comp-c-proflib
rump,profile
+./usr/lib/librumpfs_msdos.a comp-c-lib rump
+./usr/lib/librumpfs_msdos_g.a -unknown- rump,debuglib
+./usr/lib/librumpfs_msdos_p.a comp-c-proflib
rump,profile
+./usr/lib/librumpfs_nfs.a comp-c-lib rump
+./usr/lib/librumpfs_nfs_g.a -unknown- rump,debuglib
+./usr/lib/librumpfs_nfs_p.a comp-c-proflib
rump,profile
+./usr/lib/librumpfs_ntfs.a comp-c-lib rump
+./usr/lib/librumpfs_ntfs_g.a -unknown- rump,debuglib
+./usr/lib/librumpfs_ntfs_p.a comp-c-proflib
rump,profile
+./usr/lib/librumpfs_syspuffs.a comp-c-lib rump
+./usr/lib/librumpfs_syspuffs_g.a -unknown- rump,debuglib
+./usr/lib/librumpfs_syspuffs_p.a comp-c-proflib
rump,profile
+./usr/lib/librumpfs_sysvbfs.a comp-c-lib rump
+./usr/lib/librumpfs_sysvbfs_g.a -unknown- rump,debuglib
+./usr/lib/librumpfs_sysvbfs_p.a comp-c-proflib
rump,profile
+./usr/lib/librumpfs_tmpfs.a comp-c-lib rump
+./usr/lib/librumpfs_tmpfs_g.a -unknown- rump,debuglib
+./usr/lib/librumpfs_tmpfs_p.a comp-c-proflib
rump,profile
+./usr/lib/librumpfs_udf.a comp-c-lib rump
+./usr/lib/librumpfs_udf_g.a -unknown- rump,debuglib
+./usr/lib/librumpfs_udf_p.a comp-c-proflib
rump,profile
+./usr/lib/librumpfs_ufs.a comp-c-lib rump
+./usr/lib/librumpfs_ufs_g.a -unknown- rump,debuglib
+./usr/lib/librumpfs_ufs_p.a comp-c-proflib
rump,profile
+./usr/lib/librumpnet.a comp-c-lib rump
+./usr/lib/librumpnet_g.a -unknown- rump,debuglib
+./usr/lib/librumpnet_p.a comp-c-proflib
rump,profile
+./usr/lib/librumpnet_net.a comp-c-lib rump
+./usr/lib/librumpnet_net_g.a -unknown- rump,debuglib
+./usr/lib/librumpnet_net_p.a comp-c-proflib
rump,profile
+./usr/lib/librumpnet_netinet.a comp-c-lib rump
+./usr/lib/librumpnet_netinet_g.a -unknown- rump,debuglib
+./usr/lib/librumpnet_netinet_p.a comp-c-proflib
rump,profile
+./usr/lib/librumpnet_sockin.a comp-c-lib rump
+./usr/lib/librumpnet_sockin_g.a -unknown- rump,debuglib
+./usr/lib/librumpnet_sockin_p.a comp-c-proflib
rump,profile
+./usr/lib/librumpnet_virtif.a comp-c-lib rump,
+./usr/lib/librumpnet_virtif_g.a -unknown- rump,debuglib
+./usr/lib/librumpnet_virtif_p.a comp-c-proflib
rump,profile
+./usr/lib/librumpuser.a comp-c-lib
rump
+./usr/lib/librumpuser_g.a -unknown- rump,debuglib
+./usr/lib/librumpuser_p.a comp-c-proflib
rump,profile
./usr/lib/libsdp.a comp-c-lib
./usr/lib/libsdp_g.a -unknown- debuglib
./usr/lib/libsdp_p.a comp-c-proflib profile
@@ -2557,9 +2557,9 @@
./usr/lib/libtermcap_p.a comp-c-proflib profile
./usr/lib/libtermlib.a comp-c-lib
./usr/lib/libtermlib_p.a comp-c-proflib profile
-./usr/lib/libukfs.a comp-c-lib
-./usr/lib/libukfs_g.a -unknown- debuglib
-./usr/lib/libukfs_p.a comp-c-proflib profile
+./usr/lib/libukfs.a comp-c-lib rump
+./usr/lib/libukfs_g.a -unknown- debuglib rump
+./usr/lib/libukfs_p.a comp-c-proflib
profile,rump
./usr/lib/libusb.a comp-obsolete obsolete
./usr/lib/libusb_p.a comp-obsolete obsolete
./usr/lib/libusb_pic.a comp-obsolete obsolete
@@ -3385,19 +3385,19 @@
./usr/libdata/debug/usr/sbin/rtadvd.debug comp-router-debug
use_inet6,debug
./usr/libdata/debug/usr/sbin/rtquery.debug comp-netutil-debug debug
./usr/libdata/debug/usr/sbin/rtsold.debug comp-netutil-debug
inet6,debug
-./usr/libdata/debug/usr/sbin/rump_cd9660.debug comp-sysutil-debug
debug,puffs
-./usr/libdata/debug/usr/sbin/rump_efs.debug comp-sysutil-debug
debug,puffs
-./usr/libdata/debug/usr/sbin/rump_ext2fs.debug comp-sysutil-debug
debug,puffs
-./usr/libdata/debug/usr/sbin/rump_ffs.debug comp-sysutil-debug
debug,puffs
-./usr/libdata/debug/usr/sbin/rump_hfs.debug comp-sysutil-debug
debug,puffs
-./usr/libdata/debug/usr/sbin/rump_lfs.debug comp-sysutil-debug
debug,puffs
-./usr/libdata/debug/usr/sbin/rump_msdos.debug comp-sysutil-debug
debug,puffs
-./usr/libdata/debug/usr/sbin/rump_nfs.debug comp-sysutil-debug
debug,puffs
-./usr/libdata/debug/usr/sbin/rump_ntfs.debug comp-sysutil-debug
debug,puffs
-./usr/libdata/debug/usr/sbin/rump_syspuffs.debug comp-sysutil-debug
debug,puffs
-./usr/libdata/debug/usr/sbin/rump_sysvbfs.debug comp-sysutil-debug
debug,puffs
-./usr/libdata/debug/usr/sbin/rump_tmpfs.debug comp-sysutil-debug
debug,puffs
-./usr/libdata/debug/usr/sbin/rump_udf.debug comp-sysutil-debug
debug,puffs
+./usr/libdata/debug/usr/sbin/rump_cd9660.debug comp-sysutil-debug
debug,puffs,rump
+./usr/libdata/debug/usr/sbin/rump_efs.debug comp-sysutil-debug
debug,puffs,rump
+./usr/libdata/debug/usr/sbin/rump_ext2fs.debug comp-sysutil-debug
debug,puffs,rump
+./usr/libdata/debug/usr/sbin/rump_ffs.debug comp-sysutil-debug
debug,puffs,rump
+./usr/libdata/debug/usr/sbin/rump_hfs.debug comp-sysutil-debug
debug,puffs,rump
+./usr/libdata/debug/usr/sbin/rump_lfs.debug comp-sysutil-debug
debug,puffs,rump
+./usr/libdata/debug/usr/sbin/rump_msdos.debug comp-sysutil-debug
debug,puffs,rump
+./usr/libdata/debug/usr/sbin/rump_nfs.debug comp-sysutil-debug
debug,puffs,rump
+./usr/libdata/debug/usr/sbin/rump_ntfs.debug comp-sysutil-debug
debug,puffs,rump
+./usr/libdata/debug/usr/sbin/rump_syspuffs.debug comp-sysutil-debug
debug,puffs,rump
+./usr/libdata/debug/usr/sbin/rump_sysvbfs.debug comp-sysutil-debug
debug,puffs,rump
+./usr/libdata/debug/usr/sbin/rump_tmpfs.debug comp-sysutil-debug
debug,puffs,rump
+./usr/libdata/debug/usr/sbin/rump_udf.debug comp-sysutil-debug
debug,puffs,rump
./usr/libdata/debug/usr/sbin/rwhod.debug comp-netutil-debug debug
./usr/libdata/debug/usr/sbin/sa.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/schedctl.debug comp-sysutil-debug debug
@@ -3542,7 +3542,7 @@
./usr/libdata/lint/llib-lmp.ln -unknown- lint,xorg
./usr/libdata/lint/llib-lntp.ln comp-obsolete
obsolete
./usr/libdata/lint/llib-lossaudio.ln comp-c-lintlib lint
-./usr/libdata/lint/llib-lp2k.ln comp-c-lintlib
lint,puffs
+./usr/libdata/lint/llib-lp2k.ln comp-c-lintlib
lint,puffs,rump
./usr/libdata/lint/llib-lpam.ln comp-c-lintlib
lint,pam
./usr/libdata/lint/llib-lpcap.ln comp-c-lintlib lint
./usr/libdata/lint/llib-lpci.ln comp-c-lintlib
lint
@@ -3558,7 +3558,7 @@
./usr/libdata/lint/llib-lrmt.ln comp-c-lintlib
lint
./usr/libdata/lint/llib-lrpcsvc.ln comp-c-lintlib lint
./usr/libdata/lint/llib-lrt.ln comp-c-lintlib lint
-./usr/libdata/lint/llib-lrumpuser.ln comp-c-lintlib lint
+./usr/libdata/lint/llib-lrumpuser.ln comp-c-lintlib
lint,rump
./usr/libdata/lint/llib-lsdp.ln comp-c-lintlib
lint
./usr/libdata/lint/llib-lskey.ln comp-c-lintlib
lint,skey
./usr/libdata/lint/llib-lsm.ln comp-obsolete obsolete
@@ -3568,7 +3568,7 @@
./usr/libdata/lint/llib-lstdc.ln comp-c-lintlib lint
./usr/libdata/lint/llib-ltelnet.ln comp-obsolete obsolete
./usr/libdata/lint/llib-ltermcap.ln comp-c-lintlib lint
-./usr/libdata/lint/llib-lukfs.ln comp-c-lintlib lint
+./usr/libdata/lint/llib-lukfs.ln comp-c-lintlib
lint,rump
./usr/libdata/lint/llib-lusb.ln comp-obsolete
obsolete
./usr/libdata/lint/llib-lusbhid.ln comp-c-lintlib lint
./usr/libdata/lint/llib-lutil.ln comp-c-lintlib lint
@@ -6809,7 +6809,7 @@
./usr/share/man/cat3/ossaudio.0 comp-c-catman
.cat
./usr/share/man/cat3/overlay.0 comp-c-catman .cat
./usr/share/man/cat3/overwrite.0 comp-c-catman .cat
-./usr/share/man/cat3/p2k.0 comp-c-catman
.cat,puffs
+./usr/share/man/cat3/p2k.0 comp-c-catman
.cat,puffs,rump
./usr/share/man/cat3/pair_content.0 comp-c-catman .cat
./usr/share/man/cat3/pam.0 comp-c-catman .cat,pam
./usr/share/man/cat3/pam_acct_mgmt.0 comp-c-catman .cat,pam
@@ -7246,8 +7246,8 @@
./usr/share/man/cat3/rresvport.0 comp-c-catman .cat
./usr/share/man/cat3/rresvport_af.0 comp-c-catman .cat
./usr/share/man/cat3/rsa.0 comp-obsolete obsolete
-./usr/share/man/cat3/rump.0 comp-c-catman .cat
-./usr/share/man/cat3/rumpuser.0 comp-c-catman
.cat
+./usr/share/man/cat3/rump.0 comp-c-catman
.cat,rump
+./usr/share/man/cat3/rumpuser.0 comp-c-catman
.cat,rump
./usr/share/man/cat3/ruserok.0 comp-c-catman .cat
./usr/share/man/cat3/savetty.0 comp-c-catman .cat
./usr/share/man/cat3/scalb.0 comp-c-catman .cat
@@ -7656,7 +7656,7 @@
./usr/share/man/cat3/tzsetwall.0 comp-c-catman .cat
./usr/share/man/cat3/ualarm.0 comp-c-catman .cat
./usr/share/man/cat3/uid_from_user.0 comp-c-catman .cat
-./usr/share/man/cat3/ukfs.0 comp-c-catman .cat
+./usr/share/man/cat3/ukfs.0 comp-c-catman
.cat,rump
./usr/share/man/cat3/ulimit.0 comp-c-catman .cat
./usr/share/man/cat3/uname.0 comp-c-catman .cat
./usr/share/man/cat3/unctrl.0 comp-c-catman .cat
@@ -12073,7 +12073,7 @@
./usr/share/man/html3/ossaudio.html comp-c-htmlman html
./usr/share/man/html3/overlay.html comp-c-htmlman html
./usr/share/man/html3/overwrite.html comp-c-htmlman html
-./usr/share/man/html3/p2k.html comp-c-htmlman
html,puffs
+./usr/share/man/html3/p2k.html comp-c-htmlman
html,puffs,rump
./usr/share/man/html3/pair_content.html comp-c-htmlman
html
./usr/share/man/html3/pam.html comp-c-htmlman html,pam
./usr/share/man/html3/pam_acct_mgmt.html comp-c-htmlman html,pam
@@ -12503,8 +12503,8 @@
./usr/share/man/html3/rpcbind.html comp-c-htmlman html
./usr/share/man/html3/rresvport.html comp-c-htmlman html
./usr/share/man/html3/rresvport_af.html comp-c-htmlman
html
-./usr/share/man/html3/rump.html comp-c-htmlman
html
-./usr/share/man/html3/rumpuser.html comp-c-htmlman html
+./usr/share/man/html3/rump.html comp-c-htmlman
html,rump
+./usr/share/man/html3/rumpuser.html comp-c-htmlman
html,rump
./usr/share/man/html3/ruserok.html comp-c-htmlman html
./usr/share/man/html3/savetty.html comp-c-htmlman html
./usr/share/man/html3/scalb.html comp-c-htmlman html
@@ -12880,7 +12880,7 @@
./usr/share/man/html3/tzsetwall.html comp-c-htmlman html
./usr/share/man/html3/ualarm.html comp-c-htmlman html
./usr/share/man/html3/uid_from_user.html comp-c-htmlman html
-./usr/share/man/html3/ukfs.html comp-c-htmlman
html
+./usr/share/man/html3/ukfs.html comp-c-htmlman
html,rump
./usr/share/man/html3/ulimit.html comp-c-htmlman html
./usr/share/man/html3/uname.html comp-c-htmlman html
./usr/share/man/html3/unctrl.html comp-c-htmlman html
@@ -17332,7 +17332,7 @@
./usr/share/man/man3/ossaudio.3 comp-c-man
.man
./usr/share/man/man3/overlay.3 comp-c-man .man
./usr/share/man/man3/overwrite.3 comp-c-man .man
-./usr/share/man/man3/p2k.3 comp-c-man
.man,puffs
+./usr/share/man/man3/p2k.3 comp-c-man
.man,puffs,rump
./usr/share/man/man3/pair_content.3 comp-c-man .man
./usr/share/man/man3/pam.3 comp-c-man .man,pam
./usr/share/man/man3/pam_acct_mgmt.3 comp-c-man .man,pam
@@ -17769,8 +17769,8 @@
./usr/share/man/man3/rresvport.3 comp-c-man .man
./usr/share/man/man3/rresvport_af.3 comp-c-man .man
./usr/share/man/man3/rsa.3 comp-obsolete obsolete
-./usr/share/man/man3/rump.3 comp-c-man .man
-./usr/share/man/man3/rumpuser.3 comp-c-man
.man
+./usr/share/man/man3/rump.3 comp-c-man
.man,rump
+./usr/share/man/man3/rumpuser.3 comp-c-man
.man,rump
./usr/share/man/man3/ruserok.3 comp-c-man .man
./usr/share/man/man3/savetty.3 comp-c-man .man
./usr/share/man/man3/scalb.3 comp-c-man .man
@@ -18175,7 +18175,7 @@
./usr/share/man/man3/tzsetwall.3 comp-c-man .man
./usr/share/man/man3/ualarm.3 comp-c-man .man
./usr/share/man/man3/uid_from_user.3 comp-c-man .man
-./usr/share/man/man3/ukfs.3 comp-c-man .man
+./usr/share/man/man3/ukfs.3 comp-c-man
.man,rump
./usr/share/man/man3/ulimit.3 comp-c-man .man
./usr/share/man/man3/uname.3 comp-c-man .man
./usr/share/man/man3/unctrl.3 comp-c-man .man
diff --git a/distrib/sets/lists/comp/shl.mi b/distrib/sets/lists/comp/shl.mi
index 260251d..054d829 100644
--- a/distrib/sets/lists/comp/shl.mi
+++ b/distrib/sets/lists/comp/shl.mi
@@ -62,7 +62,7 @@
./usr/lib/libopcodes.so.2 comp-c-shlib bfd
./usr/lib/libopcodes.so.2.0 comp-c-shlib bfd
./usr/lib/libossaudio_pic.a comp-c-piclib
-./usr/lib/libp2k_pic.a comp-c-piclib puffs
+./usr/lib/libp2k_pic.a comp-c-piclib
puffs,rump
./usr/lib/libpam_pic.a comp-c-piclib pam
./usr/lib/libpcap_pic.a comp-c-piclib
./usr/lib/libpci_pic.a comp-c-piclib
@@ -77,27 +77,27 @@
./usr/lib/libroken_pic.a comp-c-piclib kerberos
./usr/lib/librpcsvc_pic.a comp-c-piclib
./usr/lib/librt_pic.a comp-c-piclib
-./usr/lib/librump_pic.a comp-c-piclib
-./usr/lib/librumpfs_cd9660_pic.a comp-c-piclib
-./usr/lib/librumpfs_efs_pic.a comp-c-piclib
-./usr/lib/librumpfs_ext2fs_pic.a comp-c-piclib
-./usr/lib/librumpfs_ffs_pic.a comp-c-piclib
-./usr/lib/librumpfs_hfs_pic.a comp-c-piclib
-./usr/lib/librumpfs_lfs_pic.a comp-c-piclib
-./usr/lib/librumpfs_msdos_pic.a comp-c-piclib
-./usr/lib/librumpfs_nfs_pic.a comp-c-piclib
-./usr/lib/librumpfs_ntfs_pic.a comp-c-piclib
-./usr/lib/librumpfs_syspuffs_pic.a comp-c-piclib
-./usr/lib/librumpfs_sysvbfs_pic.a comp-c-piclib
-./usr/lib/librumpfs_tmpfs_pic.a comp-c-piclib
-./usr/lib/librumpfs_udf_pic.a comp-c-piclib
-./usr/lib/librumpfs_ufs_pic.a comp-c-piclib
-./usr/lib/librumpnet_pic.a comp-c-piclib
-./usr/lib/librumpnet_net_pic.a comp-c-piclib
-./usr/lib/librumpnet_netinet_pic.a comp-c-piclib
-./usr/lib/librumpnet_sockin_pic.a comp-c-piclib
-./usr/lib/librumpnet_virtif_pic.a comp-c-piclib
-./usr/lib/librumpuser_pic.a comp-c-piclib
+./usr/lib/librump_pic.a comp-c-piclib
rump
+./usr/lib/librumpfs_cd9660_pic.a comp-c-piclib rump
+./usr/lib/librumpfs_efs_pic.a comp-c-piclib rump
+./usr/lib/librumpfs_ext2fs_pic.a comp-c-piclib rump
+./usr/lib/librumpfs_ffs_pic.a comp-c-piclib rump
+./usr/lib/librumpfs_hfs_pic.a comp-c-piclib rump
+./usr/lib/librumpfs_lfs_pic.a comp-c-piclib rump
+./usr/lib/librumpfs_msdos_pic.a comp-c-piclib
rump
+./usr/lib/librumpfs_nfs_pic.a comp-c-piclib rump
+./usr/lib/librumpfs_ntfs_pic.a comp-c-piclib rump
+./usr/lib/librumpfs_syspuffs_pic.a comp-c-piclib rump
+./usr/lib/librumpfs_sysvbfs_pic.a comp-c-piclib rump
+./usr/lib/librumpfs_tmpfs_pic.a comp-c-piclib
rump
+./usr/lib/librumpfs_udf_pic.a comp-c-piclib rump
+./usr/lib/librumpfs_ufs_pic.a comp-c-piclib rump
+./usr/lib/librumpnet_pic.a comp-c-piclib rump
+./usr/lib/librumpnet_net_pic.a comp-c-piclib rump
+./usr/lib/librumpnet_netinet_pic.a comp-c-piclib rump
+./usr/lib/librumpnet_sockin_pic.a comp-c-piclib rump
+./usr/lib/librumpnet_virtif_pic.a comp-c-piclib rump
+./usr/lib/librumpuser_pic.a comp-c-piclib rump
./usr/lib/libsdp_pic.a comp-c-piclib
./usr/lib/libskey_pic.a comp-c-piclib
skey
./usr/lib/libsl_pic.a comp-c-piclib kerberos
@@ -108,7 +108,7 @@
./usr/lib/libstdc++_pic.a comp-cxx-piclib
./usr/lib/libtermcap_pic.a comp-c-piclib
./usr/lib/libtermlib_pic.a comp-c-piclib
-./usr/lib/libukfs_pic.a comp-c-piclib
+./usr/lib/libukfs_pic.a comp-c-piclib
rump
./usr/lib/libusbhid_pic.a comp-c-piclib
./usr/lib/libutil_pic.a comp-c-piclib
./usr/lib/libwrap_pic.a comp-c-piclib
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index a398a05..de1f3d7 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -2452,19 +2452,19 @@
./usr/share/man/cat8/rtquery.0 man-netutil-catman .cat
./usr/share/man/cat8/rtsol.0 man-netutil-catman
inet6,.cat
./usr/share/man/cat8/rtsold.0 man-netutil-catman
inet6,.cat
-./usr/share/man/cat8/rump_cd9660.0 man-sysutil-catman
puffs,.cat
-./usr/share/man/cat8/rump_efs.0 man-sysutil-catman
puffs,.cat
-./usr/share/man/cat8/rump_ext2fs.0 man-sysutil-catman
puffs,.cat
-./usr/share/man/cat8/rump_ffs.0 man-sysutil-catman
puffs,.cat
-./usr/share/man/cat8/rump_hfs.0 man-sysutil-catman
puffs,.cat
-./usr/share/man/cat8/rump_lfs.0 man-sysutil-catman
puffs,.cat
-./usr/share/man/cat8/rump_msdos.0 man-sysutil-catman
puffs,.cat
-./usr/share/man/cat8/rump_nfs.0 man-sysutil-catman
puffs,.cat
-./usr/share/man/cat8/rump_ntfs.0 man-sysutil-catman
puffs,.cat
-./usr/share/man/cat8/rump_syspuffs.0 man-sysutil-catman
puffs,.cat
-./usr/share/man/cat8/rump_sysvbfs.0 man-sysutil-catman
puffs,.cat
-./usr/share/man/cat8/rump_tmpfs.0 man-sysutil-catman
puffs,.cat
-./usr/share/man/cat8/rump_udf.0 man-sysutil-catman
puffs,.cat
+./usr/share/man/cat8/rump_cd9660.0 man-sysutil-catman
puffs,.cat,rump
+./usr/share/man/cat8/rump_efs.0 man-sysutil-catman
puffs,.cat,rump
+./usr/share/man/cat8/rump_ext2fs.0 man-sysutil-catman
puffs,.cat,rump
+./usr/share/man/cat8/rump_ffs.0 man-sysutil-catman
puffs,.cat,rump
+./usr/share/man/cat8/rump_hfs.0 man-sysutil-catman
puffs,.cat,rump
+./usr/share/man/cat8/rump_lfs.0 man-sysutil-catman
puffs,.cat,rump
+./usr/share/man/cat8/rump_msdos.0 man-sysutil-catman
puffs,.cat,rump
+./usr/share/man/cat8/rump_nfs.0 man-sysutil-catman
puffs,.cat,rump
+./usr/share/man/cat8/rump_ntfs.0 man-sysutil-catman
puffs,.cat,rump
+./usr/share/man/cat8/rump_syspuffs.0 man-sysutil-catman
puffs,.cat,rump
+./usr/share/man/cat8/rump_sysvbfs.0 man-sysutil-catman
puffs,.cat,rump
+./usr/share/man/cat8/rump_tmpfs.0 man-sysutil-catman
puffs,.cat,rump
+./usr/share/man/cat8/rump_udf.0 man-sysutil-catman
puffs,.cat,rump
./usr/share/man/cat8/rusersd.0 man-netutil-catman .cat
./usr/share/man/cat8/rwalld.0 man-netutil-catman .cat
./usr/share/man/cat8/rwhod.0 man-netutil-catman .cat
@@ -4732,19 +4732,19 @@
./usr/share/man/html8/rtquery.html man-netutil-htmlman html
./usr/share/man/html8/rtsol.html man-netutil-htmlman
inet6,html
./usr/share/man/html8/rtsold.html man-netutil-htmlman
inet6,html
-./usr/share/man/html8/rump_cd9660.html man-sysutil-htmlman
puffs,html
-./usr/share/man/html8/rump_efs.html man-sysutil-htmlman
puffs,html
-./usr/share/man/html8/rump_ext2fs.html man-sysutil-htmlman
puffs,html
-./usr/share/man/html8/rump_ffs.html man-sysutil-htmlman
puffs,html
-./usr/share/man/html8/rump_hfs.html man-sysutil-htmlman
puffs,html
-./usr/share/man/html8/rump_lfs.html man-sysutil-htmlman
puffs,html
-./usr/share/man/html8/rump_msdos.html man-sysutil-htmlman
puffs,html
-./usr/share/man/html8/rump_nfs.html man-sysutil-htmlman
puffs,html
-./usr/share/man/html8/rump_ntfs.html man-sysutil-htmlman
puffs,html
-./usr/share/man/html8/rump_syspuffs.html man-sysutil-htmlman
puffs,html
-./usr/share/man/html8/rump_sysvbfs.html man-sysutil-htmlman
puffs,html
-./usr/share/man/html8/rump_tmpfs.html man-sysutil-htmlman
puffs,html
-./usr/share/man/html8/rump_udf.html man-sysutil-htmlman
puffs,html
+./usr/share/man/html8/rump_cd9660.html man-sysutil-htmlman
puffs,html,rump
+./usr/share/man/html8/rump_efs.html man-sysutil-htmlman
puffs,html,rump
+./usr/share/man/html8/rump_ext2fs.html man-sysutil-htmlman
puffs,html,rump
+./usr/share/man/html8/rump_ffs.html man-sysutil-htmlman
puffs,html,rump
+./usr/share/man/html8/rump_hfs.html man-sysutil-htmlman
puffs,html,rump
+./usr/share/man/html8/rump_lfs.html man-sysutil-htmlman
puffs,html,rump
+./usr/share/man/html8/rump_msdos.html man-sysutil-htmlman
puffs,html,rump
+./usr/share/man/html8/rump_nfs.html man-sysutil-htmlman
puffs,html,rump
+./usr/share/man/html8/rump_ntfs.html man-sysutil-htmlman
puffs,html,rump
+./usr/share/man/html8/rump_syspuffs.html man-sysutil-htmlman
puffs,html,rump
+./usr/share/man/html8/rump_sysvbfs.html man-sysutil-htmlman
puffs,html,rump
+./usr/share/man/html8/rump_tmpfs.html man-sysutil-htmlman
puffs,html,rump
+./usr/share/man/html8/rump_udf.html man-sysutil-htmlman
puffs,html,rump
./usr/share/man/html8/rusersd.html man-netutil-htmlman html
./usr/share/man/html8/rwalld.html man-netutil-htmlman html
./usr/share/man/html8/rwhod.html man-netutil-htmlman html
@@ -7290,19 +7290,19 @@
./usr/share/man/man8/rtquery.8 man-netutil-man .man
./usr/share/man/man8/rtsol.8 man-netutil-man
inet6,.man
./usr/share/man/man8/rtsold.8 man-netutil-man
inet6,.man
-./usr/share/man/man8/rump_cd9660.8 man-sysutil-man
puffs,.man
-./usr/share/man/man8/rump_efs.8 man-sysutil-man
puffs,.man
-./usr/share/man/man8/rump_ext2fs.8 man-sysutil-man
puffs,.man
-./usr/share/man/man8/rump_ffs.8 man-sysutil-man
puffs,.man
-./usr/share/man/man8/rump_hfs.8 man-sysutil-man
puffs,.man
-./usr/share/man/man8/rump_lfs.8 man-sysutil-man
puffs,.man
-./usr/share/man/man8/rump_msdos.8 man-sysutil-man
puffs,.man
-./usr/share/man/man8/rump_nfs.8 man-sysutil-man
puffs,.man
-./usr/share/man/man8/rump_ntfs.8 man-sysutil-man
puffs,.man
-./usr/share/man/man8/rump_syspuffs.8 man-sysutil-man
puffs,.man
-./usr/share/man/man8/rump_sysvbfs.8 man-sysutil-man
puffs,.man
-./usr/share/man/man8/rump_tmpfs.8 man-sysutil-man
puffs,.man
-./usr/share/man/man8/rump_udf.8 man-sysutil-man
puffs,.man
+./usr/share/man/man8/rump_cd9660.8 man-sysutil-man
puffs,.man,rump
+./usr/share/man/man8/rump_efs.8 man-sysutil-man
puffs,.man,rump
+./usr/share/man/man8/rump_ext2fs.8 man-sysutil-man
puffs,.man,rump
+./usr/share/man/man8/rump_ffs.8 man-sysutil-man
puffs,.man,rump
+./usr/share/man/man8/rump_hfs.8 man-sysutil-man
puffs,.man,rump
+./usr/share/man/man8/rump_lfs.8 man-sysutil-man
puffs,.man,rump
+./usr/share/man/man8/rump_msdos.8 man-sysutil-man
puffs,.man,rump
+./usr/share/man/man8/rump_nfs.8 man-sysutil-man
puffs,.man,rump
+./usr/share/man/man8/rump_ntfs.8 man-sysutil-man
puffs,.man,rump
+./usr/share/man/man8/rump_syspuffs.8 man-sysutil-man
puffs,.man,rump
+./usr/share/man/man8/rump_sysvbfs.8 man-sysutil-man
puffs,.man,rump
+./usr/share/man/man8/rump_tmpfs.8 man-sysutil-man
puffs,.man,rump
+./usr/share/man/man8/rump_udf.8 man-sysutil-man
puffs,.man,rump
./usr/share/man/man8/rusersd.8 man-netutil-man .man
./usr/share/man/man8/rwalld.8 man-netutil-man .man
./usr/share/man/man8/rwhod.8 man-netutil-man .man
diff --git a/distrib/sets/sets.subr b/distrib/sets/sets.subr
index eb85fd1..effb4fa 100644
--- a/distrib/sets/sets.subr
+++ b/distrib/sets/sets.subr
@@ -58,6 +58,7 @@ MKVARS="\
MKPOSTFIX \
MKPROFILE \
MKPUFFS \
+ MKRUMP \
MKSENDMAIL \
MKSHARE \
MKSKEY \
@@ -285,6 +286,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g"
# postfix ${MKPOSTFIX} != no
# profile ${MKPROFILE} != no
# puffs ${MKPUFFS} != no
+# rump ${MKRUMP} != no
# sendmail ${MKSENDMAIL} != no
# share ${MKSHARE} != no
# skey ${MKSKEY} != no
diff --git a/lib/Makefile b/lib/Makefile
index e78d439..17e2305 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -88,7 +88,9 @@ SUBDIR+= libkrb5 # depends on libcrypto and more
SUBDIR+= librefuse # depends on libpuffs
.endif
+.if (${MKRUMP} != "no")
SUBDIR+= librumpuser # depends on libpthread
+.endif
# XXX These bind9/ISC libraries should depend on each other but the
# XXX dependency ordering requires considerable investigation.
@@ -111,7 +113,9 @@ SUBDIR+= .WAIT libkadm5srv libkadm5clnt libkafs libsl
libss
SUBDIR+= ../external/bsd/openldap/lib
.endif
+.if (${MKRUMP} != "no")
SUBDIR+= librump # depends on librumpuser
+.endif
#==================== 3rd library dependency barrier ====================
SUBDIR+= .WAIT
@@ -120,11 +124,13 @@ SUBDIR+= .WAIT
SUBDIR+= libpam # depends on libkrb5, libkafs and more
.endif
+.if (${MKRUMP} != "no")
SUBDIR+= librumpnet # depends on librump
SUBDIR+= libukfs # depends on librump
+.endif
#==================== 4th library dependency barrier ====================
-.if (${MKPUFFS} != "no")
+.if (${MKPUFFS} != "no") && (${MKRUMP} != "no")
SUBDIR+= .WAIT
SUBDIR+= libp2k # depends on libpuffs and libukfs
.endif
diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index 7b154ff..f5ee644 100644
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -305,6 +305,10 @@ MKPUFFS If "no", don't build librefuse
(lib/librefuse) or
i.e. it will effectively default to "yes".
Default: no
+MKRUMP If "no", don't build Runnabel Userspace Meta Program support
+ libraries and executables.
+ Default: yes
+
MKSHARE If "no", act as "MKCATPAGES=no MKDOC=no MKHTML=no
MKINFO=no
MKMAN=no MKNLS=no".
I.e, don't build catman pages, documentation, Info
diff --git a/sys/Makefile b/sys/Makefile
index 6acae51..229993e 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -14,8 +14,10 @@ SUBDIR+=lkm modules
includes-lkm:
@true
+.if ${MKRUMP} != "no"
.if make(obj)
SUBDIR+= rump
.endif
+.endif
.include <bsd.kinc.mk>
diff --git a/usr.sbin/puffs/Makefile b/usr.sbin/puffs/Makefile
index 1a56204..6bbaadf 100644
--- a/usr.sbin/puffs/Makefile
+++ b/usr.sbin/puffs/Makefile
@@ -2,8 +2,10 @@
SUBDIR= mount_9p mount_portal mount_psshfs mount_sysctlfs
+.if ${MKRUMP} != "no"
SUBDIR+=rump_cd9660 rump_efs rump_ext2fs rump_ffs rump_hfs rump_lfs
SUBDIR+=rump_msdos rump_nfs rump_ntfs rump_syspuffs rump_sysvbfs
SUBDIR+=rump_tmpfs rump_udf
+.endif
.include <bsd.subdir.mk>
Home |
Main Index |
Thread Index |
Old Index