summaryrefslogtreecommitdiff
path: root/mk/bulk
diff options
context:
space:
mode:
Diffstat (limited to 'mk/bulk')
-rw-r--r--mk/bulk/bsd.bulk-pkg.mk8
-rw-r--r--mk/bulk/build18
-rwxr-xr-xmk/bulk/mksandbox4
-rw-r--r--mk/bulk/parallel.txt16
-rw-r--r--mk/bulk/post-build34
-rw-r--r--mk/bulk/pre-build10
-rw-r--r--mk/bulk/printindex8
-rwxr-xr-xmk/bulk/tflat10
-rw-r--r--mk/bulk/upload2
9 files changed, 55 insertions, 55 deletions
diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk
index 6662d0573bb..a39b47a37a1 100644
--- a/mk/bulk/bsd.bulk-pkg.mk
+++ b/mk/bulk/bsd.bulk-pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.bulk-pkg.mk,v 1.43 2003/02/13 22:51:03 dmcmahill Exp $
+# $NetBSD: bsd.bulk-pkg.mk,v 1.44 2003/05/06 17:42:03 jmmv Exp $
#
# Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@netbsd.org>
@@ -67,7 +67,7 @@ BULK_ID?= .${_HOSTNAME:C|\..*||}
.elif defined(OBJMACHINE)
BULK_ID?= .${MACHINE_ARCH}
.else
-BULK_ID?=
+BULK_ID?=
.endif
# This file exists to mark a package as broken
@@ -198,7 +198,7 @@ bulk-package:
${ECHO_MSG} '### Current pkg count: ' `${LS} -l ${PKG_DBDIR} | ${GREP} ^d | ${WC} -l` installed packages: `${LS} ${PKG_DBDIR} | ${GREP} -v pkgdb.byfile.db`; \
${ECHO_MSG} '###' ; \
fi \
- ) 2>&1 | tee -a ${BUILDLOG}
+ ) 2>&1 | tee -a ${BUILDLOG}
@uptodate=`${MAKE} ${MAKEFLAGS} bulk-check-uptodate REF=${PKGFILE}` ; \
if ${PKG_INFO} -qe "${PKGNAME:C/-[^-]*$/-[0-9]*/}" ; then \
installed=1; \
@@ -371,7 +371,7 @@ bulk-package:
fi
# Install pkg - if possible from binary pkg (i.e. available & upto date)
-# else revert to the old recompiling.
+# else revert to the old recompiling.
# Don't rely upon pkg_add to snarf in depending pkgs as they may have
# been modified and need rebuilding.
bulk-install:
diff --git a/mk/bulk/build b/mk/bulk/build
index f8e48eaac2a..4b5c897b59b 100644
--- a/mk/bulk/build
+++ b/mk/bulk/build
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: build,v 1.27 2002/12/31 12:42:37 cjep Exp $
+# $NetBSD: build,v 1.28 2003/05/06 17:42:03 jmmv Exp $
#
# Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@netbsd.org>
@@ -201,20 +201,20 @@ echo "Build finished. Removing all installed packages left over from build..."
for pkgname in `pkg_info -e \*`
do
- if `pkg_info -qe $pkgname`; then
+ if `pkg_info -qe $pkgname`; then
pkgdir=`grep " $pkgname " $INDEXFILE | awk '{print $1}'`
- case "${BULK_PREREQ}" in
- *$pkgdir* )
+ case "${BULK_PREREQ}" in
+ *$pkgdir* )
echo "Keeping BULK_PREREQ: $pkgname ($pkgdir)" ;
- ;;
- * )
+ ;;
+ * )
echo pkg_delete -r $pkgname
pkg_delete -r $pkgname
if `pkg_info -qe $pkgname` ; then
echo "$pkgname ($pkgdir) did not deinstall nicely. Forcing the deinstall"
- pkg_delete -f $pkgname || true
- fi
- ;;
+ pkg_delete -f $pkgname || true
+ fi
+ ;;
esac
fi
done
diff --git a/mk/bulk/mksandbox b/mk/bulk/mksandbox
index 2566f0ef0a2..c77cd78a815 100755
--- a/mk/bulk/mksandbox
+++ b/mk/bulk/mksandbox
@@ -1,6 +1,6 @@
#! /bin/sh
-# $NetBSD: mksandbox,v 1.19 2003/04/13 11:28:01 cjep Exp $
+# $NetBSD: mksandbox,v 1.20 2003/05/06 17:42:03 jmmv Exp $
#
#
# Copyright (c) 2002 Alistair G. Crooks. All rights reserved.
@@ -35,7 +35,7 @@
#
# Usage: mksandbox [--pkgsrc=dir] [--src=srcdir] [--verbose] sandbox-dir
-#
+#
# A small shell script to set up a sandbox (usually for a pkgsrc bulk
# build), using null mounts.
diff --git a/mk/bulk/parallel.txt b/mk/bulk/parallel.txt
index 842b316810b..23794684524 100644
--- a/mk/bulk/parallel.txt
+++ b/mk/bulk/parallel.txt
@@ -1,8 +1,8 @@
-# $Id: parallel.txt,v 1.2 2003/04/16 09:55:53 wiz Exp $
+# $Id: parallel.txt,v 1.3 2003/05/06 17:42:03 jmmv Exp $
#
These are my thoughts on how one would want a parallel bulk build to
-work.
+work.
====================================================================
@@ -72,7 +72,7 @@ Single Machine Build Comments
====================================================================
There are several features of this approach that are worth mentioning
-explicitly.
+explicitly.
1) Packages are built in the correct order. We don't want to rebuild
the gnome meta-pkg and then rebuild gnome-libs for example.
@@ -100,7 +100,7 @@ explicitly.
not needed before each build, we reduce the amount of installing
and deinstalling needed during the build. For example, it is
quite common to build several packages in a row which all need GNU
- make or perl.
+ make or perl.
4) Using the 'supportsfile' to mark all packages which depend upon a
package which has just failed to build can greatly reduce the time
@@ -123,14 +123,14 @@ master == master machine. This machine is in charge of directing
slave#x == slave machine #x. All slave machines are of the same
MACHINE_ARCH and have the same operating system and access
the same pkgsrc tree via NFS and access the same binary
- packages directory.
+ packages directory.
If the master machine is also to be used as a build
- machine, then it is also considered a slave.
+ machine, then it is also considered a slave.
Prior to starting the build, the master directs one of the slaves to
extract the dependency information per steps 1-3 in the single machine
-case.
+case.
The actually build should progress as follows:
@@ -182,7 +182,7 @@ network.
- maybe a hook could be put in place which rsync's the binary package
tree between the binary package repository machine and the slave
- machine before and after each package is built?
+ machine before and after each package is built?
- security
diff --git a/mk/bulk/post-build b/mk/bulk/post-build
index c9e2cf5bd91..3538357423f 100644
--- a/mk/bulk/post-build
+++ b/mk/bulk/post-build
@@ -1,5 +1,5 @@
#!/usr/pkg/bin/perl
-# $NetBSD: post-build,v 1.21 2002/08/22 08:21:30 jlam Exp $
+# $NetBSD: post-build,v 1.22 2003/05/06 17:42:03 jmmv Exp $
#
# Collect stuff after a pkg bulk build
#
@@ -40,18 +40,18 @@ $reportf=basename($REPORT);
# extract the name of the files used for the build log and broken build log.
# these have defaults set by bsd.bulk-pkg.mk and may be overridden in /etc/mk.conf
-chomp($BROKENFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=BROKENFILE )`);
+chomp($BROKENFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=BROKENFILE )`);
-# also extract the names of the cache files used during the bulk build. We'll save a copy of
+# also extract the names of the cache files used during the bulk build. We'll save a copy of
# those to help debug if the build messed up.
-chomp($DEPENDSTREEFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=DEPENDSTREEFILE )`);
-chomp($DEPENDSFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=DEPENDSFILE )`);
-chomp($SUPPORTSFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=SUPPORTSFILE )`);
-chomp($INDEXFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=INDEXFILE )`);
-chomp($ORDERFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=ORDERFILE )`);
-chomp($STARTFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=STARTFILE )`);
-chomp($LOCALBASE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=LOCALBASE )`);
-chomp($X11BASE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=X11BASE )`);
+chomp($DEPENDSTREEFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=DEPENDSTREEFILE )`);
+chomp($DEPENDSFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=DEPENDSFILE )`);
+chomp($SUPPORTSFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=SUPPORTSFILE )`);
+chomp($INDEXFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=INDEXFILE )`);
+chomp($ORDERFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=ORDERFILE )`);
+chomp($STARTFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=STARTFILE )`);
+chomp($LOCALBASE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=LOCALBASE )`);
+chomp($X11BASE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=X11BASE )`);
$dtfile=basename($DEPENDSTREEFILE);
$depfile=basename($DEPENDSFILE);
$supfile=basename($SUPPORTSFILE);
@@ -103,7 +103,7 @@ print HTML <<EOHTML
Files not listed in PLISTs can be found in <A HREF="leftovers-${arch}.html">this list</A>.
<P>
-
+
<TABLE>
<TR><TH> Package <TH> State <TH> Pkgs Broken by <TH> Last touched by <TH> File touched last <TH> Maintainer
EOHTML
@@ -120,7 +120,7 @@ while (<BF>) {
# next
# if $pkg!~/^a/; # DEBUG! HF
-
+
if ($nerrors > 0) {
$color = "red";
$state = "build broken";
@@ -145,10 +145,10 @@ while (<BF>) {
# $maintainer=`( cd $USR_PKGSRC/$pkg ; ( echo '.include "Makefile"' ; echo 'bla: ; \@echo ${MAINTAINER}' ) | $ENV{"BMAKE"} -f - bla )`;
$maintainer=`grep ^MAINTAINER $USR_PKGSRC/$pkg/Makefile | awk '{ print \$2\$3\$4\$5\$6}' | sed -e 's/\</&lt;/g' -e 's/\>/&gt;/g'`;
chomp($maintainer);
-
+
print HTML "<TR><TD><A HREF=\"$bf\">$pkg</A>";
print HTML " <TD><FONT COLOR=$color>$state</FONT>";
- if ($nbrokenby > 0){
+ if ($nbrokenby > 0){
print HTML " <TD ALIGN=\"right\"><FONT COLOR=$color>$nbrokenby</FONT>";
}
else {
@@ -201,7 +201,7 @@ The following cache files were used during the build:
</TABLE>
<HR>
-<P>
+<P>
<UL>
<!-- <LI>View the <A HREF="$PROG">progress</A> of the build. -->
<!-- <LI>See the list of <A HREF="../index.html">all log files</A>. -->
@@ -252,7 +252,7 @@ close(HTML);
system("tar plcf - `cat leftovers-${arch}.txt` | ( cd leftovers-${arch} ; tar plxf - )");
# Add links to leftover list:
- open (IN, "< leftovers-${arch}.txt")
+ open (IN, "< leftovers-${arch}.txt")
or die "can't read leftovers-${arch}.txt";
open (OUT, "> leftovers-${arch}.html")
or die "can't write leftovers-${arch}.html";
diff --git a/mk/bulk/pre-build b/mk/bulk/pre-build
index ff80db7ef3a..b8b30072272 100644
--- a/mk/bulk/pre-build
+++ b/mk/bulk/pre-build
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: pre-build,v 1.25 2002/11/03 22:59:21 hubertf Exp $
+# $NetBSD: pre-build,v 1.26 2003/05/06 17:42:04 jmmv Exp $
#
# Clean up system to be ready for bulk pkg build
#
@@ -44,7 +44,7 @@ fi
#
# Clean out everything and its mother
#
-PKG_DBDIR=`(cd ${PKGLINT_PKG_DIR}; ${BMAKE} show-var VARNAME=PKG_DBDIR)`
+PKG_DBDIR=`(cd ${PKGLINT_PKG_DIR}; ${BMAKE} show-var VARNAME=PKG_DBDIR)`
echo Removing all installed packages in ${PKG_DBDIR}
@@ -52,7 +52,7 @@ if [ -d ${PKG_DBDIR} ]; then
cd ${PKG_DBDIR}
for pkg in *
do
- if `env PKG_DBDIR=${PKG_DBDIR} pkg_info -qe $pkg`; then
+ if `env PKG_DBDIR=${PKG_DBDIR} pkg_info -qe $pkg`; then
echo pkg_delete -r $pkg
env PKG_DBDIR=${PKG_DBDIR} pkg_delete -r $pkg
fi
@@ -61,7 +61,7 @@ if [ -d ${PKG_DBDIR} ]; then
# to deinstall
for pkg in *
do
- if `env PKG_DBDIR=${PKG_DBDIR} pkg_info -qe $pkg`; then
+ if `env PKG_DBDIR=${PKG_DBDIR} pkg_info -qe $pkg`; then
echo pkg_delete -f $pkg
env PKG_DBDIR=${PKG_DBDIR} pkg_delete -f $pkg
fi
@@ -153,7 +153,7 @@ case "$PRUNELINKS" in
yes|YES)
echo "Checking for and removing orphaned packages links"
find $PACKAGES -type l -print | \
- while read f
+ while read f
do
if [ ! -d $f -a ! -f $f ]; then
echo "Removing orphaned link: \"$f\""
diff --git a/mk/bulk/printindex b/mk/bulk/printindex
index 0e2a7cfd5c5..06a832c3607 100644
--- a/mk/bulk/printindex
+++ b/mk/bulk/printindex
@@ -1,12 +1,12 @@
#!/bin/sh
-# $NetBSD: printindex,v 1.10 2002/08/22 08:21:31 jlam Exp $
+# $NetBSD: printindex,v 1.11 2003/05/06 17:42:04 jmmv Exp $
#
#
# Copyright (c) 2001 The NetBSD Foundation, Inc.
# All rights reserved.
#
# This code is derived from software contributed to The NetBSD Foundation
-# by
+# by
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -78,7 +78,7 @@ do
fi
echo "$pkgdir $pkgname "
fi
- cd $cwd
+ cd $cwd
done
# get the list of packages which should always be installed during the build
@@ -105,7 +105,7 @@ do
#exit 1
fi
echo "$pkgdir $pkgname "
- cd $cwd
+ cd $cwd
;;
esac
done
diff --git a/mk/bulk/tflat b/mk/bulk/tflat
index c8ff51c7a85..70ec50f89c7 100755
--- a/mk/bulk/tflat
+++ b/mk/bulk/tflat
@@ -1,5 +1,5 @@
#!/usr/bin/awk -f
-# $NetBSD: tflat,v 1.7 2002/10/06 20:15:05 dmcmahill Exp $
+# $NetBSD: tflat,v 1.8 2003/05/06 17:42:04 jmmv Exp $
#
# Copyright (c) 2001 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -43,12 +43,12 @@ BEGIN {
exit(1);
}
- if ( ARGV[1] == "-u" ) {
+ if ( ARGV[1] == "-u" ) {
up=1;
}
else{
if ( ARGV[1] == "-d" ) { up=0; }
- else{
+ else{
printf("tflat: unknown option \"%s\"\n",ARGV[1]);
usage();
exit(1);
@@ -59,7 +59,7 @@ BEGIN {
#
# Read in the entire depends tree
- #
+ #
if (up){
while(getline < InFile > 0){
if ($1 in topdepends)
@@ -104,7 +104,7 @@ BEGIN {
printf("\n");
exit 0
-}
+}
function find_all_depends(pkg,pkgreg,i,deps){
# if we find the package already has been fully depended
diff --git a/mk/bulk/upload b/mk/bulk/upload
index 42d90e5eda3..5e7a054cdd8 100644
--- a/mk/bulk/upload
+++ b/mk/bulk/upload
@@ -41,7 +41,7 @@ if [ -z "$RSYNC_DST_SPECIFIC" -o -z "$RSYNC_DST_OTHER" ]; then
exit 1
fi
-#
+#
# Some temp files
#
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-05 00:54:28 +0000