>Number:         3116
>Category:       misc
>Synopsis:       src/distrib/sets is not up to date and relies on x-bits
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    misc-bug-people (Misc Bug People)
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Jan 17 01:05:01 1997
>Last-Modified:
>Originator:     Andrew Wheadon
>Organization:
The cost of living hasn't affected its popularity. (Mark Twain)
current	release=doc host=netbsd.wifo.uni-mannheim.de \ "NetBSD-current mirror"
hostbase=/mit/ftp/pub/NetBSD base=/usr prefix=/usr backup delete use-rel-suffix
>Release:        15.01.97
>Environment:
	
System: NetBSD wipux2.wifo.uni-mannheim.de 1.2B NetBSD 1.2B (WIPOOL) #0: Sat Jan 11 03:34:48 MET 1997 toor@wipux2.wifo.uni-mannheim.de:/src/src/sys/arch/i386/compile/WIPOOL i386


>Description:
	the sets need updating to reflect current status. 
	I have done this for i386 and mi but not for other md.
	The scripts rely on executables being set, which aren't.
	The kc-stuff still uses ADP and OTHER.
	The etc/Makefile is not capable of being run with '-j 4'
>How-To-Repeat:
	make -j 4 distribution
	csh checkflist
>Fix:
	Warning this contains different parts which
	should be run from different directories.
	Look for '-----cut-----' to divide
	patch to sets:
-----cut-----

diff -r -u ../sets/checkflist ./checkflist
--- ../sets/checkflist	Sat Oct 14 00:48:20 1995
+++ ./checkflist	Thu Jan 16 15:25:26 1997
@@ -7,7 +7,7 @@
 
 set fsdir=$DESTDIR
 
-./makeflist >! /tmp/_CHECK.$$
+sh ./makeflist >! /tmp/_CHECK.$$
 ( cd $fsdir ; find . \( -type d -o -type f -o -type l \) ) | sort | \
     diff /tmp/_CHECK.$$ -
 /bin/rm -f /tmp/_CHECK.$$
diff -r -u ../sets/lists/base/md.i386 ./lists/base/md.i386
--- ../sets/lists/base/md.i386	Wed Dec  4 13:06:38 1996
+++ ./lists/base/md.i386	Thu Jan 16 15:20:08 1997
@@ -1,9 +1,11 @@
+./dev/vga
 ./sbin/fdisk
+./usr/bin/fdformat
 ./usr/lib/libc.so.12.8
 ./usr/lib/libcrypt.so.0.0
 ./usr/lib/libcurses.so.2.1
 ./usr/lib/libedit.so.0.0
-./usr/lib/libg++.so.3.0
+./usr/lib/libg++.so.4.0
 ./usr/lib/libgnumalloc.so.0.0
 ./usr/lib/libi386.so.0.2
 ./usr/lib/libkvm.so.4.0
@@ -11,7 +13,7 @@
 ./usr/lib/libpcap.so.0.0
 ./usr/lib/libresolv.so.1.0
 ./usr/lib/libskey.so.0.0
-./usr/lib/libstdc++.so.0.0
+./usr/lib/libstdc++.so.0.1
 ./usr/lib/libtelnet.so.1.0
 ./usr/lib/libtermcap.so.0.0
 ./usr/lib/libtermlib.so.0.0
diff -r -u ../sets/lists/base/mi ./lists/base/mi
--- ../sets/lists/base/mi	Wed Jan  8 13:07:38 1997
+++ ./lists/base/mi	Thu Jan 16 23:40:28 1997
@@ -38,6 +38,7 @@
 ./dev/fd
 ./etc
 ./etc/disklabels
+./etc/fstab.sd
 ./etc/kerberosIV
 ./etc/mtree
 ./etc/namedb
@@ -64,6 +65,7 @@
 ./sbin/halt
 ./sbin/ifconfig
 ./sbin/init
+./sbin/ipf
 ./sbin/ldconfig
 ./sbin/mknod
 ./sbin/modload
@@ -465,6 +467,9 @@
 ./usr/sbin/htable
 ./usr/sbin/inetd
 ./usr/sbin/iostat
