Clear env vars used in recovery script before and after running it

[oweals/u-boot_mod.git] / Makefile

diff --git a/Makefile b/Makefile
index 1e3789caeaeaf0282ee84e8996c6423fd90da221..96add61292d3781aef0d2c755f1f72bd2a0ffabf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -89,9 +89,21 @@ $(if $(IMG_LZMA),\
 )
 endef
 
+define git_branch
+$(shell git symbolic-ref --short -q HEAD 2>/dev/null || echo "unknown")
+endef
+
+define git_hash
+$(shell git rev-parse --short=8 -q HEAD 2>/dev/null || echo "unknown")
+endef
+
+define git_branch_hash
+git_$(call git_branch)-$(call git_hash)
+endef
+
 # $(1): file extension
 define img_name
-u-boot_mod__$(shell date +"%Y%m%d")__$@$(if \
+u-boot_mod__$@__$(shell date +"%Y%m%d")__$(call git_branch_hash)$(if \
 $(filter $(IMG_RAM),1),__RAM-LOAD-ONLY)$(if $(1),.$(1))
 endef
 
@@ -125,7 +137,7 @@ endef
 define size_chk
   $(call echo_green,Checking size of the image...)
 
-  if [ `wc -c < $(1)` -gt `echo $(2)*1024 | bc` ]; then \
+  if [ `wc -c < $(1)` -gt $$(($(2) * 1024)) ]; then \
     echo; \
     $(call echo_red,  ======================); \
     $(call echo_red,  IMAGE SIZE IS TOO BIG!); \
@@ -204,26 +216,47 @@ $(COMMON_AR933X_TARGETS):
 
 COMMON_ETHS27_TARGETS = \
        tp-link_tl-mr3420_v2 \
-       tp-link_tl-wa830re_v2_tl-wa801nd_v2 \
+       tp-link_tl-wa801nd_v2 \
+       tp-link_tl-wa850re_v2 \
+       tp-link_tl-wa830re_v2 \
        tp-link_tl-wdr3500 \
        tp-link_tl-wr802n \
+       tp-link_tl-wr810n \
        tp-link_tl-wr820n_CN \
+       tp-link_tl-wr841n_v10 \
+       tp-link_tl-wr841n_v11 \
        tp-link_tl-wr841n_v8 \
        tp-link_tl-wr841n_v9
 
 $(COMMON_ETHS27_TARGETS):
        @$(call build,123,1,ETH_CONFIG=_s27)
 
-8devices_carambola2:
+8devices_carambola2 \
+alfa-network_hornet-ub \
+gl-innovations_gl-ar150:
        @$(call build,256,1)
 
+comfast_cf-e314n \
+comfast_cf-e320n_v2 \
+comfast_cf-e520n \
+comfast_cf-e530n:
+       @$(call build,64,1,ETH_CONFIG=_s27)
+
 d-link_dir-505:
        @$(call build,64,1)
 
 dragino_v2_ms14:
        @$(call build,192,1,DEVICE_VENDOR=dragino)
 
-tp-link_tl-wdr3600_tl-43x0:
+p2w_cpe505n \
+p2w_r602n \
+yuncore_ap90q \
+yuncore_cpe830 \
+zbtlink_zbt-we1526:
+       @$(call build,256,1,ETH_CONFIG=_s27)
+
+tp-link_tl-wdr3600 \
+tp-link_tl-wdr43x0:
        @$(call build,123,1,ETH_CONFIG=_s17)
 
 unwireddevices_unwired-one:
@@ -235,13 +268,16 @@ village-telco_mesh-potato_v2:
 wallys_dr531:
        @$(call build,192,1,ETH_CONFIG=_s27)
 
-zbtlink_zbt-we1526:
-       @$(call build,256,1,ETH_CONFIG=_s27)
+yuncore_cpe870:
+       @$(call build,64,1,ETH_CONFIG=_s27)
 
 # =============
 # CLEAN TARGETS
 # =============
 
+lzma_host_clean:
+       @cd $(SOURCE_DIR) && $(SUB_MAKE_CMD) $@
+
 clean:
        @cd $(SOURCE_DIR) && $(SUB_MAKE_CMD) distclean
        @rm -f $(SOURCE_DIR)/httpd/fsdata.c