diff options
| author | Alexander Couzens <lynxis@fe80.eu> | 2016-07-13 17:58:50 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2016-07-13 21:01:24 +0200 |
| commit | a7be296e53ddbd5c1952ae43293d8391a589e610 (patch) | |
| tree | d06dc8cfa4bc888ba74693304de853fea970329a | |
| parent | ed2a6d02cf2dce887ba4f319e83852115189f1e8 (diff) | |
| download | jenkins.debian.net-a7be296e53ddbd5c1952ae43293d8391a589e610.tar.xz | |
reproducible openwrt: modify build_two_times to allow lede builds
Signed-off-by: Holger Levsen <holger@layer-acht.org>
| -rwxr-xr-x | bin/reproducible_openwrt.sh | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/bin/reproducible_openwrt.sh b/bin/reproducible_openwrt.sh index 7f1338ec..6bb19346 100755 --- a/bin/reproducible_openwrt.sh +++ b/bin/reproducible_openwrt.sh @@ -142,9 +142,15 @@ openwrt_cleanup() { rm logs/* -rf } +# TARGET a target including subtarget. E.g. ar71xx_generic +# CONFIG - a simple basic .config as string. Use \n to seperate lines +# TYPE - openwrt or lede +# lede has a different output directory than openwrt build_two_times() { - TARGET=$1 - CONFIG=$2 + TYPE=$1 + TARGET=$2 + CONFIG=$3 + openwrt_config $CONFIG openwrt_build_toolchain @@ -157,7 +163,8 @@ build_two_times() { cat $(find build_dir/ -name banner | grep etc/banner|head -1) > $BANNER_HTML # save results in b1 - save_openwrt_results b1 + [ TYPE = "lede" ] && save_lede_results b1 + [ TYPE = "openwrt" ] && save_openwrt_results b1 # copy logs save_openwrt_logs b1 @@ -178,7 +185,8 @@ build_two_times() { openwrt_build "second" "$TARGET" # save results in b2 - save_openwrt_results b2 + [ TYPE = "lede" ] && save_lede_results b2 + [ TYPE = "openwrt" ] && save_openwrt_results b2 # copy logs save_openwrt_logs b2 @@ -223,7 +231,7 @@ git log -1 #./scripts/feeds update -a #./scripts/feeds install -a -build_two_times ar71xx_generic_ARCHERC7 "CONFIG_TARGET_ar71xx_generic=y\nCONFIG_TARGET_ar71xx_generic_ARCHERC7=y\n" +build_two_times openwrt ar71xx_generic_ARCHERC7 "CONFIG_TARGET_ar71xx_generic=y\nCONFIG_TARGET_ar71xx_generic_ARCHERC7=y\n" # for now we only build one architecture until it's at most reproducible #build_two_times x86_64 "CONFIG_TARGET_x86=y\nCONFIG_TARGET_x86_64=y\n" |