build.sh fails on netbsd-5 branch with MKDEBUG=yes

[Richard Hansen <rhansen%bbn.com@localhost>]

Hi all,

I'm getting a couple of checkflist errors when I run build.sh on the 
netbsd-5 branch with MKDEBUG=yes.  The attached patch appears to fix 
them.  Thoughts?

Thanks,
Richard


$ uname -a
NetBSD deer-netbsd.bbn.com 5.0_STABLE NetBSD 5.0_STABLE (GENERIC) #1: 
Tue Mar  2 15:04:02 EST 2010 
rhansen%deer-netbsd.bbn.com@localhost:/usr/obj/sys/arch/amd64/compile/GENERIC amd64
$ cat /etc/mk.conf
PKG_DEFAULT_OPTIONS = pam
WRKOBJDIR = /usr/pkgsrc-work
CREATE_WRKDIR_SYMLINK = no
DISTDIR = /usr/pkgsrc-dist
USE_CPUFLAGS = yes
PKGSRC_COMPILER = ccache gcc
CCACHE_DIR = ${HOME}/.ccache
USE_DESTDIR = yes
DEPENDS_TARGET = package-install
MKDEBUG = yes
PKG_DEVELOPER = yes
LOCALBASE ?= /usr/pkg
.if exists(${LOCALBASE}/bin/sudo)
SU_CMD = ${LOCALBASE}/bin/sudo /bin/sh -c
.endif
$ cd /usr/src
$ cat CVS/Tag
Tnetbsd-5
$ rm -rf /usr/obj/*
$ ./build.sh -O /usr/obj -T /usr/tools -U -u distribution
[snip]
checkflist ===> distrib/sets
( cat /usr/src/etc/mtree/NetBSD.dist ;  echo '/unset all' ;  cat 
/usr/obj/destdir.amd64/METALOG )  | /usr/tools/bin/nbmtree -C -k all -N 
/usr/src/etc > /usr/obj/destdir.amd64/METALOG.new &&  ( rm -f 
/usr/obj/destdir.amd64/METALOG ;  mv /usr/obj/destdir.amd64/METALOG.new 
/usr/obj/destdir.amd64/METALOG )
cat /usr/obj/destdir.amd64/METALOG | grep -v " optional" > 
/usr/obj/destdir.amd64/METALOG.sanitised
cd /usr/src/distrib/sets &&  DESTDIR=/usr/obj/destdir.amd64 
MACHINE=amd64 MACHINE_ARCH=x86_64  AWK=/usr/tools/bin/nbawk 
CKSUM=/usr/tools/bin/nbcksum  DB=/usr/tools/bin/nbdb  HOST_SH=/bin/sh 
MAKE=/usr/tools/bin/nbmake  MKTEMP=/usr/tools/bin/nbmktemp 
MTREE=/usr/tools/bin/nbmtree  PAX=/usr/tools/bin/nbpax 
SED=/usr/tools/bin/nbsed  TSORT=/usr/tools/bin/nbtsort\ -q  /bin/sh 
/usr/src/distrib/sets/checkflist    -M 
/usr/obj/destdir.amd64/METALOG.sanitised

=======  1 extra files in DESTDIR  =========
Files in DESTDIR but missing from flist.
File is obsolete or flist is out of date ?
------------------------------------------
./usr/libdata/debug/usr/sbin/hdaudioctl.debug
=========  end of 1 extra files  ===========


======  1 missing files in DESTDIR  ========
Files in flist but missing from DESTDIR.
File wasn't installed ?
------------------------------------------
./usr/libdata/debug/usr/sbin/audit-packages.debug
========  end of 1 missing files  ==========


*** Failed target:  checkflist
*** Failed command: cd /usr/src/distrib/sets && 
DESTDIR=/usr/obj/destdir.amd64 MACHINE=amd64 MACHINE_ARCH=x86_64 
AWK=/usr/tools/bin/nbawk CKSUM=/usr/tools/bin/nbcksum 
DB=/usr/tools/bin/nbdb HOST_SH=/bin/sh MAKE=/usr/tools/bin/nbmake 
MKTEMP=/usr/tools/bin/nbmktemp MTREE=/usr/tools/bin/nbmtree 
PAX=/usr/tools/bin/nbpax SED=/usr/tools/bin/nbsed 
TSORT=/usr/tools/bin/nbtsort\ -q /bin/sh 
/usr/src/distrib/sets/checkflist -M /usr/obj/destdir.amd64/METALOG.sanitised
*** Error code 1

Stop.
nbmake: stopped in /usr/src/distrib/sets

*** Failed target:  distribution
*** Failed command: _makedirtarget() { dir="$1"; shift; target="$1"; 
shift; case "${dir}" in /*) this="${dir}/"; real="${dir}" ;; .) this=""; 
real="/usr/src" ;; *) this="${dir}/"; real="/usr/src/${dir}" ;; esac; 
show=${this:-.}; echo "${target} ===> ${show%/}${1:+ (with: $@)}"; cd 
"${real}" && /usr/tools/bin/nbmake _THISDIR_="${this}" "$@" ${target}; 
}; _makedirtarget distrib/sets checkflist
*** Error code 1

Stop.
nbmake: stopped in /usr/src

ERROR: Failed to make distribution
*** BUILD ABORTED ***

Index: distrib/sets/lists/comp/mi
===================================================================
RCS file: /NETBSD-CVS/src/distrib/sets/lists/comp/mi,v
retrieving revision 1.1201.2.13
diff -u -r1.1201.2.13 mi
--- distrib/sets/lists/comp/mi  18 Oct 2009 18:26:26 -0000      1.1201.2.13
+++ distrib/sets/lists/comp/mi  3 Mar 2010 19:15:11 -0000
@@ -3197,7 +3197,7 @@
 ./usr/libdata/debug/usr/sbin/amd.debug         comp-amd-debug          debug
 ./usr/libdata/debug/usr/sbin/amq.debug         comp-amd-debug          debug
 ./usr/libdata/debug/usr/sbin/arp.debug         comp-netutil-debug      debug
-./usr/libdata/debug/usr/sbin/audit-packages.debug      comp-pkgutil-debug      
debug
+./usr/libdata/debug/usr/sbin/audit-packages.debug      comp-obsolete   
debug,obsolete
 ./usr/libdata/debug/usr/sbin/authpf.debug      comp-pf-debug           pf,debug
 ./usr/libdata/debug/usr/sbin/bootpd.debug      comp-bootserver-debug   debug
 ./usr/libdata/debug/usr/sbin/bootpef.debug     comp-bootserver-debug   debug
@@ -3243,6 +3243,7 @@
 ./usr/libdata/debug/usr/sbin/getencstat.debug  comp-sysutil-debug      debug
 ./usr/libdata/debug/usr/sbin/gpioctl.debug     comp-sysutil-debug      debug
 ./usr/libdata/debug/usr/sbin/gspa.debug                comp-util-debug         
debug
+./usr/libdata/debug/usr/sbin/hdaudioctl.debug  comp-sysutil-debug      debug
 ./usr/libdata/debug/usr/sbin/hlfsd.debug       comp-amd-debug          debug
 ./usr/libdata/debug/usr/sbin/hostapd.debug     comp-sysutil-debug      debug
 ./usr/libdata/debug/usr/sbin/hostapd_cli.debug comp-sysutil-debug      debug