diff options
| author | jschauma <jschauma@pkgsrc.org> | 2005-01-24 15:00:48 +0000 |
|---|---|---|
| committer | jschauma <jschauma@pkgsrc.org> | 2005-01-24 15:00:48 +0000 |
| commit | 0c0134061b415b32c9ad6adaa47ed4497b5534eb (patch) | |
| tree | ce68386b2fd1f8ea76ebdfe8d36046cac4c9aa18 | |
| parent | 216303bb889d4125eca5a394da4500bda6fa5ba3 (diff) | |
| download | pkgsrc-0c0134061b415b32c9ad6adaa47ed4497b5534eb.tar.gz | |
Per default, only create md5 and sha1 checksums.
(These are available on all platforms via digest(1).)
Set commands for other checksums on a per OPSYS basis.
Set MKSUSM=yes back as the default.
| -rw-r--r-- | mk/bulk/build.conf-example | 4 | ||||
| -rw-r--r-- | mk/bulk/upload | 38 |
2 files changed, 25 insertions, 17 deletions
diff --git a/mk/bulk/build.conf-example b/mk/bulk/build.conf-example index cb87a4a010a..976e113b8fc 100644 --- a/mk/bulk/build.conf-example +++ b/mk/bulk/build.conf-example @@ -1,5 +1,5 @@ # build.conf -# $NetBSD: build.conf-example,v 1.25 2005/01/24 13:21:13 tv Exp $ +# $NetBSD: build.conf-example,v 1.26 2005/01/24 15:00:48 jschauma Exp $ # # config file in /bin/sh syntax for {,pre,post}-build # @@ -66,7 +66,7 @@ RSYNC_OPTS='-e ssh' NICE_LEVEL="nice -n 20" # Whether or not to create checksum files -MKSUMS=no +MKSUMS=yes # If you want to PGP sign the checksum files, set and correct #SIGN_AS=username@NetBSD.org diff --git a/mk/bulk/upload b/mk/bulk/upload index 96371ed0763..a5ed84ce3c2 100644 --- a/mk/bulk/upload +++ b/mk/bulk/upload @@ -1,22 +1,24 @@ #!/bin/sh -# $NetBSD: upload,v 1.20 2005/01/24 03:41:34 jschauma Exp $ +# $NetBSD: upload,v 1.21 2005/01/24 15:00:48 jschauma Exp $ # # Upload non-restricted binary pkgs to ftp server # -CKSUM="cksum"; MD5="digest md5"; SHA1="digest sha1"; -BSDSUM="sum -o 1"; -SYSVSUM="sum -o 2"; opsys=`uname -s` case "$opsys" in -NetBSD) BMAKE=make ;; +NetBSD) BMAKE=make; + BSDSUM="sum -o 1"; + CKSUM="cksum"; + SYSVSUM="sum -o 2"; + ;; IRIX*) BMAKE=bmake; - BSDSUM="sum -r"; - SYSVSUM="sum"; +# BSDSUM="sum -r"; +# CKSUM="cksum"; +# SYSVSUM="sum"; ;; *) BMAKE=bmake ;; esac @@ -124,6 +126,11 @@ if [ "${MKSUMS}" = "yes" -o "${MKSUMS}" = "YES" ]; then fi ( cd ${pkgsrcdir}/pkgtools/digest; ${BMAKE} bulk-install ) + + [ -z "${BSDSUM}" ] && BSDSUM="echo" + [ -z "${CKSUM}" ] && CKSUM="echo" + [ -z "${SYSVSUM}" ] && SYSVSUM="echo" + for i in All/*; do if ! grep -q $i $exf; then ${BSDSUM} $i >> BSDSUM @@ -133,19 +140,20 @@ if [ "${MKSUMS}" = "yes" -o "${MKSUMS}" = "YES" ]; then ${SYSVSUM} $i >> SYSVSUM fi done + + [ "${BSDSUM}" = "echo" ] && rm BSDSUM + [ "${CKSUM}" = "echo" ] && rm CKSUM + [ "${SYSVSUM}" = "echo" ] && rm SYSVSUM if [ x"${SIGN_AS}" != x"" ]; then for i in ${SUMFILES}; do - echo "Signing $i" - gpg --clearsign $i && rm $i + if [ -s $i ]; then + echo "Signing $i" + gpg --clearsign $i && rm $i + echo ${i}.asc >> $osf + fi done - SUMFILES="BSDSUM.asc CKSUM.asc MD5.asc SHA1.asc SYSVSUM.asc" fi - - for i in ${SUMFILES}; do - [ -s ${packages}/${i} ] && echo $i >> $osf - done - fi |