From 3f0d7066b3d177ebd2be50b6eb3153858d0ed733 Mon Sep 17 00:00:00 2001 From: bjh21 Date: Sun, 31 Mar 2002 16:07:53 +0000 Subject: [PATCH] Add a MAKESUMS variable which invokes makesums with CKSUM in its environment. Use this whenever we want to invoke makesums. --- etc/Makefile | 7 ++++--- etc/etc.acorn32/Makefile.inc | 6 +++--- etc/etc.amiga/Makefile.inc | 4 ++-- etc/etc.atari/Makefile.inc | 4 ++-- etc/etc.cats/Makefile.inc | 6 +++--- etc/etc.hp300/Makefile.inc | 4 ++-- etc/etc.i386/Makefile.inc | 4 ++-- etc/etc.mac68k/Makefile.inc | 4 ++-- etc/etc.mvme68k/Makefile.inc | 6 +++--- etc/etc.netwinder/Makefile.inc | 6 +++--- etc/etc.prep/Makefile.inc | 4 ++-- etc/etc.shark/Makefile.inc | 5 ++--- etc/etc.sparc/Makefile.inc | 4 ++-- etc/etc.sparc64/Makefile.inc | 4 ++-- etc/etc.x68k/Makefile.inc | 4 ++-- 15 files changed, 36 insertions(+), 36 deletions(-) diff --git a/etc/Makefile b/etc/Makefile index 3d7cab2179a7..934e849b500c 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.205 2002/03/29 04:45:37 matt Exp $ +# $NetBSD: Makefile,v 1.206 2002/03/31 16:07:53 bjh21 Exp $ # from: @(#)Makefile 8.7 (Berkeley) 5/25/95 # Environment variables without default values: @@ -46,6 +46,7 @@ NOOBJ= # defined TZDIR= /usr/share/zoneinfo LOCALTIME?= UTC PWD_MKDB?= pwd_mkdb +MAKESUMS= CKSUM=${CKSUM:Q} sh ../distrib/sets/makesums # Flags for creating ISO CDROM image # mkisofs is expected to be in $PATH, install via pkgsrc/sysutils/cdrecord @@ -278,7 +279,7 @@ distrib-dirs: check_DESTDIR release snapshot: check_DESTDIR check_RELEASEDIR .WAIT \ distribution snap_pre snap_md_pre snap_kern snap_md_post (cd ../distrib/sets; ${MAKE} sets) - sh ../distrib/sets/makesums -t ${RELEASEDIR}/binary/kernel '*.gz' + ${MAKESUMS} -t ${RELEASEDIR}/binary/kernel '*.gz' # Standalone target to create a CDROM image after the release # was composed. Should be run after "make build" in both src and xsrc @@ -290,7 +291,7 @@ iso-image_mi: check_DESTDIR check_RELEASEDIR .WAIT iso-image_md_pre ${MKISOFS} ${MKISOFS_FLAGS} \ -o ${RELEASEDIR}/installation/cdrom/netbsd-${MACHINE}.iso \ ${RELEASEDIR} ; \ - sh ../distrib/sets/makesums -t ${RELEASEDIR}/installation/cdrom '*.iso' ; \ + ${MAKESUMS} -t ${RELEASEDIR}/installation/cdrom '*.iso' ; \ else \ echo "install pkgsrc/sysutils/cdrecord and type 'make iso-image'." ; \ fi diff --git a/etc/etc.acorn32/Makefile.inc b/etc/etc.acorn32/Makefile.inc index 9395047bb0dd..c8c24951b2b2 100644 --- a/etc/etc.acorn32/Makefile.inc +++ b/etc/etc.acorn32/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.4 2002/03/20 17:05:52 bjh21 Exp $ +# $NetBSD: Makefile.inc,v 1.5 2002/03/31 16:07:54 bjh21 Exp $ # # etc.acorn32/Makefile.inc -- acorn32-specific etc Makefile targets # @@ -17,5 +17,5 @@ snap_md_post: cd ${.CURDIR}/../distrib && ${MAKE} depend && ${MAKE} cd ${.CURDIR}/../distrib/acorn32 && ${MAKE} release cd ${.CURDIR}/../distrib/notes && ${MAKE} release - sh ../distrib/sets/makesums -t ${RELEASEDIR}/installation/kernel '*.gz' - sh ../distrib/sets/makesums -t ${RELEASEDIR}/installation/misc '*.gz' + ${MAKESUMS} -t ${RELEASEDIR}/installation/kernel '*.gz' + ${MAKESUMS} -t ${RELEASEDIR}/installation/misc '*.gz' diff --git a/etc/etc.amiga/Makefile.inc b/etc/etc.amiga/Makefile.inc index f2ccb54f8165..5bc4203736f0 100644 --- a/etc/etc.amiga/Makefile.inc +++ b/etc/etc.amiga/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.16 2002/02/10 20:43:34 is Exp $ +# $NetBSD: Makefile.inc,v 1.17 2002/03/31 16:07:54 bjh21 Exp $ # # etc.amiga/Makefile.inc -- amiga-specific etc Makefile targets # @@ -18,4 +18,4 @@ snap_md_post: cd ${.CURDIR}/../distrib && ${MAKE} depend && ${MAKE} cd ${.CURDIR}/../distrib/miniroot && ${MAKE} && ${MAKE} release cd ${.CURDIR}/../distrib/notes && ${MAKE} release -# sh ${.CURDIR}/../distrib/sets/makesums -t ${RELEASEDIR}/installation/miniroot '*.gz' +# ${MAKESUMS} -t ${RELEASEDIR}/installation/miniroot '*.gz' diff --git a/etc/etc.atari/Makefile.inc b/etc/etc.atari/Makefile.inc index 277d545ddca5..5a52de3a718e 100644 --- a/etc/etc.atari/Makefile.inc +++ b/etc/etc.atari/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.8 2001/11/29 22:45:55 thorpej Exp $ +# $NetBSD: Makefile.inc,v 1.9 2002/03/31 16:07:54 bjh21 Exp $ # # etc.atari/Makefile.inc -- atari-specific etc Makefile targets # @@ -17,4 +17,4 @@ snap_md_post: cd ${.CURDIR}/../distrib && ${MAKE} depend && ${MAKE} cd ${.CURDIR}/../distrib/miniroot && ${MAKE} && ${MAKE} release cd ${.CURDIR}/../distrib/notes && ${MAKE} release -# sh ${.CURDIR}/../distrib/sets/makesums -t ${RELEASEDIR}/installation/miniroot '*.gz' +# ${MAKESUMS} -t ${RELEASEDIR}/installation/miniroot '*.gz' diff --git a/etc/etc.cats/Makefile.inc b/etc/etc.cats/Makefile.inc index d2977abba4d0..da4e2ce97901 100644 --- a/etc/etc.cats/Makefile.inc +++ b/etc/etc.cats/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.2 2002/03/20 17:05:52 bjh21 Exp $ +# $NetBSD: Makefile.inc,v 1.3 2002/03/31 16:07:54 bjh21 Exp $ # # etc.cats/Makefile.inc -- cats-specific etc Makefile targets # @@ -18,5 +18,5 @@ snap_md_post: # cd ${.CURDIR}/../distrib && ${MAKE} depend && ${MAKE} # cd ${.CURDIR}/../distrib/cats && ${MAKE} release cd ${.CURDIR}/../distrib/notes && ${MAKE} release -# sh ../distrib/sets/makesums -t ${RELEASEDIR}/installation/kernel '*.gz' -# sh ../distrib/sets/makesums -t ${RELEASEDIR}/installation/misc '*.gz' +# ${MAKESUMS} -t ${RELEASEDIR}/installation/kernel '*.gz' +# ${MAKESUMS} -t ${RELEASEDIR}/installation/misc '*.gz' diff --git a/etc/etc.hp300/Makefile.inc b/etc/etc.hp300/Makefile.inc index 185d2e3882b2..354d75bfc004 100644 --- a/etc/etc.hp300/Makefile.inc +++ b/etc/etc.hp300/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.11 2002/02/13 06:30:46 gmcgarry Exp $ +# $NetBSD: Makefile.inc,v 1.12 2002/03/31 16:07:55 bjh21 Exp $ # # etc.hp300/Makefile.inc -- hp300-specific etc Makefile targets # @@ -18,4 +18,4 @@ snap_md_post: cd ${.CURDIR}/../distrib/miniroot && ${MAKE} release cd ${.CURDIR}/../sys/arch/hp300/stand && \ ${MAKE} depend && ${MAKE} && ${MAKE} release - sh ${.CURDIR}/../distrib/sets/makesums -t ${RELEASEDIR}/installation/misc 'SYS*' + ${MAKESUMS} -t ${RELEASEDIR}/installation/misc 'SYS*' diff --git a/etc/etc.i386/Makefile.inc b/etc/etc.i386/Makefile.inc index 784aefacadfa..ce6874c97101 100644 --- a/etc/etc.i386/Makefile.inc +++ b/etc/etc.i386/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.30 2001/11/29 22:45:56 thorpej Exp $ +# $NetBSD: Makefile.inc,v 1.31 2002/03/31 16:07:55 bjh21 Exp $ # # etc.i386/Makefile.inc -- i386-specific etc Makefile targets # @@ -23,7 +23,7 @@ snap_md_post: cd ${.CURDIR}/../distrib/i386 && ${MAKE} release cd ${.CURDIR}/../distrib/notes && ${MAKE} release cd ${.CURDIR}/../sys/arch/i386/stand/dosboot && ${MAKE} release - sh ../distrib/sets/makesums -t ${RELEASEDIR}/installation/floppy '*.gz' + ${MAKESUMS} -t ${RELEASEDIR}/installation/floppy '*.gz' # For "make iso-image" iso-image_md_pre: diff --git a/etc/etc.mac68k/Makefile.inc b/etc/etc.mac68k/Makefile.inc index 2ec6dc20d06b..88fa9ce38322 100644 --- a/etc/etc.mac68k/Makefile.inc +++ b/etc/etc.mac68k/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.11 2002/03/04 16:43:06 shiba Exp $ +# $NetBSD: Makefile.inc,v 1.12 2002/03/31 16:07:55 bjh21 Exp $ # # mac68k-specific release building goo # @@ -16,4 +16,4 @@ snap_md_post: cd ${.CURDIR}/../distrib && ${MAKE} depend && ${MAKE} cd ${.CURDIR}/../distrib/mac68k && ${MAKE} release cd ${.CURDIR}/../distrib/notes && ${MAKE} release - sh ../distrib/sets/makesums -t ${RELEASEDIR}/installation/instkernel '*.gz' + ${MAKESUMS} -t ${RELEASEDIR}/installation/instkernel '*.gz' diff --git a/etc/etc.mvme68k/Makefile.inc b/etc/etc.mvme68k/Makefile.inc index 2e6f84fdb533..315e642130e8 100644 --- a/etc/etc.mvme68k/Makefile.inc +++ b/etc/etc.mvme68k/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.3 2001/11/29 22:45:57 thorpej Exp $ +# $NetBSD: Makefile.inc,v 1.4 2002/03/31 16:07:55 bjh21 Exp $ # # etc.mvme68k/Makefile.inc -- mvme68k-specific etc Makefile targets # @@ -25,6 +25,6 @@ snap_md_post: cp -p ${DESTDIR}/usr/mdec/netboot ${RELEASEDIR}/installation/netboot cp -p ${DESTDIR}/usr/mdec/stboot ${RELEASEDIR}/installation/tapeimage cp -p ${DESTDIR}/usr/mdec/bootst ${RELEASEDIR}/installation/tapeimage - sh ../distrib/sets/makesums -t ${RELEASEDIR}/installation/netboot -all - sh ../distrib/sets/makesums -t ${RELEASEDIR}/installation/tapeimage -all + ${MAKESUMS} -t ${RELEASEDIR}/installation/netboot -all + ${MAKESUMS} -t ${RELEASEDIR}/installation/tapeimage -all diff --git a/etc/etc.netwinder/Makefile.inc b/etc/etc.netwinder/Makefile.inc index 09df41a302f0..3b6a1543aecf 100644 --- a/etc/etc.netwinder/Makefile.inc +++ b/etc/etc.netwinder/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.3 2002/03/20 17:05:53 bjh21 Exp $ +# $NetBSD: Makefile.inc,v 1.4 2002/03/31 16:07:55 bjh21 Exp $ # # etc.netwinder/Makefile.inc -- netwinder-specific etc Makefile targets # @@ -17,5 +17,5 @@ snap_md_post: # cd ${.CURDIR}/../distrib && ${MAKE} depend && ${MAKE} # cd ${.CURDIR}/../distrib/arm32 && ${MAKE} release cd ${.CURDIR}/../distrib/notes && ${MAKE} release -# sh ../distrib/sets/makesums -t ${RELEASEDIR}/installation/kernel '*.gz' -# sh ../distrib/sets/makesums -t ${RELEASEDIR}/installation/misc '*.gz' +# ${MAKESUMS} -t ${RELEASEDIR}/installation/kernel '*.gz' +# ${MAKESUMS} -t ${RELEASEDIR}/installation/misc '*.gz' diff --git a/etc/etc.prep/Makefile.inc b/etc/etc.prep/Makefile.inc index 77359c18a70e..17ac9490225b 100644 --- a/etc/etc.prep/Makefile.inc +++ b/etc/etc.prep/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.2 2001/11/29 22:45:59 thorpej Exp $ +# $NetBSD: Makefile.inc,v 1.3 2002/03/31 16:07:56 bjh21 Exp $ # # etc.prep/Makefile.inc -- prep-specific etc Makefile targets # @@ -19,4 +19,4 @@ snap_md_post: cd ${.CURDIR}/../distrib && ${MAKE} depend && ${MAKE} cd ${.CURDIR}/../distrib/prep && ${MAKE} release cd ${.CURDIR}/../distrib/notes && ${MAKE} release - sh ../distrib/sets/makesums -t ${RELEASEDIR}/installation/floppy '*' + ${MAKESUMS} -t ${RELEASEDIR}/installation/floppy '*' diff --git a/etc/etc.shark/Makefile.inc b/etc/etc.shark/Makefile.inc index 25df400d6150..bf022001b739 100644 --- a/etc/etc.shark/Makefile.inc +++ b/etc/etc.shark/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.4 2002/03/31 03:39:55 thorpej Exp $ +# $NetBSD: Makefile.inc,v 1.5 2002/03/31 16:07:56 bjh21 Exp $ # # etc.shark/Makefile.inc -- shark-specific etc Makefile targets # @@ -18,5 +18,4 @@ snap_md_post: cd ${.CURDIR}/../distrib && ${MAKE} depend && ${MAKE} cd ${.CURDIR}/../distrib/shark && ${MAKE} release cd ${.CURDIR}/../distrib/notes && ${MAKE} release - sh ../distrib/sets/makesums -t \ - ${RELEASEDIR}/installation/instkernel '*.gz' + ${MAKESUMS} -t ${RELEASEDIR}/installation/instkernel '*.gz' diff --git a/etc/etc.sparc/Makefile.inc b/etc/etc.sparc/Makefile.inc index 14a39364ff02..405e3d38f6aa 100644 --- a/etc/etc.sparc/Makefile.inc +++ b/etc/etc.sparc/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.24 2002/03/05 19:53:19 thorpej Exp $ +# $NetBSD: Makefile.inc,v 1.25 2002/03/31 16:07:56 bjh21 Exp $ # # etc.sparc/Makefile.inc -- sparc-specific etc Makefile targets # @@ -54,7 +54,7 @@ snap_md_post: # compute checksums .for dir in ${MD_INSTALLATION_DIRS} - sh $(TOP)/distrib/sets/makesums -t ${RELEASEDIR}/${dir} '*' + ${MAKESUMS} -t ${RELEASEDIR}/${dir} '*' .endfor CDBOOTIMAGEDIR!= cd ${TOP}/distrib/sparc/bootfs && ${PRINTOBJDIR} diff --git a/etc/etc.sparc64/Makefile.inc b/etc/etc.sparc64/Makefile.inc index f50eb90a445d..3e141617a780 100644 --- a/etc/etc.sparc64/Makefile.inc +++ b/etc/etc.sparc64/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.12 2001/11/29 22:46:01 thorpej Exp $ +# $NetBSD: Makefile.inc,v 1.13 2002/03/31 16:07:56 bjh21 Exp $ # # etc.sparc64/Makefile.inc -- sparc64-specific etc Makefile targets # @@ -96,5 +96,5 @@ snap_md_post: # compute checksums .for dir in ${MD_INSTALLATION_DIRS} - sh $(TOP)/distrib/sets/makesums -t ${RELEASEDIR}/${dir} '*' + ${MAKESUMS} -t ${RELEASEDIR}/${dir} '*' .endfor diff --git a/etc/etc.x68k/Makefile.inc b/etc/etc.x68k/Makefile.inc index 782b64ddcfd5..a476fddb6dc5 100644 --- a/etc/etc.x68k/Makefile.inc +++ b/etc/etc.x68k/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.12 2001/12/18 13:15:38 minoura Exp $ +# $NetBSD: Makefile.inc,v 1.13 2002/03/31 16:07:56 bjh21 Exp $ # # etc.x68k/Makefile.inc -- x68k-specific etc Makefile targets # @@ -21,4 +21,4 @@ snap_md_post: cd ${.CURDIR}/../distrib/notes && ${MAKE} release cd ${.CURDIR}/../distrib/${MACHINE} && ${MAKE} release cd ${.CURDIR}/../sys/arch/x68k/stand/loadbsd && ${MAKE} release - sh ../distrib/sets/makesums -t ${RELEASEDIR}/installation/floppy '*.gz' + ${MAKESUMS} -t ${RELEASEDIR}/installation/floppy '*.gz'