Changeset 13058 in hybrid for branches

Timestamp:

Jan 21, 2015, 7:36:02 AM (10 years ago)

Author:

rick

Message:

Allow creating single packages for debugging purposes and also yield if a package failed to build

File:

• branches/releng-10/nanobsd/tools/package-build.sh (modified) (4 diffs)

branches/releng-10/nanobsd/tools/package-build.sh

@@ -13 +13 @@
 DEBUG=${DEBUG:-'0'}
 DEP_CHECK_ONLY=${DEP_CHECK_ONLY:-'0'}
+
+# Find listing of packages to build
+PKG_TO_BUILD=${PKG_TO_BUILD:-${PACKAGE_LIST}}
 
 # make options, for package building
@@ -63 +66 @@
 mkdir -p ${NANO_PACKAGE_DIR}
 
-
 # Build required packages
 MAKE_CONF=`mktemp -t $(basename $0)`
@@ -69 +71 @@
 MAKE="make __MAKE_CONF=$MAKE_CONF ${PKG_MAKE_ARGS}"
 BUILD_LIST=''
-set `echo ${PACKAGE_LIST} | xargs -n1 -I% echo $PORTSDIR/%`
+set `echo ${PKG_TO_BUILD} | xargs -n1 -I% echo $PORTSDIR/%`
 while [ "$1" ]; do
   PACKAGE=$1; shift
@@ -97 +99 @@
   PKGBUILDLOG=/tmp/build.$$.`basename $PACKAGE`.log
   p_info Packaging $PACKAGE ... details at $PKGBUILDLOG
-  ${MAKE} PACKAGES=/root/nanobsd/pkg package do-package 2>&1 >$PKGBUILDLOG || exit 1
+  ${MAKE} PACKAGES=/root/nanobsd/pkg package do-package 2>&1 >$PKGBUILDLOG
+  if [ $? -ne 0 ]; then
+    p_err "Failed to create $PKGNAME"
+    exit 1
+  fi
 
   p_info Checking dependencies