freifunk/site-ffhh
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update the build.sh in master to the version used in 0.8.x

Browse source
This commit is contained in:
Daniel Frank 2017-12-19 03:00:34 +01:00
parent 1544c80a4f
commit 03a399b547
1 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
build.sh
View file

@ -7,12 +7,15 @@ function announce () {
proc=$(nproc) proc=$(nproc)
gluon_out="${HOME}/firmware" gluon_out="${HOME}/firmware"
while getopts g:j:o:s:bv opt; do while getopts g:j:l:o:s:u:bmv opt; do
case "$opt" in case "$opt" in
g) gluon_path="$OPTARG" ;; g) gluon_path="$OPTARG" ;;
l) sites="$OPTARG" ;;
o) gluon_out="$OPTARG" ;; o) gluon_out="$OPTARG" ;;
s) signature="$OPTARG" ;; s) signature="$OPTARG" ;;
u) uploadscript="$OPTARG" ;;
b) export BROKEN=1 ;; b) export BROKEN=1 ;;
m) dont_make_sites=1 ;;
j) proc="$OPTARG" ;; j) proc="$OPTARG" ;;
v) verbose=V=s ;; v) verbose=V=s ;;
esac esac
@ -20,9 +23,12 @@ done
if [ -z "${gluon_path}" ]; then if [ -z "${gluon_path}" ]; then
echo "Usage: $0 -g GLUON_PATH" >&2 echo "Usage: $0 -g GLUON_PATH" >&2
echo " -g GLUON_PATH Path to a checkout of the gluon repository." >&2 echo " -g GLUON_PATH Path to a checkout of the gluon repository." >&2
echo " -o OUT_PATH Path to a checkout of the gluon repository. Default: ${gluon_out}" >&2 echo " -l SITES Comma separated list of sites to build" >&2
echo " -o OUT_PATH Path to the firmware output directory. Default: ${gluon_out}" >&2
echo " -s SIGNATURE Sign firmware with signature" >&2 echo " -s SIGNATURE Sign firmware with signature" >&2
echo " -u UPLOADSCRIPT Run UPLOADSCRIPT after building. Argument: $gluon_out/<GLUON_RELEASE>" >&2
echo " -b BROKEN=1" >&2 echo " -b BROKEN=1" >&2
echo " -m Do not regenerate the sites" >&2
echo " -v verbose" >&2 echo " -v verbose" >&2
echo " -j JOBS Run build with -jJOBS. Default: ${proc}" >&2 echo " -j JOBS Run build with -jJOBS. Default: ${proc}" >&2
exit 1 exit 1
@ -33,24 +39,27 @@ gluon_out=$(realpath $gluon_out)
site_path=$(realpath $(dirname $BASH_SOURCE)) site_path=$(realpath $(dirname $BASH_SOURCE))
announce GLUON: $gluon_path >&2 announce GLUON: $gluon_path >&2
announce FFHH SITES: $site_path >&2 announce FFHH SITE PATH: $site_path >&2
# Build the site repo and generate all site configs pushd $site_path
announce Building site repo and reading data >&2 if [ "$dont_make_sites" == "" ]; then
pushd $site_path > /dev/null # Build the site repo and generate all site configs
make announce Building site repo and reading data >&2
make
fi
. ./info . ./info
export GLUON_RELEASE export GLUON_RELEASE
export GLUON_BRANCH export GLUON_BRANCH
# get the available sites... # get the available sites...
sites="$(echo "$sites" | sed -e 's_,_ _g')"
if [ "$sites" == "" ]; then if [ "$sites" == "" ]; then
for s in sites/*; do sites="${sites} ${s##*/}"; done for s in sites/*; do sites="${sites} ${s##*/}"; done
fi fi
announce Gluon will be built for the following sites:$sites >&2 announce Gluon will be built for the following sites:$sites >&2
announce The following targets will be generated: $targets >&2 announce The following targets will be generated: $targets >&2
popd >/dev/null popd
pushd "${gluon_path}" >/dev/null pushd "${gluon_path}"
announce Starting make update... announce Starting make update...
for s in $sites; do for s in $sites; do
export GLUON_SITEDIR="${site_path}/sites/${s}" export GLUON_SITEDIR="${site_path}/sites/${s}"
@ -86,4 +95,8 @@ for s in $sites; do
fi fi
fi fi
done done
popd >/dev/null popd
if [ -n "$uploadscript" ]; then
announce Starting upload. Executing: $uploadscript $gluon_out/$GLUON_RELEASE
"$uploadscript" "$gluon_out/$GLUON_RELEASE"
fi