- get the BROKENFILE setting from make show-var VARNAME=BROKENFILE
rather than
hard coding it. - explicitly only add $BROKENFILE's to the output rather than .broken.* This makes things work correctly when /usr/pkgsrc is shared among several machines which might use .broken.`hostname` for its broken file logs.
This commit is contained in:
parent
1501c31d46
commit
9b36db2791
2 changed files with 9 additions and 7 deletions
|
@ -1,5 +1,5 @@
|
|||
# build.conf
|
||||
# $NetBSD: build.conf-example,v 1.5 2000/12/22 01:35:33 dmcmahill Exp $
|
||||
# $NetBSD: build.conf-example,v 1.6 2000/12/26 16:45:57 dmcmahill Exp $
|
||||
#
|
||||
# config file in /bin/sh syntax for {,pre,post}-build
|
||||
#
|
||||
|
@ -38,6 +38,8 @@ PRUNEDISTFILES=yes
|
|||
### No changes should be needed below this line !!!
|
||||
###########################################################################
|
||||
|
||||
BROKENFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; make show-var VARNAME=BROKENFILE )`;
|
||||
|
||||
# Name of the (generated) HTML file which lists all broken pkgs
|
||||
REPORT="$FTP/broken.html"
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#!/usr/pkg/bin/perl
|
||||
# $NetBSD: post-build,v 1.3 2000/09/17 21:51:09 hubertf Exp $
|
||||
# $NetBSD: post-build,v 1.4 2000/12/26 16:45:57 dmcmahill Exp $
|
||||
#
|
||||
# Collect stuff after a pkg bulk build
|
||||
#
|
||||
|
@ -34,6 +34,7 @@ getconf("REPORT"); # "broken.html"
|
|||
getconf("USR_PKGSRC"); # "/usr/pkgsrc"
|
||||
getconf("osrev"); # `uname -r`
|
||||
getconf("arch"); # `uname -m`
|
||||
getconf("BROKENFILE"); # ".broken.file"
|
||||
chomp($date=`date`);
|
||||
|
||||
$verbose=1;
|
||||
|
@ -51,7 +52,7 @@ system("mkdir -p ${FTP}");
|
|||
|
||||
# Copy over the output from the build process
|
||||
chdir("$USR_PKGSRC");
|
||||
system("tar plcf - .broken* */*/.broken* | ( cd ${FTP} ; tar plxf - )");
|
||||
system("tar plcf - $BROKENFILE */*/$BROKENFILE | ( cd ${FTP} ; tar plxf - )");
|
||||
|
||||
|
||||
open(HTML,">$REPORT") or die;
|
||||
|
@ -83,11 +84,10 @@ EOHTML
|
|||
# some nifty postprocessing of $FTP/.broken* -> HTML here
|
||||
$nunpackaged = $nbroken = 0;
|
||||
chdir("$FTP");
|
||||
$bf=".broken.$arch";
|
||||
open(BF,"sort +1 $bf |") or die "can't open .broken-file '$bf'";
|
||||
open(BF,"sort +1 $BROKENFILE |") or die "can't open .broken-file '$BROKENFILE'";
|
||||
while (<BF>) {
|
||||
($nerrors, $bf) = split;
|
||||
( $pkg = $bf ) =~ s,/.broken.*$,,;
|
||||
($nerrors, $pkg) = split;
|
||||
$pkg =~ s,/$BROKENFILE,,;
|
||||
|
||||
# next
|
||||
# if $pkg!~/^a/; # DEBUG! HF
|
||||
|
|
Loading…
Reference in a new issue