Tue Jul 25 22:45:21 2017 UTC ()
Create the All packages sub directory.
This prevents the bulk build failing on the complition of the first package
because the directory doesn't exist.


(sevan)
diff -r1.3 -r1.4 pkgsrc/mk/pbulk/pbulk.sh
cvs diff -r1.3 -r1.4 pkgsrc/mk/pbulk/pbulk.sh (expand / switch to unified diff)

--- pkgsrc/mk/pbulk/pbulk.sh 2015/12/14 21:12:01 1.3
+++ pkgsrc/mk/pbulk/pbulk.sh 2017/07/25 22:45:21 1.4
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1#!/bin/sh 1#!/bin/sh
2# $Id: pbulk.sh,v 1.3 2015/12/14 21:12:01 asau Exp $ 2# $Id: pbulk.sh,v 1.4 2017/07/25 22:45:21 sevan Exp $
3set -e 3set -e
4 4
5usage="usage: ${0##*/} [-lun] [-c mk.conf.fragment] [-d nodes]" 5usage="usage: ${0##*/} [-lun] [-c mk.conf.fragment] [-d nodes]"
6 6
7while getopts lunc:d: opt; do 7while getopts lunc:d: opt; do
8 case $opt in 8 case $opt in
9 l) limited=yes;; 9 l) limited=yes;;
10 u) unprivileged=yes;; 10 u) unprivileged=yes;;
11 n) native=yes;; 11 n) native=yes;;
12 c) mk_fragment="${OPTARG}";; 12 c) mk_fragment="${OPTARG}";;
13 d) nodes="${OPTARG}";; 13 d) nodes="${OPTARG}";;
14 \?) echo "$usage" 1>&2; exit 1;; 14 \?) echo "$usage" 1>&2; exit 1;;
15 esac 15 esac
@@ -184,20 +184,20 @@ mkdir -p ${PACKAGES} @@ -184,20 +184,20 @@ mkdir -p ${PACKAGES}
184# Creating the bootstrap kit 184# Creating the bootstrap kit
185${PKGSRCDIR}/bootstrap/bootstrap \ 185${PKGSRCDIR}/bootstrap/bootstrap \
186 ${unprivileged:+--unprivileged} \ 186 ${unprivileged:+--unprivileged} \
187 ${PREFIX:+--prefix=${PREFIX}} \ 187 ${PREFIX:+--prefix=${PREFIX}} \
188 ${mk_fragment:+--mk-fragment="$mk_fragment"} \ 188 ${mk_fragment:+--mk-fragment="$mk_fragment"} \
189 --workdir=${TMPDIR}/work \ 189 --workdir=${TMPDIR}/work \
190 --gzip-binary-kit=${PACKAGES}/bootstrap.tar.gz 190 --gzip-binary-kit=${PACKAGES}/bootstrap.tar.gz
191rm -rf ${TMPDIR}/work 191rm -rf ${TMPDIR}/work
192rm -f ${TMPDIR}/mk.conf.inc 192rm -f ${TMPDIR}/mk.conf.inc
193fi 193fi
194# Keep "packages" in pbulk.conf and "PACKAGES" in mk.conf fragment in sync. 194# Keep "packages" in pbulk.conf and "PACKAGES" in mk.conf fragment in sync.
195 195
196# Final preparations: 196# Final preparations:
197mkdir -p ${PACKAGES} 197mkdir -p ${PACKAGES}/All
198if [ ! -n "$unprivileged" ]; then 198if [ ! -n "$unprivileged" ]; then
199chown pbulk:"$(id -gn pbulk)" ${PACKAGES} 199chown pbulk:"$(id -gn pbulk)" ${PACKAGES}
200fi 200fi
201 201
202# Let's start: 202# Let's start:
203#PACKAGES=${PACKAGES} WRKOBJDIR=${TMPDIR} ${PBULKPREFIX}/bin/bulkbuild 203#PACKAGES=${PACKAGES} WRKOBJDIR=${TMPDIR} ${PBULKPREFIX}/bin/bulkbuild