diff options
| author | joerg <joerg> | 2010-02-24 22:51:37 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2010-02-24 22:51:37 +0000 |
| commit | 73dfb38f1ad5e79fedfa7deb7f739b9815c61304 (patch) | |
| tree | 9142b3221c6f30b570e9d3c1fa97160442d1c549 | |
| parent | a0f93769b452e0ae0854883d8d12b7609211f3e3 (diff) | |
| download | pkgsrc-73dfb38f1ad5e79fedfa7deb7f739b9815c61304.tar.gz | |
pbulk-0.45:
Make the age check for packages an option, but keep it enabled by
default.
| -rw-r--r-- | pkgtools/pbulk/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/pbulk/files/pbulk/pbulk.conf | 9 | ||||
| -rwxr-xr-x | pkgtools/pbulk/files/pbulk/scripts/pkg-build | 4 | ||||
| -rwxr-xr-x | pkgtools/pbulk/files/pbulk/scripts/pkg-up-to-date | 10 |
4 files changed, 20 insertions, 7 deletions
diff --git a/pkgtools/pbulk/Makefile b/pkgtools/pbulk/Makefile index a8ad5aa1cae..93571d3e987 100644 --- a/pkgtools/pbulk/Makefile +++ b/pkgtools/pbulk/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.58 2009/12/30 21:14:43 joerg Exp $ +# $NetBSD: Makefile,v 1.59 2010/02/24 22:51:37 joerg Exp $ -DISTNAME= pbulk-0.44 +DISTNAME= pbulk-0.45 COMMENT= Modular bulk build framework PKG_DESTDIR_SUPPORT= user-destdir diff --git a/pkgtools/pbulk/files/pbulk/pbulk.conf b/pkgtools/pbulk/files/pbulk/pbulk.conf index 6200fc41c0b..f5a74b79851 100644 --- a/pkgtools/pbulk/files/pbulk/pbulk.conf +++ b/pkgtools/pbulk/files/pbulk/pbulk.conf @@ -1,4 +1,4 @@ -# $NetBSD: pbulk.conf,v 1.16 2009/06/08 16:02:52 joerg Exp $ +# $NetBSD: pbulk.conf,v 1.17 2010/02/24 22:51:37 joerg Exp $ # Version of the configuration file. This is bumped whenver the default # config changes to notify the administrator about updates. @@ -46,6 +46,13 @@ bootstrapkit=/usr/pkgsrc/bootstrap/bootstrap.tar.gz # ignore_missing_dependencies=no +# If yes, consider a package up-to-date, if the dependency list matches +# the existing binary package and the recorded RCS IDs match the pkgsrc +# tree. Otherwise, additionally require that the package is not older +# than any of the dependencies. +# +skip_age_check=no + report_graph_script_limit=512 # Account used for user-destdir builds. This account should have diff --git a/pkgtools/pbulk/files/pbulk/scripts/pkg-build b/pkgtools/pbulk/files/pbulk/scripts/pkg-build index 10f3415e28d..f0eb90c1928 100755 --- a/pkgtools/pbulk/files/pbulk/scripts/pkg-build +++ b/pkgtools/pbulk/files/pbulk/scripts/pkg-build @@ -1,5 +1,5 @@ #!@SH@ -# $NetBSD: pkg-build,v 1.19 2009/10/25 23:08:02 joerg Exp $ +# $NetBSD: pkg-build,v 1.20 2010/02/24 22:51:37 joerg Exp $ # # Copyright (c) 2007, 2008 Joerg Sonnenberger <joerg@NetBSD.org>. # All rights reserved. @@ -159,7 +159,7 @@ fi run_make run_direct checksum > ${bulklog}/${pkgname}/checksum.log 2>&1 || cleanup run_make ${run_build} configure > ${bulklog}/${pkgname}/configure.log 2>&1 || cleanup run_make ${run_build} all > ${bulklog}/${pkgname}/build.log 2>&1 || cleanup -run_make ${run_install} install > ${bulklog}/${pkgname}/install.log 2>&1 || cleanup +run_make ${run_install} stage-install > ${bulklog}/${pkgname}/install.log 2>&1 || cleanup run_make run_direct package > ${bulklog}/${pkgname}/package.log 2>&1 || cleanup # When using DESTDIR build, add the package once to test install rules. diff --git a/pkgtools/pbulk/files/pbulk/scripts/pkg-up-to-date b/pkgtools/pbulk/files/pbulk/scripts/pkg-up-to-date index d5bc99d2cfc..efbedaac766 100755 --- a/pkgtools/pbulk/files/pbulk/scripts/pkg-up-to-date +++ b/pkgtools/pbulk/files/pbulk/scripts/pkg-up-to-date @@ -1,5 +1,5 @@ #!@SH@ -# $NetBSD: pkg-up-to-date,v 1.8 2009/10/25 23:08:02 joerg Exp $ +# $NetBSD: pkg-up-to-date,v 1.9 2010/02/24 22:51:37 joerg Exp $ # # Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>. # All rights reserved. @@ -67,5 +67,11 @@ ${pkg_info} -qN ${pkg} | while read dep; do fi done [ $found = 1 ] - [ "${packages}/All/${dep}.tgz" -ot "${pkg}" ] + case "$skip_age_check" in + [Yy][Ee][Ss]) + ;; + *) + [ "${packages}/All/${dep}.tgz" -ot "${pkg}" ] + ;; + esac done |