diff options
| author | joerg <joerg@pkgsrc.org> | 2008-07-14 13:02:00 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2008-07-14 13:02:00 +0000 |
| commit | 626e23e91b9431bc469eca194540ffe698bc2427 (patch) | |
| tree | e0b56b0f619828d2d7ca290561f3676b226af142 /pkgtools/pbulk | |
| parent | f605fec2dbee8bc952241c1efb77b14fab314a12 (diff) | |
| download | pkgsrc-626e23e91b9431bc469eca194540ffe698bc2427.tar.gz | |
pbulk-0.33: Don't try to install/deinstall bootstrap packages.
This allows a destdir build to package bootstrap components.
Diffstat (limited to 'pkgtools/pbulk')
| -rw-r--r-- | pkgtools/pbulk/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/pbulk/files/pbulk/scripts/pkg-build | 16 |
2 files changed, 14 insertions, 6 deletions
diff --git a/pkgtools/pbulk/Makefile b/pkgtools/pbulk/Makefile index 4ac9f36d01a..02c9fbffcd4 100644 --- a/pkgtools/pbulk/Makefile +++ b/pkgtools/pbulk/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.42 2008/06/20 11:51:50 joerg Exp $ +# $NetBSD: Makefile,v 1.43 2008/07/14 13:02:00 joerg Exp $ -DISTNAME= pbulk-0.32 +DISTNAME= pbulk-0.33 CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pbulk/files/pbulk/scripts/pkg-build b/pkgtools/pbulk/files/pbulk/scripts/pkg-build index 6119aab49db..2350def97e9 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.15 2008/06/12 13:29:27 joerg Exp $ +# $NetBSD: pkg-build,v 1.16 2008/07/14 13:02:00 joerg Exp $ # # Copyright (c) 2007, 2008 Joerg Sonnenberger <joerg@NetBSD.org>. # All rights reserved. @@ -79,6 +79,10 @@ while read build_info_line; do ;; USE_DESTDIR=*) use_destdir=${build_info_line#USE_DESTDIR=} + ;; + BOOTSTRAP_PKG=*) + is_bootstrap=${build_info_line#BOOTSTRAP_PKG=} + ;; esac done @@ -153,7 +157,10 @@ run_make ${run_install} install > ${bulklog}/${pkgname}/install.log 2>&1 || cle run_make run_direct package > ${bulklog}/${pkgname}/package.log 2>&1 || cleanup # When using DESTDIR build, add the package once to test install rules. -if [ "$use_destdir" != "no" ]; then +# This is not done for potential bootstrap packages as they might already +# be installed. +if [ "${use_destdir}" != "no" ] && \ + [ -z "${is_bootstrap}" ]; then ${pkg_add_cmd} ${pkgname} \ > ${bulklog}/${pkgname}/package.log 2>&1 || cleanup fi @@ -163,8 +170,9 @@ ${make} clean > ${bulklog}/${pkgname}/clean.log 2>&1 # Test uninstall rules. This is not for cross-compiling as the install script # is not run in that case anyway. This is also not done for packages marked as -# uninstallable. The most important example for this is pkg_install itself. -if [ "$cross_compile" = "no" ] && [ ! -f "${cur_pkgdb}/${pkgname}/+PRESERVE" ]; then +# part of the bootstrap, those have the preserve flag set. +if [ "$cross_compile" = "no" ] && \ + [ -z "${is_bootstrap}" ]; then ${pkg_delete} -K ${cur_pkgdb} ${pkgname} > ${bulklog}/${pkgname}/deinstall.log 2>&1 fi |