CVS commit: pkgsrc/bootstrap

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Oct 17 11:12:46 UTC 2018

Modified Files:
        pkgsrc/bootstrap: bootstrap

Log Message:
bootstrap: Set PKGSRC_KEEP_BIN_PKGS=no during bootstrap.

This avoids errors when running from a read-only pkgsrc checkout as the
resulting packages cannot be written to the default PACKAGES directory.  The
binary packages aren't useful anyway, as they are often built with reduced
configuration options due to the limited bootstrap environment.

Fixes issue reported by Julien Savard and others.


To generate a diff of this commit:
cvs rdiff -u -r1.250 -r1.251 pkgsrc/bootstrap/bootstrap

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/bootstrap/bootstrap
diff -u pkgsrc/bootstrap/bootstrap:1.250 pkgsrc/bootstrap/bootstrap:1.251
--- pkgsrc/bootstrap/bootstrap:1.250    Sun Sep  9 10:01:26 2018
+++ pkgsrc/bootstrap/bootstrap  Wed Oct 17 11:12:46 2018
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.250 2018/09/09 10:01:26 schmonz Exp $
+# $NetBSD: bootstrap,v 1.251 2018/10/17 11:12:46 jperkin Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -1308,10 +1308,10 @@ echo ".endif                    # end pkgsrc settings" >>
 # build and register packages
 # usage: build_package <packagedirectory>
 build_package() {
-       run_cmd "(cd $pkgsrcdir/$1 && $bmake $make_quiet_flags MAKE_JOBS=${make_jobs} PKG_COMPRESSION=none -DPKG_PRESERVE MAKECONF=${BOOTSTRAP_MKCONF} install)"
+       run_cmd "(cd $pkgsrcdir/$1 && $bmake $make_quiet_flags MAKE_JOBS=${make_jobs} PKG_COMPRESSION=none -DPKG_PRESERVE PKGSRC_KEEP_BIN_PKGS=no MAKECONF=${BOOTSTRAP_MKCONF} install)"
 }
 build_package_nopreserve() {
-       run_cmd "(cd $pkgsrcdir/$1 && $bmake $make_quiet_flags MAKE_JOBS=${make_jobs} PKG_COMPRESSION=none MAKECONF=${BOOTSTRAP_MKCONF} install)"
+       run_cmd "(cd $pkgsrcdir/$1 && $bmake $make_quiet_flags MAKE_JOBS=${make_jobs} PKG_COMPRESSION=none PKGSRC_KEEP_BIN_PKGS=no MAKECONF=${BOOTSTRAP_MKCONF} install)"
 }
 
 #