tools: some nbsd_ports fixes
. figure out which dates were used for various nbsd imports and specify them for each one in the nbsd_ports file . other minor fixes and improvements
This commit is contained in:
Ben Gras
parent
9e56468d6c
commit
6cdfedc12c
|
|
@ -110,14 +110,21 @@ install: includes services hdboot
|
||||||
nbsd_fetch:
|
nbsd_fetch:
|
||||||
export CVS_RSH=ssh; \
|
export CVS_RSH=ssh; \
|
||||||
echo "retrieving hierarchies from ${NBSD_CVSROOT}"; \
|
echo "retrieving hierarchies from ${NBSD_CVSROOT}"; \
|
||||||
for d in `awk '{print $$2;}' < nbsd_ports`; \
|
IFS=,; \
|
||||||
do echo "retrieving $$d .."; \
|
cat nbsd_ports | grep -v '^#' | while read port ; \
|
||||||
cd ${MINIXSRCDIR} && cvs -q -d ${NBSD_CVSROOT} co -N -d nbsdsrc $$d; \
|
do set $$port; \
|
||||||
|
date=$$1; minixpath=$$2; origpath=$$3; \
|
||||||
|
if [ $$# -lt 3 ]; then origpath=$$2; fi; \
|
||||||
|
echo "retrieving $$origpath .."; \
|
||||||
|
cd ${MINIXSRCDIR} && cvs -q -d ${NBSD_CVSROOT} co -N -D "$$date UTC" -d nbsdsrc "src/$$origpath" ; \
|
||||||
done
|
done
|
||||||
|
|
||||||
nbsd_diff:
|
nbsd_diff:
|
||||||
cd ${MINIXSRCDIR} && awk '{ system("sh tools/nbsd_diff.sh " \
|
find ${MINIXSRCDIR} -name minix-port.patch | xargs rm
|
||||||
"nbsdsrc/"$$2" "$$1" "$$1"/minix-port.patch");}' < tools/nbsd_ports
|
cat nbsd_ports | grep -v '^#' | \
|
||||||
|
( cd ${MINIXSRCDIR} && awk -F, '{ minixpath=$$2; origpath=$$3; if(NF < 3) { origpath=$$2; } system("sh tools/nbsd_diff.sh " \
|
||||||
|
"nbsdsrc/src/"origpath" "minixpath" "minixpath"/minix-port.patch");}' )
|
||||||
|
find ${MINIXSRCDIR} -name minix-port.patch | xargs wc -l | sort -n
|
||||||
|
|
||||||
|
|
||||||
# clean up compile results
|
# clean up compile results
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,15 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
echo "Updating $3"
|
diff=$3
|
||||||
diff -ru $1 $2 | \
|
rm -f "$diff"
|
||||||
|
if [ ! -d "$1" -o ! -d "$2" ]
|
||||||
|
then echo Skipping $diff
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
diff -aru $1 $2 | \
|
||||||
sed /"^Only in"/d | \
|
sed /"^Only in"/d | \
|
||||||
sed -e 's/^\(---.*\)\t.*/\1/' | \
|
sed -e 's/^\(---.*\)\t.*/\1/' | \
|
||||||
sed -e 's/^\(\+\+\+.*\)\t.*/\1/' > $3
|
sed -e 's/^\(\+\+\+.*\)\t.*/\1/' > $diff
|
||||||
|
|
||||||
|
if [ ! -s "$diff" ]
|
||||||
|
then rm -f "$diff"
|
||||||
|
fi
|
||||||
|
|
|
||||||
115
tools/nbsd_ports
115
tools/nbsd_ports
|
|
@ -1,56 +1,59 @@
|
||||||
external/public-domain/xz src/external/public-domain/xz
|
# Format:
|
||||||
usr.bin/gzip src/usr.bin/gzip
|
# Timestamp in UTC,minixpath,netbsdpath
|
||||||
bin/date src/bin/date
|
# minixpath: path in Minix source tree (starting from /usr/src/)
|
||||||
common/lib/libprop src/common/lib/libprop
|
# netbsdpath: path in BSD source tree (starting from src/)
|
||||||
include/ufs src/sys/ufs
|
2012/02/10 16:16:12,share/zoneinfo
|
||||||
sbin/newfs_ext2fs src/sbin/newfs_ext2fs
|
2011/05/26 00:00:00,external/public-domain/xz
|
||||||
sbin/fsck_ext2fs src/sbin/fsck_ext2fs
|
2011/09/30 01:32:21,usr.bin/gzip
|
||||||
lib/libprop src/lib/libprop
|
2011/08/27 12:55:09,bin/date
|
||||||
common/include/arch/x86 src/sys/arch/x86/include
|
2011/10/17 09:24:54,common/lib/libprop
|
||||||
common/include/arch/i386 src/sys/arch/i386/include
|
2011/11/28 12:50:07,include/ufs,sys/ufs
|
||||||
common/include src/common/include
|
2010/09/10 15:51:20,sbin/newfs_ext2fs
|
||||||
common/lib/libc src/common/lib/libc
|
2011/09/16 16:13:18,sbin/fsck_ext2fs
|
||||||
lib/libc src/lib/libc
|
2011/09/30 22:08:19,lib/libprop
|
||||||
lib/libm src/lib/libm
|
2011/08/30 12:39:55,common/include/arch/i386,sys/arch/i386/include
|
||||||
lib/libcrypt src/lib/libcrypt
|
2011/11/13 22:19:09,common/include
|
||||||
lib/libterminfo src/lib/libterminfo
|
2011/01/17 18:11:10,common/lib/libc
|
||||||
lib/libcurses src/lib/libcurses
|
2011/01/21 23:36:49,lib/libc
|
||||||
lib/libutil src/lib/libutil
|
2011/01/12 23:03:56,lib/libm
|
||||||
common/lib/libutil src/common/lib/libutil
|
2009/05/01 00:28:17,lib/libcrypt
|
||||||
lib/libbz2 src/lib/libbz2
|
2010/10/12 12:57:51,lib/libterminfo
|
||||||
include src/include
|
2011/01/06 11:29:40,lib/libcurses
|
||||||
bin/mkdir src/bin/mkdir
|
2010/12/22 09:12:28,lib/libutil
|
||||||
bin/rm src/bin/rm
|
2009/05/13 02:50:31,common/lib/libutil
|
||||||
bin/rmdir src/bin/rmdir
|
2008/08/29 00:02:22,lib/libbz2
|
||||||
usr.sbin/fsck src/usr.sbin/fsck
|
2011/01/21 23:36:49,include
|
||||||
usr.bin/chpass src/usr.bin/chpass
|
2008/07/20 00:52:40,bin/mkdir
|
||||||
usr.bin/m4 src/usr.bin/m4
|
2011/08/29 14:48:46,bin/rm
|
||||||
usr.bin/indent src/usr.bin/indent
|
2011/08/29 14:49:38,bin/rmdir
|
||||||
usr.bin/sed src/usr.bin/sed
|
2011/06/09 21:23:29,sbin/fsck
|
||||||
usr.bin/stat src/usr.bin/stat
|
2009/04/11 12:10:02,usr.bin/chpass
|
||||||
usr.bin/tic src/usr.bin/tic
|
2010/05/14 17:14:28,usr.bin/m4
|
||||||
usr.bin/mkdep src/usr.bin/mkdep
|
2011/01/12 06:17:52,usr.bin/indent
|
||||||
usr.bin/newgrp src/usr.bin/newgrp
|
2010/02/19 16:35:27,usr.bin/sed
|
||||||
usr.bin/uniq src/usr.bin/uniq
|
2011/01/15 22:54:10,usr.bin/stat
|
||||||
usr.bin/seq src/usr.bin/seq
|
2010/02/22 23:05:39,usr.bin/tic
|
||||||
usr.bin/du src/usr.bin/du
|
2010/10/15 05:46:48,usr.bin/mkdep
|
||||||
usr.bin/man src/usr.bin/man
|
2010/05/14 17:28:23,usr.bin/newgrp
|
||||||
usr.bin/apropos src/usr.bin/apropos
|
2010/10/06 07:59:18,usr.bin/uniq
|
||||||
usr.bin/mdocml src/external/bsd/mdocml
|
2010/05/27 08:40:19,usr.bin/seq
|
||||||
usr.sbin/installboot src/usr.sbin/installboot
|
2011/09/01 13:37:33,usr.bin/du
|
||||||
usr.sbin/pwd_mkdb src/usr.sbin/pwd_mkdb
|
2010/07/07 21:24:34,usr.bin/man
|
||||||
usr.sbin/user src/usr.sbin/user
|
2009/05/08 12:48:43,usr.bin/apropos
|
||||||
usr.sbin/vipw src/usr.sbin/vipw
|
2011/01/12 23:02:22,usr.bin/mdocml,external/bsd/mdocml
|
||||||
usr.sbin/zic src/usr.sbin/zic
|
2011/11/03 20:46:41,usr.sbin/installboot
|
||||||
usr.bin/bzip2 src/usr.bin/bzip2
|
2011/01/04 10:01:51,usr.sbin/pwd_mkdb
|
||||||
usr.bin/bzip2recover src/usr.bin/bzip2recover
|
2011/01/04 10:30:21,usr.sbin/user
|
||||||
libexec/makewhatis src/libexec/makewhatis
|
2009/04/19 00:44:49,usr.sbin/vipw
|
||||||
dist/bzip2 src/dist/bzip2
|
2009/04/22 15:23:10,usr.sbin/zic
|
||||||
share/zoneinfo src/share/zoneinfo
|
2007/05/28 12:06:24,usr.bin/bzip2
|
||||||
sys/arch/i386/stand/bootxx src/sys/arch/i386/stand/bootxx
|
2007/05/28 12:06:25,usr.bin/bzip2recover
|
||||||
sys/arch/i386/stand/boot src/sys/arch/i386/stand/boot
|
2009/04/02 21:39:33,libexec/makewhatis
|
||||||
sys/arch/i386/stand/cdboot src/sys/arch/i386/stand/cdboot
|
2010/05/14 16:43:34,dist/bzip2
|
||||||
sys/arch/i386/stand/mbr src/sys/arch/i386/stand/mbr
|
2011/08/17 00:07:38,sys/arch/i386/stand/bootxx
|
||||||
sys/arch/i386/stand/lib src/sys/arch/i386/stand/lib
|
2011/12/25 06:09:09,sys/arch/i386/stand/boot
|
||||||
sys/lib/libsa src/sys/lib/libsa
|
2011/05/20 22:29:55,sys/arch/i386/stand/cdboot
|
||||||
sys/lib/libz src/sys/lib/libz
|
2011/09/21 18:15:59,sys/arch/i386/stand/mbr
|
||||||
|
2011/11/28 07:56:54,sys/arch/i386/stand/lib
|
||||||
|
2012/01/16 18:47:57,sys/lib/libsa
|
||||||
|
2011/10/30 00:28:57,sys/lib/libz
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue