summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--util/abuild/abuild.sh30
-rw-r--r--util/newconfig/config.g4
2 files changed, 18 insertions, 16 deletions
diff --git a/util/abuild/abuild.sh b/util/abuild/abuild.sh
index 23d4dcbf45..9cf2f3d417 100644
--- a/util/abuild/abuild.sh
+++ b/util/abuild/abuild.sh
@@ -11,6 +11,7 @@
# archive for more details.
#
+#set -x # Turn echo on....
# Where shall we place all the build trees?
TARGET=$( pwd )/linuxbios-builds
@@ -33,7 +34,7 @@ function vendors
{
# make this a function so we can easily select
# without breaking readability
- ls -1 $LBROOT/src/mainboard | grep -v CVS
+ ls -1 "$LBROOT/src/mainboard" | grep -v CVS
}
function mainboards
@@ -253,32 +254,33 @@ target=""
buildall=false
# parse parameters
-args=`getopt -l version,verbose,help,all,target: Vvhat: $*`
+args=`getopt -l version,verbose,help,all,target: Vvhat: -- "$@"`
if [ $? != 0 ]; then
myhelp
exit 1
fi
-set -- $args
-for arg
-do
- case $arg in
- -t|--target) shift;target=$1;shift;;
- -a|--all) shift;buildall=true;;
- -v|--verbose) shift;verbose=true;;
- -V|--version) shift;myversion;;
- -h|--help) shift;myhelp;;
- esac
+eval set -- "$args"
+while true ; do
+ case $1 in
+ -t|--target) shift; target=$1; shift;;
+ -a|--all) shift; buildall=true;;
+ -v|--verbose) shift; verbose=true;;
+ -V|--version) shift; myversion;;
+ -h|--help) shift; myhelp;;
+ --) shift; break;;
+ *) echo "Unrecognized argument" ; exit 1 ;;
+ esac
done
-# -- is $1
-LBROOT=$2
+LBROOT=$1
# /path/to/freebios2/
if [ -z "$LBROOT" ] ; then
LBROOT=$( cd ../..; pwd )
fi
+echo "LBROOT=$LBROOT"
if [ "$target" != "" ]; then
# build a single board
diff --git a/util/newconfig/config.g b/util/newconfig/config.g
index 60b8d4f249..09663aaa44 100644
--- a/util/newconfig/config.g
+++ b/util/newconfig/config.g
@@ -1902,8 +1902,8 @@ parser Config:
#=============================================================================
def writemakefileheader(file, fname):
file.write("# File: %s is autogenerated\n" % fname)
- file.write("Makefile: %s %s\n"
- % (os.path.abspath(sys.argv[0]), top_config_file))
+ file.write("%s: %s %s\n"
+ % (os.path.basename(fname), os.path.abspath(sys.argv[0]), top_config_file))
file.write("\t(cd %s ; %s %s %s)\n\n"
% (os.getcwd(), sys.argv[0], sys.argv[1], sys.argv[2]))