From d63e9ca599799f19eaf605137c371f768d0886e6 Mon Sep 17 00:00:00 2001 From: rjs Date: Sat, 28 Dec 2013 02:32:01 +0000 Subject: [PATCH] Only build shmif_dumpbus when rump is available. --- distrib/sets/lists/base/mi | 4 ++-- distrib/sets/lists/debug/mi | 4 ++-- distrib/sets/lists/man/mi | 8 ++++---- usr.bin/Makefile | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi index 2237ea484c32..4bb4e94c32a9 100644 --- a/distrib/sets/lists/base/mi +++ b/distrib/sets/lists/base/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1054 2013/12/26 20:14:38 apb Exp $ +# $NetBSD: mi,v 1.1055 2013/12/28 02:32:01 rjs Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -689,7 +689,7 @@ ./usr/bin/sha1 base-util-bin ./usr/bin/shar base-util-bin ./usr/bin/shlock base-util-bin -./usr/bin/shmif_dumpbus base-util-bin +./usr/bin/shmif_dumpbus base-util-bin rump ./usr/bin/showmount base-nfsclient-bin ./usr/bin/shuffle base-util-bin ./usr/bin/skey base-util-bin skey diff --git a/distrib/sets/lists/debug/mi b/distrib/sets/lists/debug/mi index 494dd607cf00..c4e9e75444cd 100644 --- a/distrib/sets/lists/debug/mi +++ b/distrib/sets/lists/debug/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.44 2013/12/25 22:08:24 christos Exp $ +# $NetBSD: mi,v 1.45 2013/12/28 02:32:01 rjs Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib @@ -715,7 +715,7 @@ ./usr/libdata/debug/usr/bin/seq.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/sftp.debug comp-secsh-debug crypto,debug ./usr/libdata/debug/usr/bin/shlock.debug comp-util-debug debug -./usr/libdata/debug/usr/bin/shmif_dumpbus.debug comp-util-debug debug +./usr/libdata/debug/usr/bin/shmif_dumpbus.debug comp-util-debug debug,rump ./usr/libdata/debug/usr/bin/showmount.debug comp-nfsclient-debug debug ./usr/libdata/debug/usr/bin/shuffle.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/size.debug comp-util-debug binutils,debug diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi index cbca190dc972..e6291653eff9 100644 --- a/distrib/sets/lists/man/mi +++ b/distrib/sets/lists/man/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1454 2013/12/25 22:08:24 christos Exp $ +# $NetBSD: mi,v 1.1455 2013/12/28 02:32:01 rjs Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -504,7 +504,7 @@ ./usr/share/man/cat1/sha1.0 man-util-catman .cat ./usr/share/man/cat1/shar.0 man-util-catman .cat ./usr/share/man/cat1/shlock.0 man-util-catman .cat -./usr/share/man/cat1/shmif_dumpbus.0 man-util-catman .cat +./usr/share/man/cat1/shmif_dumpbus.0 man-util-catman rump,.cat ./usr/share/man/cat1/shuffle.0 man-util-catman .cat ./usr/share/man/cat1/skey.0 man-util-catman skey,.cat ./usr/share/man/cat1/skeyaudit.0 man-util-catman skey,.cat @@ -3568,7 +3568,7 @@ ./usr/share/man/html1/sha1.html man-util-htmlman html ./usr/share/man/html1/shar.html man-util-htmlman html ./usr/share/man/html1/shlock.html man-util-htmlman html -./usr/share/man/html1/shmif_dumpbus.html man-util-htmlman html +./usr/share/man/html1/shmif_dumpbus.html man-util-htmlman rump,html ./usr/share/man/html1/shuffle.html man-util-htmlman html ./usr/share/man/html1/skey.html man-util-htmlman skey,html ./usr/share/man/html1/skeyaudit.html man-util-htmlman skey,html @@ -6282,7 +6282,7 @@ ./usr/share/man/man1/sha1.1 man-util-man .man ./usr/share/man/man1/shar.1 man-util-man .man ./usr/share/man/man1/shlock.1 man-util-man .man -./usr/share/man/man1/shmif_dumpbus.1 man-util-man .man +./usr/share/man/man1/shmif_dumpbus.1 man-util-man rump,.man ./usr/share/man/man1/shuffle.1 man-util-man .man ./usr/share/man/man1/skey.1 man-util-man skey,.man ./usr/share/man/man1/skeyaudit.1 man-util-man skey,.man diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 7c19bc5078ad..06524072f0c5 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.214 2013/11/22 16:10:25 christos Exp $ +# $NetBSD: Makefile,v 1.215 2013/12/28 02:32:01 rjs Exp $ # from: @(#)Makefile 8.3 (Berkeley) 1/7/94 .include @@ -23,7 +23,7 @@ SUBDIR= apply asa at audio audiocfg \ printenv printf progress pwhash qsubst quota radioctl rdist \ renice rev revoke rfcomm_sppd rlogin rpcgen rpcinfo rs rsh \ rup ruptime rusers rwall rwho \ - script sdiff sdpquery sed seq shar shlock shmif_dumpbus \ + script sdiff sdpquery sed seq shar shlock \ showmount shuffle sockstat sort spell split stat su systat \ tabs tail talk tcopy tee telnet tftp tic time tip touch tpfmt tput \ tr true tset tsort tty ul uname unexpand unifdef \ @@ -44,7 +44,7 @@ SUBDIR+= apropos whatis .endif .if (${MKRUMP} != "no") -SUBDIR+= rump_allserver rump_dhcpclient rump_halt rump_server +SUBDIR+= rump_allserver rump_dhcpclient rump_halt rump_server shmif_dumpbus .endif .if (${MKBSDGREP} != "no")