+./usr/sbin/ipfstat
+./usr/sbin/ipmon
+./usr/sbin/ipnat
 ./usr/sbin/kvm_mkdb
 ./usr/sbin/lpc
 ./usr/sbin/lpd
@@ -515,6 +520,8 @@
 ./usr/sbin/stdhosts
 ./usr/sbin/sysctl
 ./usr/sbin/syslogd
+./usr/sbin/tcpdchk
+./usr/sbin/tcpdmatch
 ./usr/sbin/tcpdump
 ./usr/sbin/timed
 ./usr/sbin/timedc
@@ -534,6 +541,7 @@
 ./usr/sbin/ypxfr
 ./usr/sbin/zdump
 ./usr/sbin/zic
+./usr/sbin/zzz
 ./usr/share
 ./usr/share/calendar
 ./usr/share/calendar/calendar.birthday
diff -r -u ../sets/lists/comp/md.i386 ./lists/comp/md.i386
--- ../sets/lists/comp/md.i386	Wed Dec  4 13:06:40 1996
+++ ./lists/comp/md.i386	Thu Jan 16 15:20:07 1997
@@ -1,5 +1,7 @@
 ./usr/include/i386
 ./usr/include/machine/ansi.h
+./usr/include/machine/aout_machdep.h
+./usr/include/machine/apmvar.h
 ./usr/include/machine/asm.h
 ./usr/include/machine/bus.h
 ./usr/include/machine/cdefs.h
@@ -9,8 +11,8 @@
 ./usr/include/machine/cputypes.h
 ./usr/include/machine/db_machdep.h
 ./usr/include/machine/disklabel.h
+./usr/include/machine/elf_machdep.h
 ./usr/include/machine/endian.h
-./usr/include/machine/exec.h
 ./usr/include/machine/float.h
 ./usr/include/machine/frame.h
 ./usr/include/machine/freebsd_machdep.h
diff -r -u ../sets/lists/comp/mi ./lists/comp/mi
--- ../sets/lists/comp/mi	Thu Jan  9 13:08:01 1997
+++ ./lists/comp/mi	Thu Jan 16 23:42:11 1997
@@ -48,6 +48,8 @@
 ./usr/include/dev/eisa/eisavar.h
 ./usr/include/dev/ic
 ./usr/include/dev/ic/ad1848reg.h
+./usr/include/dev/ic/aic6360reg.h
+./usr/include/dev/ic/aic6360var.h
 ./usr/include/dev/ic/aic7xxxreg.h
 ./usr/include/dev/ic/aic7xxxvar.h
 ./usr/include/dev/ic/am7930reg.h
@@ -61,6 +63,7 @@
 ./usr/include/dev/ic/cyvar.h
 ./usr/include/dev/ic/dc21040reg.h
 ./usr/include/dev/ic/dp8390reg.h
+./usr/include/dev/ic/dp8390var.h
 ./usr/include/dev/ic/elink3reg.h
 ./usr/include/dev/ic/elink3var.h
 ./usr/include/dev/ic/hayespreg.h
@@ -127,13 +130,14 @@
 ./usr/include/dev/ofw/openfirm.h
 ./usr/include/dev/pci
 ./usr/include/dev/pci/if_levar.h
+./usr/include/dev/pci/if_devar.h
 ./usr/include/dev/pci/ncr_reg.h
 ./usr/include/dev/pci/pcidevs.h
 ./usr/include/dev/pci/pcidevs_data.h
 ./usr/include/dev/pci/pcireg.h
 ./usr/include/dev/pci/pcivar.h
 ./usr/include/dev/pci/ppbreg.h
-./usr/include/dev/md.h
+./usr/include/dev/ramdisk.h
 ./usr/include/dev/rcons
 ./usr/include/dev/rcons/raster.h
 ./usr/include/dev/rcons/rcons.h
@@ -904,8 +908,10 @@
 ./usr/libexec/lint1
 ./usr/libexec/lint2
 ./usr/lkm/cd9660.o
