diff options
Diffstat (limited to 'mk/bulk')
-rw-r--r-- | mk/bulk/build.conf-example | 4 | ||||
-rw-r--r-- | mk/bulk/upload | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/mk/bulk/build.conf-example b/mk/bulk/build.conf-example index 4039f04012f..0a1c0c341e1 100644 --- a/mk/bulk/build.conf-example +++ b/mk/bulk/build.conf-example @@ -1,4 +1,4 @@ -# $NetBSD: build.conf-example,v 1.35 2006/03/28 10:56:52 joerg Exp $ +# $NetBSD: build.conf-example,v 1.36 2006/06/02 22:01:46 dillo Exp $ # # This is an example configuration file for pkgsrc bulk builds. # Actually it's a shell script that is sourced in by the pre-build, @@ -93,7 +93,7 @@ PRUNEPACKAGES=yes # Whether or not to create checksum files. MKSUMS=yes -# Whether or not to create the pkg_chk summary file. +# Whether or not to create the summary file. MKSUMMARY=no # If you want to PGP sign the checksum files, set and correct. diff --git a/mk/bulk/upload b/mk/bulk/upload index 96943763d0b..7c48d5c2759 100644 --- a/mk/bulk/upload +++ b/mk/bulk/upload @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: upload,v 1.28 2006/03/28 10:56:52 joerg Exp $ +# $NetBSD: upload,v 1.29 2006/06/02 22:01:46 dillo Exp $ # # Upload non-restricted binary pkgs to ftp server @@ -68,6 +68,7 @@ upload_vulnerable="$TMP"/upload_vulnerable pkgsrcdir=`cd pkgtools/pkglint ; ${BMAKE} show-var VARNAME=_PKGSRCDIR` packages=`cd pkgtools/pkglint ; ${BMAKE} show-var VARNAME=PACKAGES` distdir=`cd pkgtools/pkglint ; ${BMAKE} show-var VARNAME=DISTDIR` +gzip_cmd=`cd pkgtools/pkglint; make show-var VARNAME=GZIP_CMD USE_TOOLS=gzip` # Pull in some pkgs needed ( cd pkgtools/pkglint ; ${BMAKE} bulk-install ) @@ -157,9 +158,10 @@ if [ "${MKSUMS}" = "yes" -o "${MKSUMS}" = "YES" ]; then fi if [ "${MKSUMMARY}" = "yes" -o "${MKSUMMARY}" = "YES" ]; then - echo "Creating pkg_chk index..." - ( cd ${pkgsrcdir}/pkgtools/pkg_chk; ${BMAKE} bulk-install ) - pkg_chk -P "${packages}" -bS + echo "Creating summary file..." + (cd "${packages}/All" \ + && ls -t *.t[gb]z | while read n; do pkg_info -X "$n"; done) \ + | ${gzip_cmd} > "${packages}"/All/pkg_summary.gz fi echo "#!/bin/sh" > "$upload" |