diff options
| author | jmmv <jmmv> | 2005-08-23 14:52:58 +0000 |
|---|---|---|
| committer | jmmv <jmmv> | 2005-08-23 14:52:58 +0000 |
| commit | c5e4a915c843908daa6682d806bdabbb1321f1a1 (patch) | |
| tree | 7bdab7eacec586a02e58097b936142ed338abe64 /pkgtools/pkg_comp | |
| parent | c47f9f24325f2f57a4d4e36013fb6500f129263b (diff) | |
| download | pkgsrc-c5e4a915c843908daa6682d806bdabbb1321f1a1.tar.gz | |
Update to 1.22:
- Honour INSTALL_PACKAGES during the 'auto' target. Found by jwise@.
Diffstat (limited to 'pkgtools/pkg_comp')
| -rw-r--r-- | pkgtools/pkg_comp/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/pkg_comp/files/pkg_comp.8 | 11 | ||||
| -rw-r--r-- | pkgtools/pkg_comp/files/pkg_comp.sh | 8 |
3 files changed, 15 insertions, 8 deletions
diff --git a/pkgtools/pkg_comp/Makefile b/pkgtools/pkg_comp/Makefile index c97abca70c3..81f5712b4f2 100644 --- a/pkgtools/pkg_comp/Makefile +++ b/pkgtools/pkg_comp/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.29 2005/06/06 18:50:07 jmmv Exp $ +# $NetBSD: Makefile,v 1.30 2005/08/23 14:52:58 jmmv Exp $ -DISTNAME= pkg_comp-1.21 +DISTNAME= pkg_comp-1.22 CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkg_comp/files/pkg_comp.8 b/pkgtools/pkg_comp/files/pkg_comp.8 index 2fb4780cfef..871eecca602 100644 --- a/pkgtools/pkg_comp/files/pkg_comp.8 +++ b/pkgtools/pkg_comp/files/pkg_comp.8 @@ -1,7 +1,7 @@ -.\" $NetBSD: pkg_comp.8,v 1.25 2005/06/06 18:50:07 jmmv Exp $ +.\" $NetBSD: pkg_comp.8,v 1.26 2005/08/23 14:52:58 jmmv Exp $ .\" .\" pkg_comp - Build packages inside a clean chroot environment -.\" Copyright (c) 2002, 2003, 2004 Julio M. Merino Vidal <jmmv@NetBSD.org> +.\" Copyright (c) 2002, 2003, 2004, 2005 Julio M. Merino Vidal <jmmv@NetBSD.org> .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd June 6, 2005 +.Dd August 23, 2005 .Dt PKG_COMP 8 .Os .Sh NAME @@ -205,8 +205,11 @@ Defaults to nothing. .It INSTALL_PACKAGES A list of packages to automatically install after the .Sy makeroot -and after installing +and before installing .Sy BUILD_PACKAGES . +These are also installed within the sandbox created by the +.Sy auto +target, but before anything is built. Each name must be the full package name, including the tgz suffix. Packages are searched inside .Pa $REAL_PACKAGES/All . diff --git a/pkgtools/pkg_comp/files/pkg_comp.sh b/pkgtools/pkg_comp/files/pkg_comp.sh index e7ca5e372a6..08f0b92f28b 100644 --- a/pkgtools/pkg_comp/files/pkg_comp.sh +++ b/pkgtools/pkg_comp/files/pkg_comp.sh @@ -1,9 +1,9 @@ #!/bin/sh # -# $NetBSD: pkg_comp.sh,v 1.23 2005/06/06 18:50:07 jmmv Exp $ +# $NetBSD: pkg_comp.sh,v 1.24 2005/08/23 14:52:58 jmmv Exp $ # # pkg_comp - Build packages inside a clean chroot environment -# Copyright (c) 2002, 2003, 2004 Julio M. Merino Vidal <jmmv@NetBSD.org> +# Copyright (c) 2002, 2003, 2004, 2005 Julio M. Merino Vidal <jmmv@NetBSD.org> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -659,6 +659,10 @@ pkg_auto() err "there is an stopped auto build; removeroot first or resume it" else makeroot + + [ "$nflag" = "no" -a -n "$INSTALL_PACKAGES" ] && + pkg_install $INSTALL_PACKAGES + echo ${pkgs} | tr ' ' '\n' > ${rfile} fi |