-./usr/lkm/compat_sunos.o
+./usr/lkm/compat_freebsd.o
+./usr/lkm/compat_linux.o
 ./usr/lkm/fdesc.o
+./usr/lkm/if_ipl.o
 ./usr/lkm/kernfs.o
 ./usr/lkm/mfs.o
 ./usr/lkm/msdosfs.o
@@ -1223,6 +1229,20 @@
 ./usr/share/man/cat3/dn_expand.0
 ./usr/share/man/cat3/drand48.0
 ./usr/share/man/cat3/edata.0
+./usr/share/man/cat3/editline.0
+./usr/share/man/cat3/el_deletestr.0
+./usr/share/man/cat3/el_end.0
+./usr/share/man/cat3/el_getc.0
+./usr/share/man/cat3/el_gets.0
+./usr/share/man/cat3/el_init.0
+./usr/share/man/cat3/el_insertstr.0
+./usr/share/man/cat3/el_line.0
+./usr/share/man/cat3/el_parse.0
+./usr/share/man/cat3/el_push.0
+./usr/share/man/cat3/el_reset.0
+./usr/share/man/cat3/el_resize.0
+./usr/share/man/cat3/el_set.0
+./usr/share/man/cat3/el_source.0
 ./usr/share/man/cat3/encrypt.0
 ./usr/share/man/cat3/end.0
 ./usr/share/man/cat3/endfsent.0
@@ -1364,6 +1384,9 @@
 ./usr/share/man/cat3/hash.0
 ./usr/share/man/cat3/heapsort.0
 ./usr/share/man/cat3/herror.0
+./usr/share/man/cat3/history.0
+./usr/share/man/cat3/history_end.0
+./usr/share/man/cat3/history_init.0
 ./usr/share/man/cat3/hosts_access.0
 ./usr/share/man/cat3/hosts_ctl.0
 ./usr/share/man/cat3/hstrerror.0
diff -r -u ../sets/lists/man/md.i386 ./lists/man/md.i386
--- ../sets/lists/man/md.i386	Sat Nov 30 13:07:00 1996
+++ ./lists/man/md.i386	Thu Jan 16 23:43:10 1997
@@ -11,3 +11,4 @@
 ./usr/share/man/cat8/i386/bad144.0
 ./usr/share/man/cat8/i386/apm.0
 ./usr/share/man/cat8/i386/apmd.0
+./usr/share/man/cat8/i386/zzz.0
diff -r -u ../sets/lists/man/mi ./lists/man/mi
--- ../sets/lists/man/mi	Wed Jan 15 13:07:39 1997
+++ ./lists/man/mi	Thu Jan 16 23:47:50 1997
@@ -289,6 +289,9 @@
 ./usr/share/man/cat4/imp.0
 ./usr/share/man/cat4/inet.0
 ./usr/share/man/cat4/ip.0
+./usr/share/man/cat4/ipf.0
+./usr/share/man/cat4/ipl.0
+./usr/share/man/cat4/ipnat.0
 ./usr/share/man/cat4/iso.0
 ./usr/share/man/cat4/lkm.0
 ./usr/share/man/cat4/lo.0
@@ -335,6 +338,7 @@
 ./usr/share/man/cat5/disklabel.0
 ./usr/share/man/cat5/disktab.0
 ./usr/share/man/cat5/dm.conf.0
+./usr/share/man/cat5/editrc.0
 ./usr/share/man/cat5/ethers.0
 ./usr/share/man/cat5/exports.0
 ./usr/share/man/cat5/fs.0
@@ -349,6 +353,8 @@
 ./usr/share/man/cat5/ifaliases.0
 ./usr/share/man/cat5/inetd.conf.0
 ./usr/share/man/cat5/inode.0
+./usr/share/man/cat5/ipf.0
+./usr/share/man/cat5/ipnat.0
 ./usr/share/man/cat5/lastlog.0
 ./usr/share/man/cat5/ld.so.conf.0
 ./usr/share/man/cat5/link.0
@@ -453,6 +459,10 @@
 ./usr/share/man/cat8/init.0
 ./usr/share/man/cat8/intro.0
 ./usr/share/man/cat8/iostat.0
