summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorgrant <grant>2004-02-05 23:57:54 +0000
committergrant <grant>2004-02-05 23:57:54 +0000
commitefb46ad5706795d021e017bf457fdb5a2b1dce2f (patch)
tree10c557fcbb977e3eb53edc2ce5489480646bac8b /mk
parentce0e24f60511450d768d49ac56238b80b5dd1057 (diff)
downloadpkgsrc-efb46ad5706795d021e017bf457fdb5a2b1dce2f.tar.gz
extract OPSYS and OS_VERSION from pkgsrc and use them in the report
email subject.
Diffstat (limited to 'mk')
-rw-r--r--mk/bulk/build11
1 files changed, 8 insertions, 3 deletions
diff --git a/mk/bulk/build b/mk/bulk/build
index 3ffd859e457..9bb6b0e0714 100644
--- a/mk/bulk/build
+++ b/mk/bulk/build
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: build,v 1.34 2004/01/27 16:11:47 agc Exp $
+# $NetBSD: build,v 1.35 2004/02/05 23:57:54 grant Exp $
#
# Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@netbsd.org>
@@ -116,6 +116,8 @@ if [ -d pkgtools/pkglint ]; then
SED=`${BMAKE} show-var VARNAME=SED` || fail=yes
MAIL_CMD=`${BMAKE} show-var VARNAME=MAIL_CMD` || fail=yes
MACHINE_ARCH=`${BMAKE} show-var VARNAME=MACHINE_ARCH` || fail=yes
+ OPSYS=`${BMAKE} show-var VARNAME=OPSYS` || fail=yes
+ OS_VERSION=`${BMAKE} show-var VARNAME=OS_VERSION` || fail=yes
else
echo "The pkgtools/pkglint directory does not exist. Please update"
echo "your pkgsrc tree in ${USR_PKGSRC}"
@@ -149,7 +151,10 @@ if [ $fail = "yes" -o \
-z "$AWK" -o \
-z "$GREP" -o \
-z "$SED" -o \
- -z "$MAIL_CMD" \
+ -z "$MAIL_CMD" -o \
+ -z "$MACHINE_ARCH" -o \
+ -z "$OPSYS" -o \
+ -z "$OS_VERSION" \
]; then
echo "ERROR: build failed to extract certain key variables."
echo " please examine the above list and correct the"
@@ -242,7 +247,7 @@ echo "Post processing bulk build results..."
# Perl was wiped, reinstall it!
( cd lang/perl5 && ${BMAKE} bulk-install )
-perl mk/bulk/post-build | ${MAIL_CMD} -s "pkgsrc/${MACHINE_ARCH} bulk build results `date +%Y-%m-%d`" $ADMIN
+perl mk/bulk/post-build | ${MAIL_CMD} -s "pkgsrc ${OPSYS} ${OS_VERSION}/${MACHINE_ARCH} bulk build results `date +%Y-%m-%d`" $ADMIN
# Done!
echo ""