$NetBSD: patch-ag,v 1.6 2010/05/10 08:21:41 sbd Exp $ --- Configure.orig 2010-01-18 19:01:14.000000000 +0000 +++ Configure @@ -105,6 +105,7 @@ LSOF_VF=version # $LSOF_LOCALSUFFIX local suffix for Makefile # $LSOF_NBSD_BUFQH NetBSD copy status # $LSOF_NBSD_PTYFS NetBSD ${NETBSD_SYS}/sys/fs/ptyfs/ copy status +# $LSOF_NBSD_TMPFS NetBSD ${NETBSD_SYS}/sys/fs/tmpfs/ copy status # $LSOF_N_UNIXV *BSD system's kernel file # $LSOF_PL patch level # $LSOF_RANLIB randomizing command for the lsof library @@ -2778,6 +2779,11 @@ return(0); } # Validate the NetBSD version. case $LSOF_VSTR in # { + 0*|1.[01]*) + LSOF_VERS="1006000" + echo "!!!WARNING!!! Unsupported NetBSD version: $LSOF_VSTR" + echo "!!!WARNING!!! Configuring for NetBSD 1.2" + ;; 1.2*) LSOF_VERS="1002000" ;; @@ -2834,10 +2840,36 @@ return(0); } echo "!!!WARNING!!! Unsupported NetBSD version: $LSOF_VSTR" echo "!!!WARNING!!! Configuring for NetBSD 3.0" ;; + 4.0*) + LSOF_TSTBIGF=" " + LSOF_VERS="4000000" + ;; + 4.99.*) + LSOF_TSTBIGF=" " + LSOF_VERS="4099000" + ;; + 4*) + LSOF_VERS="4000000" + echo "!!!WARNING!!! Unsupported NetBSD version: $LSOF_VSTR" + echo "!!!WARNING!!! Configuring for NetBSD 4.0" + ;; + 5.0*) + LSOF_TSTBIGF=" " + LSOF_VERS="5000000" + ;; + 5.99.*) + LSOF_TSTBIGF=" " + LSOF_VERS="5099000" + ;; + 5*) + LSOF_VERS="5000000" + echo "!!!WARNING!!! Unsupported NetBSD version: $LSOF_VSTR" + echo "!!!WARNING!!! Configuring for NetBSD 5.0" + ;; *) + LSOF_VERS="5000000" echo "Unknown NetBSD release: $LSOF_VSTR" - echo Assuming NetBSD 1.6 - LSOF_VERS="1006000" + echo "!!!WARNING!!! Configuring for NetBSD 5.0" ;; esac # } fi # } @@ -2851,6 +2883,10 @@ return(0); } ;; 3000000|3099000) ;; + 4000000|4099000) + ;; + 5000000|5099000) + ;; *) echo "Unknown NetBSD version: $LSOF_VERS" rm -f $LSOF_HLP @@ -2859,7 +2895,10 @@ return(0); } esac # } LSOF_CFGF="$LSOF_CFGF -DNETBSDV=$LSOF_VERS" LSOF_TMP1="-DN_UNIXV=/netbsd" - if test -r ${LSOF_INCLUDE}/util.h # { + if test -r /dev/ksyms # { + then + LSOF_TMP1="-DN_UNIXV=/dev/ksyms" + elif test -r ${LSOF_INCLUDE}/util.h # { then grep -q getbootfile ${LSOF_INCLUDE}/util.h if test $? -eq 0 # { @@ -3258,6 +3297,7 @@ return(0); } fi # } LSOF_TMP2="sys/vnode.h" LSOF_NBSD_PTYFS=0 + LSOF_NBSD_TMPFS=0 if test -r ${LSOF_INCLUDE}/$LSOF_TMP2 # { then LSOF_TMP3="${LSOF_INCLUDE}/$LSOF_TMP2" @@ -3335,6 +3375,24 @@ return(0); } fi # } fi # } fi # } + grep -q VT_TMPFS $LSOF_TMP3 + if test $? -eq 0 # { + then + LSOF_TMP2="fs/tmpfs/tmpfs.h" + if test -r ${LSOF_INCLUDE}/$LSOF_TMP2 # { + then + LSOF_CFGF="$LSOF_CFGF -DHASTMPFS" + else + if test -r ${NETBSD_SYS}/$LSOF_TMP2 # { + then + if test $NETBSD_SYS != $LSOF_INCLUDE # { + then + LSOF_CFGF="$LSOF_CFGF -DHASTMPFS" + LSOF_NBSD_TMPFS=1 + fi # } + fi # } + fi # } + fi # } if test "X$NETBSD_UVM" = "X" # { then grep -q UVM $LSOF_TMP3 @@ -3620,6 +3678,28 @@ return(0); } LSOF_CFGF="$LSOF_CFGF -I`pwd`/dialects/n+obsd/include" fi # } fi # } + if test $LSOF_NBSD_TMPFS -eq 1 # { + then + + # Make a local copy of $NETBSD_SYS/sys/fs/tmpfs/tmpfs.h. + + if test ! -d dialects/n+obsd/include # { + then + mkdir dialects/n+obsd/include + fi # } + if test ! -d dialects/n+obsd/include/fs # { + then + mkdir dialects/n+obsd/include/fs + fi # } + rm -rf dialects/n+obsd/include/fs/tmpfs + mkdir dialects/n+obsd/include/fs/tmpfs + cp $NETBSD_SYS/fs/tmpfs/tmpfs.h dialects/n+obsd/include/fs/tmpfs + echo $LSOF_CFGF | grep /dialects/n+obsd/include > /dev/null 2>&1 + if test $? -ne 0 # { + then + LSOF_CFGF="$LSOF_CFGF -I`pwd`/dialects/n+obsd/include" + fi # } + fi # } LSOF_CFGL="$LSOF_CFGL -lkvm" LSOF_DIALECT_DIR=n+obsd ;; @@ -5300,7 +5380,7 @@ fi # } echo "" >> $LSOF_MKFC if test "X$LSOF_DEBUG" = "X" # { then - LSOF_DEBUG="-O" + LSOF_DEBUG="" else if test "X$LSOF_DEBUG" = "XNo-O" # { then