+./usr/share/man/cat8/ipf.0
+./usr/share/man/cat8/ipfstat.0
+./usr/share/man/cat8/ipmon.0
+./usr/share/man/cat8/ipnat.0
 ./usr/share/man/cat8/kvm_mkdb.0
 ./usr/share/man/cat8/ldconfig.0
 ./usr/share/man/cat8/lfs_cleanerd.0
@@ -573,6 +583,8 @@
 ./usr/share/man/cat8/syslogd.0
 ./usr/share/man/cat8/talkd.0
 ./usr/share/man/cat8/tcpdump.0
+./usr/share/man/cat8/tcpdchk.0
+./usr/share/man/cat8/tcpdmatch.0
 ./usr/share/man/cat8/telnetd.0
 ./usr/share/man/cat8/tftpd.0
 ./usr/share/man/cat8/timed.0
diff -r -u ../sets/maketars ./maketars
--- ../sets/maketars	Tue May 21 13:12:55 1996
+++ ./maketars	Thu Jan 16 15:26:16 1997
@@ -44,7 +44,7 @@
 do
 	out=$setname.tar.gz
 	echo "making $out"
-	$setd/makeflist -arch $arch -setd $setd $setname |
+	sh $setd/makeflist -arch $arch -setd $setd $setname |
 	  (cd $dest ; pax -w -d) |
 	  gzip -9 > ${tars}/$setname.tar.gz
 done

	patch to distrib/i386
-----cut-----

diff -r -u ../i386/floppies/Makefile ./floppies/Makefile
--- ../i386/floppies/Makefile	Fri Jan 17 00:07:12 1997
+++ ./floppies/Makefile	Fri Jan 17 00:03:16 1997
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.4 1996/10/09 00:13:36 jtc Exp $
 
-SUBDIR= inst kcadp kcoth upgr
+SUBDIR= inst kc upgr
 
 .include <bsd.subdir.mk>
Only in ./floppies: kc

	shar instead of patch for floppies/kc 
	mkdir floppies/kc and cd into it.
	afterwards remove kcadp and kcoth
-----cut-----

# This archive contains:
#
#	kc/Makefile
#	kc/list
#	kc/obj
#
echo x - kc/Makefile
sed 's/^X//' >kc/Makefile << 'END-of-kc/Makefile'
X#	$NetBSD: Makefile,v 1.2 1996/10/09 00:13:50 jtc Exp $
X
XTOP=		${.CURDIR}/..
X
X.include "${TOP}/Makefile.inc"
XIMAGE=		kc-${REV}.fs
X
X.include "${TOP}/kc-common/Makefile.inc"
END-of-kc/Makefile
echo x - kc/list
sed 's/^X//' >kc/list << 'END-of-kc/list'
X#	$NetBSD: list,v 1.2 1996/10/09 00:13:51 jtc Exp $
X
X# copy the kernel
XCOPY	${CURDIR}/../../../../sys/arch/i386/compile/INSTALL/netbsd	netbsd
END-of-kc/list
echo c - kc/obj
mkdir -p kc/obj > /dev/null 2>&1
exit

	patch for etc/Makefile
-----cut-----

--- Makefile.old	Thu Jan 16 16:32:49 1997
+++ Makefile	Thu Jan 16 16:32:59 1997
@@ -65,8 +65,8 @@
 		    ${DESTDIR}/etc/mtree; \
 		${INSTALL} -c -o root -g wheel -m 444 4.4BSD.dist \
 		    ${DESTDIR}/etc/mtree)
-	cd namedb; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 ${NAMEDB} \
-	    ${DESTDIR}/etc/namedb
+	(cd namedb; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 ${NAMEDB} \
+	    ${DESTDIR}/etc/namedb)
 	/bin/rm -f ${DESTDIR}/etc/localtime
 	ln -s ${TZDIR}/${LOCALTIME} ${DESTDIR}/etc/localtime
 	/bin/rm -f ${DESTDIR}/etc/rmt

	
>Audit-Trail:
>Unformatted: