diff options
-rw-r--r-- | distrib/alpha/bsd.rd/list.local | 1 | ||||
-rw-r--r-- | distrib/amd64/ramdisk_cd/list.local | 3 | ||||
-rw-r--r-- | distrib/armish/ramdisk/list | 3 | ||||
-rw-r--r-- | distrib/armv7/ramdisk/list | 3 | ||||
-rw-r--r-- | distrib/aviion/ramdisk/list | 4 | ||||
-rw-r--r-- | distrib/hp300/ramdisk/list | 4 | ||||
-rw-r--r-- | distrib/hppa/list | 5 | ||||
-rw-r--r-- | distrib/i386/ramdisk_cd/list.local | 3 | ||||
-rw-r--r-- | distrib/landisk/ramdisk/list | 3 | ||||
-rw-r--r-- | distrib/loongson/ramdisk/list | 3 | ||||
-rw-r--r-- | distrib/luna88k/ramdisk/list | 4 | ||||
-rw-r--r-- | distrib/macppc/ramdisk/list | 3 | ||||
-rw-r--r-- | distrib/miniroot/list | 3 | ||||
-rw-r--r-- | distrib/miniroot/list2sh.awk | 10 | ||||
-rw-r--r-- | distrib/miniroot/makehash.sh | 36 | ||||
-rw-r--r-- | distrib/miniroot/mtree.conf | 7 | ||||
-rw-r--r-- | distrib/mvme68k/ramdisk/list | 4 | ||||
-rw-r--r-- | distrib/mvme88k/ramdisk/list | 4 | ||||
-rw-r--r-- | distrib/octeon/ramdisk/list | 3 | ||||
-rw-r--r-- | distrib/ramdisk/list | 3 | ||||
-rw-r--r-- | distrib/sgi/ramdisk/list | 3 | ||||
-rw-r--r-- | distrib/socppc/ramdisk/list | 3 | ||||
-rw-r--r-- | distrib/sparc64/bsd.rd/list | 3 | ||||
-rw-r--r-- | distrib/vax/common/list | 3 | ||||
-rw-r--r-- | distrib/zaurus/ramdisk/list | 3 |
25 files changed, 23 insertions, 101 deletions
diff --git a/distrib/alpha/bsd.rd/list.local b/distrib/alpha/bsd.rd/list.local index 3dd16e15ad8..cdeaca66a0e 100644 --- a/distrib/alpha/bsd.rd/list.local +++ b/distrib/alpha/bsd.rd/list.local @@ -9,5 +9,4 @@ LINK instbin sbin/bioctl COPY ${DESTDIR}/etc/firmware/kue etc/firmware/kue COPY ${DESTDIR}/etc/firmware/3c990 etc/firmware/3c990 -HASH var/hash TZ diff --git a/distrib/amd64/ramdisk_cd/list.local b/distrib/amd64/ramdisk_cd/list.local index 059cf5fd3e4..d20acad57cf 100644 --- a/distrib/amd64/ramdisk_cd/list.local +++ b/distrib/amd64/ramdisk_cd/list.local @@ -1,4 +1,4 @@ -# $OpenBSD: list.local,v 1.23 2014/01/08 21:53:35 deraadt Exp $ +# $OpenBSD: list.local,v 1.24 2014/01/19 00:33:40 deraadt Exp $ # add local links; use bin/sh since instbin has already been unlinked LINK instbin sbin/ping6 @@ -30,5 +30,4 @@ COPY ${DESTDIR}/etc/firmware/run-rt3071 etc/firmware/run-rt3071 COPY ${DESTDIR}/etc/firmware/zd1211 etc/firmware/zd1211 COPY ${DESTDIR}/etc/firmware/zd1211b etc/firmware/zd1211b -HASH var/hash TZ diff --git a/distrib/armish/ramdisk/list b/distrib/armish/ramdisk/list index ace2596c990..119ddb3cb1d 100644 --- a/distrib/armish/ramdisk/list +++ b/distrib/armish/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.20 2014/01/11 05:40:16 deraadt Exp $ +# $OpenBSD: list,v 1.21 2014/01/19 00:33:40 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin @@ -86,5 +86,4 @@ SCRIPT ${CURDIR}/../../miniroot/install.sh install SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub SPECIAL chmod 755 install upgrade -HASH var/hash TZ diff --git a/distrib/armv7/ramdisk/list b/distrib/armv7/ramdisk/list index 1ca265922e4..615735639f1 100644 --- a/distrib/armv7/ramdisk/list +++ b/distrib/armv7/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.7 2014/01/11 05:40:16 deraadt Exp $ +# $OpenBSD: list,v 1.8 2014/01/19 00:33:40 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin @@ -92,5 +92,4 @@ SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub SPECIAL chmod 755 install upgrade SPECIAL tar cvf usr/mdec/u-boots.tgz /usr/mdec/ -HASH var/hash TZ diff --git a/distrib/aviion/ramdisk/list b/distrib/aviion/ramdisk/list index 489c8448da6..018e53bcf9b 100644 --- a/distrib/aviion/ramdisk/list +++ b/distrib/aviion/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.6 2014/01/11 05:40:16 deraadt Exp $ +# $OpenBSD: list,v 1.7 2014/01/19 00:33:40 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin @@ -81,5 +81,3 @@ SCRIPT ${CURDIR}/../../miniroot/upgrade.sh upgrade SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub SPECIAL chmod 755 install upgrade - -HASH var/hash diff --git a/distrib/hp300/ramdisk/list b/distrib/hp300/ramdisk/list index 7d5ffb1ffdd..e538c8e7d9c 100644 --- a/distrib/hp300/ramdisk/list +++ b/distrib/hp300/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.63 2014/01/11 05:40:16 deraadt Exp $ +# $OpenBSD: list,v 1.64 2014/01/19 00:33:40 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin @@ -87,5 +87,3 @@ SCRIPT ${CURDIR}/../../miniroot/install.sh install SCRIPT ${CURDIR}/../../miniroot/upgrade.sh upgrade SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub SPECIAL chmod 755 install upgrade - -HASH var/hash diff --git a/distrib/hppa/list b/distrib/hppa/list index 894cba3d767..93d0cce4437 100644 --- a/distrib/hppa/list +++ b/distrib/hppa/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.24 2014/01/11 05:40:14 deraadt Exp $ +# $OpenBSD: list,v 1.25 2014/01/19 00:33:40 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin @@ -70,6 +70,3 @@ SCRIPT ${CURDIR}/../../miniroot/upgrade.sh upgrade SCRIPT ${CURDIR}/../../miniroot/install.sh install SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub SPECIAL chmod 755 install upgrade - -# the hashes of the various install components -HASH var/hash diff --git a/distrib/i386/ramdisk_cd/list.local b/distrib/i386/ramdisk_cd/list.local index 90910f9435a..c31a069039f 100644 --- a/distrib/i386/ramdisk_cd/list.local +++ b/distrib/i386/ramdisk_cd/list.local @@ -1,4 +1,4 @@ -# $OpenBSD: list.local,v 1.33 2014/01/08 22:17:54 deraadt Exp $ +# $OpenBSD: list.local,v 1.34 2014/01/19 00:33:40 deraadt Exp $ # add local links; use bin/sh since instbin has already been unlinked LINK instbin sbin/mount_ext2fs @@ -49,5 +49,4 @@ COPY ${DESTDIR}/etc/firmware/zd1211b etc/firmware/zd1211b #COPY ${DESTDIR}/etc/firmware/atu-rfmd2958smc-ext etc/firmware/atu-rfmd2958smc-ext #COPY ${DESTDIR}/etc/firmware/atu-rfmd2958smc-int etc/firmware/atu-rfmd2958smc-int -HASH var/hash TZ diff --git a/distrib/landisk/ramdisk/list b/distrib/landisk/ramdisk/list index 56209838dd9..e40732ee818 100644 --- a/distrib/landisk/ramdisk/list +++ b/distrib/landisk/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.28 2014/01/11 05:40:16 deraadt Exp $ +# $OpenBSD: list,v 1.29 2014/01/19 00:33:40 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin @@ -115,5 +115,4 @@ SCRIPT ${CURDIR}/../../miniroot/install.sh install SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub SPECIAL chmod 755 install upgrade -HASH var/hash TZ diff --git a/distrib/loongson/ramdisk/list b/distrib/loongson/ramdisk/list index 8732f4477ed..62d1c28f313 100644 --- a/distrib/loongson/ramdisk/list +++ b/distrib/loongson/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.14 2014/01/11 05:40:16 deraadt Exp $ +# $OpenBSD: list,v 1.15 2014/01/19 00:33:40 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin @@ -112,5 +112,4 @@ SCRIPT ${CURDIR}/../../miniroot/install.sh install SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub SPECIAL chmod 755 install upgrade -HASH var/hash TZ diff --git a/distrib/luna88k/ramdisk/list b/distrib/luna88k/ramdisk/list index e18c97b726d..cfbc24b0fa0 100644 --- a/distrib/luna88k/ramdisk/list +++ b/distrib/luna88k/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.22 2014/01/11 05:40:16 deraadt Exp $ +# $OpenBSD: list,v 1.23 2014/01/19 00:33:40 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin @@ -79,5 +79,3 @@ SCRIPT ${CURDIR}/../../miniroot/upgrade.sh upgrade SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub SPECIAL chmod 755 install upgrade - -HASH var/hash diff --git a/distrib/macppc/ramdisk/list b/distrib/macppc/ramdisk/list index 71f2e8077fb..8f64b81dcdb 100644 --- a/distrib/macppc/ramdisk/list +++ b/distrib/macppc/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.50 2014/01/11 05:40:16 deraadt Exp $ +# $OpenBSD: list,v 1.51 2014/01/19 00:33:40 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin @@ -97,5 +97,4 @@ SCRIPT ${CURDIR}/../../miniroot/install.sh install SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub SPECIAL chmod 755 install upgrade -HASH var/hash TZ diff --git a/distrib/miniroot/list b/distrib/miniroot/list index cc627b8ebe0..a9f0fbea5c6 100644 --- a/distrib/miniroot/list +++ b/distrib/miniroot/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.52 2014/01/11 05:40:15 deraadt Exp $ +# $OpenBSD: list,v 1.53 2014/01/19 00:33:40 deraadt Exp $ # $NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $ SRCDIRS distrib/special @@ -69,5 +69,4 @@ SCRIPT ${CURDIR}/install.sh install SCRIPT ${CURDIR}/install.sub install.sub SPECIAL chmod 755 install upgrade -HASH var/hash TZ diff --git a/distrib/miniroot/list2sh.awk b/distrib/miniroot/list2sh.awk index a85f3ece233..405e1c834d1 100644 --- a/distrib/miniroot/list2sh.awk +++ b/distrib/miniroot/list2sh.awk @@ -1,4 +1,4 @@ -# $OpenBSD: list2sh.awk,v 1.17 2012/03/19 08:30:08 nicm Exp $ +# $OpenBSD: list2sh.awk,v 1.18 2014/01/19 00:33:40 deraadt Exp $ # $NetBSD: list2sh.awk,v 1.2 1996/05/04 15:45:31 pk Exp $ BEGIN { @@ -59,14 +59,6 @@ $1 == "CRUNCHSPECIAL" { # crunchgen directive; ignored here next; } -$1 == "HASH" { - printf("echo '%s' from RELEASEDIR=$RELEASEDIR for REV=$REV\n", $0); - printf("(cd ${TARGDIR}; sh $UTILS/makehash.sh %s $REV $RELEASEDIR", $2); - for (i = 3; i <= NF; i++) - printf(" %s", $i); - printf(")\n"); - next; -} $1 == "TZ" { printf("echo '%s'\n", $0); printf("(cd ${TARGDIR}; sh $UTILS/maketz.sh $DESTDIR)\n"); diff --git a/distrib/miniroot/makehash.sh b/distrib/miniroot/makehash.sh deleted file mode 100644 index c839266aacf..00000000000 --- a/distrib/miniroot/makehash.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -dir=$1 -rev=$2 - -if [ $# -lt 3 ]; then - echo makehash.sh: No RELEASEDIR -- skipping hash storage - exit 0 -fi - -rel=$3 - -#echo makehash args $dir $rev $rel - -for i in bsd bsd.mp; do - if [ -f $rel/$i ]; then - cat $rel/$i | sum -a sha256 > $dir/$i - #ls -alF $rel/$i - #echo $i `cat $dir/$i` - fi -done - -if [ $# -gt 3 ]; then - shift; shift; shift; - for i in $*; do - cat $rel/$i | sum -a sha256 > $dir/$i - #ls -alF $rel/$i - #echo $i `cat $dir/$i` - done -fi - -for i in base comp etc man game ; do - cat $rel/$i$rev.tgz | sum -a sha256 > $dir/$i$rev.tgz - #ls -alF $rel/$i$rev.tgz - #echo $i$rev.tgz `cat $dir/$i$rev.tgz` -done diff --git a/distrib/miniroot/mtree.conf b/distrib/miniroot/mtree.conf index fb4604d4a9d..778c7de60f7 100644 --- a/distrib/miniroot/mtree.conf +++ b/distrib/miniroot/mtree.conf @@ -1,4 +1,4 @@ -# $OpenBSD: mtree.conf,v 1.11 2014/01/09 15:43:16 deraadt Exp $ +# $OpenBSD: mtree.conf,v 1.12 2014/01/19 00:33:40 deraadt Exp $ # $NetBSD: mtree.conf,v 1.1.4.2 1996/07/15 06:29:38 leo Exp $ /set type=dir uname=root gname=wheel mode=0755 @@ -118,10 +118,5 @@ empty # ./var/empty .. -# ./var/hash -hash -# ./var/hash -.. - # ./var .. diff --git a/distrib/mvme68k/ramdisk/list b/distrib/mvme68k/ramdisk/list index e6a7ebb17c3..4c4c30d65d1 100644 --- a/distrib/mvme68k/ramdisk/list +++ b/distrib/mvme68k/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.47 2014/01/11 05:40:16 deraadt Exp $ +# $OpenBSD: list,v 1.48 2014/01/19 00:33:40 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin @@ -79,5 +79,3 @@ SCRIPT ${CURDIR}/../../miniroot/upgrade.sh upgrade SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub SPECIAL chmod 755 install upgrade - -HASH var/hash diff --git a/distrib/mvme88k/ramdisk/list b/distrib/mvme88k/ramdisk/list index 360d8ba6af0..6c769e91a6c 100644 --- a/distrib/mvme88k/ramdisk/list +++ b/distrib/mvme88k/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.45 2014/01/11 05:40:16 deraadt Exp $ +# $OpenBSD: list,v 1.46 2014/01/19 00:33:40 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin @@ -79,5 +79,3 @@ SCRIPT ${CURDIR}/../../miniroot/upgrade.sh upgrade SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub SPECIAL chmod 755 install upgrade - -HASH var/hash diff --git a/distrib/octeon/ramdisk/list b/distrib/octeon/ramdisk/list index 5bdc273983c..c126fad257d 100644 --- a/distrib/octeon/ramdisk/list +++ b/distrib/octeon/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.6 2014/01/11 05:40:16 deraadt Exp $ +# $OpenBSD: list,v 1.7 2014/01/19 00:33:40 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin @@ -87,5 +87,4 @@ SCRIPT ${CURDIR}/../../miniroot/install.sh install SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub SPECIAL chmod 755 install upgrade -HASH var/hash TZ diff --git a/distrib/ramdisk/list b/distrib/ramdisk/list index 55aa16ae61a..31cc35e4d11 100644 --- a/distrib/ramdisk/list +++ b/distrib/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.45 2014/01/11 05:40:15 deraadt Exp $ +# $OpenBSD: list,v 1.46 2014/01/19 00:33:40 deraadt Exp $ # $NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $ SRCDIRS distrib/special @@ -69,5 +69,4 @@ SCRIPT ${CURDIR}/../miniroot/install.sh install SCRIPT ${CURDIR}/../miniroot/install.sub install.sub SPECIAL chmod 755 install upgrade -HASH var/hash TZ diff --git a/distrib/sgi/ramdisk/list b/distrib/sgi/ramdisk/list index 80ddf658831..232fbad617c 100644 --- a/distrib/sgi/ramdisk/list +++ b/distrib/sgi/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.39 2014/01/11 05:40:16 deraadt Exp $ +# $OpenBSD: list,v 1.40 2014/01/19 00:33:40 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin @@ -93,5 +93,4 @@ SCRIPT ${CURDIR}/../../miniroot/install.sh install SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub SPECIAL chmod 755 install upgrade -HASH var/hash bsd.IP22 bsd.IP27 bsd.IP28 bsd.IP30 bsd.mp.IP30 bsd.IP32 TZ diff --git a/distrib/socppc/ramdisk/list b/distrib/socppc/ramdisk/list index 753c55aa478..6a8edfd02e4 100644 --- a/distrib/socppc/ramdisk/list +++ b/distrib/socppc/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.20 2014/01/11 05:40:16 deraadt Exp $ +# $OpenBSD: list,v 1.21 2014/01/19 00:33:40 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin @@ -108,5 +108,4 @@ SCRIPT ${CURDIR}/../../miniroot/install.sh install SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub SPECIAL chmod 755 install upgrade -HASH var/hash TZ diff --git a/distrib/sparc64/bsd.rd/list b/distrib/sparc64/bsd.rd/list index 2661a2d5547..90298f1c4c7 100644 --- a/distrib/sparc64/bsd.rd/list +++ b/distrib/sparc64/bsd.rd/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.45 2014/01/11 05:40:16 deraadt Exp $ +# $OpenBSD: list,v 1.46 2014/01/19 00:33:40 deraadt Exp $ # $NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $ SRCDIRS distrib/special @@ -97,5 +97,4 @@ COPY ${DESTDIR}/etc/firmware/rum-rt2573 etc/firmware/rum-rt2573 COPY ${DESTDIR}/etc/firmware/run-rt2870 etc/firmware/run-rt2870 COPY ${DESTDIR}/etc/firmware/run-rt3071 etc/firmware/run-rt3071 -HASH var/hash TZ diff --git a/distrib/vax/common/list b/distrib/vax/common/list index b538cff2eb6..fccab37a029 100644 --- a/distrib/vax/common/list +++ b/distrib/vax/common/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.27 2014/01/10 07:57:29 deraadt Exp $ +# $OpenBSD: list,v 1.28 2014/01/19 00:33:40 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin @@ -77,5 +77,4 @@ TERMCAP vt100,vt220,dumb usr/share/misc/termcap COPY ${DESTDIR}/bsd . COPY ${DESTDIR}/boot . -HASH var/hash TZ diff --git a/distrib/zaurus/ramdisk/list b/distrib/zaurus/ramdisk/list index 1af310a91ad..5e01b1bdd31 100644 --- a/distrib/zaurus/ramdisk/list +++ b/distrib/zaurus/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.24 2014/01/11 05:40:16 deraadt Exp $ +# $OpenBSD: list,v 1.25 2014/01/19 00:33:40 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin @@ -87,5 +87,4 @@ SCRIPT ${CURDIR}/../../miniroot/install.sh install SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub SPECIAL chmod 755 install upgrade -HASH var/hash TZ |