Browse Source

build{,-version}.sh: include TARGETS in build-info and use it in build-version.sh

Helge Jung 9 years ago
parent
commit
7427e2a75f
3 changed files with 6 additions and 2 deletions
  1. 4 2
      build-version.sh
  2. 1 0
      build.sh
  3. 1 0
      versions/0.6.1_testing

+ 4 - 2
build-version.sh

@@ -15,6 +15,7 @@ base=`awk 'BEGIN { FS="=" } /^GLUON=([a-f0-9]+)(\s*#.+)?$/ { print $2; }' $versi
 branch=`awk 'BEGIN { FS="=" } /^BRANCH=([a-z]+)$/ { print $2; }' $versionfile`
 version=`awk 'BEGIN { FS="=" } /^VERSION=([0-9\.\-+~a-z]+)$/ { print $2; }' $versionfile`
 site=`awk 'BEGIN { FS="=" } /^SITE=([a-f0-9]+)(\s*#.+)?$/ { print $2; }' $versionfile | awk 'BEGIN { FS="#" } { print $1; }'`
+targets=`awk 'BEGIN { FS="=" } /^TARGETS=.+$/ { print $2; }' $versionfile`
 ts=`awk 'BEGIN { FS="=" } /^TS=.+$/ { print $2; }' $versionfile`
 
 [ -z "$base" ] && abort "Failed to parse Gluon base commit-id from version file."
@@ -31,12 +32,13 @@ info "Building $branch version '$version' again ..."
 echo " * Gluon base = $base"
 echo " * Site repo  = $site"
 echo " * Timestamp  = $ts"
+echo " * Targets    = $targets"
 echo
 
 # invoke build script
 if [ "$NO_DOCKER" == "1" ]; then
-	BASE="$base" BRANCH="$branch" SITE="$site" VERSION="$version" BUILD_TS="$ts" ./build.sh
+	BASE="$base" BRANCH="$branch" SITE="$site" VERSION="$version" BUILD_TS="$ts" TARGETS="$targets" ./build.sh
 else
-	BASE="$base" BRANCH="$branch" SITE="$site" VERSION="$version" BUILD_TS="$ts" ./docker-build.sh
+	BASE="$base" BRANCH="$branch" SITE="$site" VERSION="$version" BUILD_TS="$ts" TARGETS="$targets" ./docker-build.sh
 fi
 

+ 1 - 0
build.sh

@@ -137,6 +137,7 @@ echo "VERSION=${VERSION}" >> ${build_info_path}
 echo "GLUON=${GLUON_COMMIT} # ${BASE}" >> ${build_info_path}
 echo "BRANCH=${BRANCH}" >> ${build_info_path}
 echo "SITE=${SITE_COMMIT} # ${VERSION}" >> ${build_info_path}
+echo "TARGETS=${TARGETS}" >> ${build_info_path}
 echo "TS=${BUILD_TS}" >> ${build_info_path}
 
 ### BUILD FIRMWARE

+ 1 - 0
versions/0.6.1_testing

@@ -2,4 +2,5 @@ VERSION=0.6.1
 GLUON=1eb0d0e6cb076f2714579634eddea6db0a4c7e6b # v2014.4
 BRANCH=testing
 SITE=f40ade76695307b8468a040e1267f3bc2e3a29d0 # 0.6.1
+TARGETS=ar71xx_generic mpc85xx_generic
 TS=2015-03-18 07:44:16