Changeset 10548 in hybrid for branches/releng-9.0/nanobsd/tools/image.sh

Timestamp:

Apr 22, 2012, 12:54:37 PM (13 years ago)

Author:

rick

Message:

New style arguments, properly going to merge all image related actions in this
single script.

File:

• branches/releng-9.0/nanobsd/tools/image.sh (copied) (copied from branches/releng-9.0/nanobsd/tools/image-build.sh ) (4 diffs)

branches/releng-9.0/nanobsd/tools/image.sh

@@ -1 +1 @@
 #!/bin/sh
-# Wrapper around nanobsd.sh with autodetection of already processed steps
-# to provide some failsafe net
-
+#
 BASEDIR=`dirname $0`
 . ${BASEDIR}/package-build.inc.sh
@@ -8 +6 @@
 NANOBSD="$NANO_SRC/tools/tools/nanobsd/nanobsd.sh"
 
-FORCE_KERNEL=0
-FORCE_WORLD=0
-#XXX: Proper object handling
-if [ "$1" = "-bk" ]; then
-  p_warn Forcefully building kernel
-  FORCE_KERNEL=1
-elif [ "$1" = "-bw" ]; then
-  p_warn Forcefully building world
-  FORCE_WORLD=1
-elif [ "$1" = "-f" ]; then
-  p_warn Forcefully building world and kernel
-  FORCE_KERNEL=1
-  FORCE_WORLD=1
+usage() {
+cat <<EOF
+# Usage $0 <arguments>"
+#
+# Wrapper around nanobsd.sh with autodetection of already processed steps to
+# provide some failsafe net, which avoids building world and/or kernel by
+# default.
+#
+# Rick van der Zwet <rick@wirelessleiden.nl>
+#
+# Arguments:
+# build              - Build NanoBSD parts which are not build yet
+# build force kernel - Build NanoBSD and force rebuilding the kernel
+# build force world  - Build NanoBSD and force rebuilding world
+# rebuild            - Rebuild NanoBSD (aka force rebuilding all)
+EOF
+}
+
+FORCE_KERNEL=${FORCE_KERNEL:-"no"}
+FORCE_WORLD=${FORCE_WORLD:-"no"}
+
+if [ -z "$1" ]; then
+  usage; exit 1
+elif [ "$1" = "build" ]; then
+  if [ -z "$2" ]; then
+  elif [ "$2" = "force" ]; then
+    if [ "$3" = "kernel" ]; then
+      FORCE_KERNEL="yes"
+    elif [ "$3" = "world" ]; then
+      FORCE_WORLD="yes"
+    else
+      echo "Argument Error - '$3'"; exit 128
+    fi
+  else
+    echo "Argument Error - '$2'"; exit 128
+  fi
+elif [ "$1" = "rebuild" ]; then
+  FORCE_KERNEL="yes"
+  FORCE_WORLD="yes"
+else
+  echo "Argument Error - '$1'"; exit 128
 fi
-shift
-NANOBSD_EXTRA=$*
+
+p_info Forcefully building kernel: $FORCE_KERNEL
+p_info Forcefully building world : $FORCE_WORLD
+
+NANOBSD_EXTRA=${NANOBSD_EXTRA:-''}
 
 if [ ! -r "${NANOBSD}" ]; then
@@ -42 +71 @@
   # Detect succesfull buildworld
   tail -10 ${OBJDIR}/_.bw | grep 'World build completed'
-  if [ $? -eq 0 -a ${FORCE_WORLD} -eq 0 ]; then
-     p_info NO building of world, use $0 -f to force
+  if [ $? -eq 0 -a ${FORCE_WORLD} = "no" ]; then
+     p_info NO building of world
      NANOBSD_FLAGS="${NANOBSD_FLAGS} -w"
   fi  
@@ -49 +78 @@
   # Detect succesfull buildkernel
   tail -10 ${OBJDIR}/_.bk | grep 'Kernel build for .* completed'
-  if [ $? -eq 0 -a ${FORCE_KERNEL} -eq 0 ]; then
-     p_info NO building of kernel, use $0 -f to force
+  if [ $? -eq 0 -a ${FORCE_KERNEL} = "no" ]; then
+     p_info NO building of kernel
      NANOBSD_FLAGS="${NANOBSD_FLAGS} -k"
   fi