1.1 --- a/tools/checkconfig.sh Fri Jun 01 23:36:17 2018 +0200
1.2 +++ b/tools/checkconfig.sh Mon Jun 18 16:35:58 2018 +0200
1.3 @@ -6,7 +6,7 @@
1.4
1.5 if [ "$1" = '--help' ] || [ ! "$1" ] ; then
1.6 cat 1>&2 <<EOF
1.7 -Usage: $PROGNAME <platform> | <l4 directory>
1.8 +Usage: $PROGNAME [-q] <platform> | <l4 directory>
1.9
1.10 Update platform-specific files for the indicated platform type. If a directory
1.11 is specified instead, try and obtain a configured platform type and use that
1.12 @@ -19,10 +19,20 @@
1.13
1.14 If a directory is specified instead, this program will update installed files,
1.15 leaving the distribution alone.
1.16 +
1.17 +The -q option silences warnings about the build directory and is used by the
1.18 +installation tool.
1.19 EOF
1.20 exit 1
1.21 fi
1.22
1.23 +if [ "$1" = '-q' ] ; then
1.24 + QUIET="$1"
1.25 + shift 1
1.26 +else
1.27 + QUIET=
1.28 +fi
1.29 +
1.30 # Check for a build directory and obtain a platform type.
1.31
1.32 if [ -e "$1" ] ; then
1.33 @@ -42,13 +52,15 @@
1.34 TARGETDIR="$1"
1.35 break
1.36 else
1.37 - cat 1>&2 <<EOF
1.38 + if [ ! "$QUIET" ] ; then
1.39 + cat 1>&2 <<EOF
1.40 The specified directory does not contain an existing, configured build
1.41 directory. Make sure that the configuration has been checked with the
1.42 appropriate tool specifying a platform as argument:
1.43
1.44 $DIRNAME/$PROGNAME <platform>
1.45 EOF
1.46 + fi
1.47 exit 1
1.48 fi
1.49 done
1.50 @@ -71,6 +83,13 @@
1.51 exit 1
1.52 fi
1.53
1.54 +# Handle missing configuration files. This may happen when installing into an
1.55 +# existing directory hierarchy with build products.
1.56 +
1.57 +if [ ! -e "$TARGETDIR/conf/landfall-examples" ] ; then
1.58 + exit 0
1.59 +fi
1.60 +
1.61 # Panel configuration file in the target area.
1.62
1.63 PANELCONF="$TARGETDIR/conf/landfall-examples/mips-jz4740-panel.txt"