From dfde5785a62bc4b59f504a5545ce8476ad09f88d Mon Sep 17 00:00:00 2001
From: Deomid Ryabkov <rojer@cesanta.com>
Date: Thu, 2 Jun 2016 23:24:56 +0200
Subject: [PATCH] Use fw_meta script from the build image

PUBLISHED_FROM=996721b6d28ee25fcfcb514d716552c4afa238e1
---
 examples/CC3200/Makefile.build | 7 +++----
 examples/CC3200/sdk.version    | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/examples/CC3200/Makefile.build b/examples/CC3200/Makefile.build
index 6b752cc3..13baa8b1 100644
--- a/examples/CC3200/Makefile.build
+++ b/examples/CC3200/Makefile.build
@@ -5,7 +5,6 @@
 PLATFORM = CC3200
 SDK_PATH ?= /cc3200-sdk
 REPO_PATH ?= ../../..
-COMMON_PATH ?= $(REPO_PATH)/common
 BUILD_DIR ?= ./.build
 FW_DIR ?= ./out
 SLFS_PATH ?= ./slfs
@@ -59,10 +58,10 @@ $(FW_DIR):
 $(FW_ZIP): $(FW_ELF) $(FW_BIN) $(SLFS_FILES)
 	@echo "    Code size: $(shell ls -l $(FW_BIN) | awk '{print $$5}')"
 	@echo "  GEN   $(FW_MANIFEST)"
-	@$(COMMON_PATH)/tools/fw_meta.py gen_build_info \
+	@fw_meta gen_build_info \
 	  --json_output=$(BUILD_INFO_JSON)
 	@cp -v $(SLFS_FILES) out/
-	@$(COMMON_PATH)/tools/fw_meta.py create_manifest \
+	@fw_meta create_manifest \
 	  --name=$(PROG) --platform=$(PLATFORM) \
 	  --build_info=$(BUILD_INFO_JSON) \
 	  --output=$(FW_MANIFEST) \
@@ -70,7 +69,7 @@ $(FW_ZIP): $(FW_ELF) $(FW_BIN) $(SLFS_FILES)
 	  sys_mcuimg.bin:src=$(notdir $(FW_BIN)) \
 		$(foreach f,$(SLFS_FILES), $(notdir $(f)):src=$(notdir $(f)))
 	@echo "  ZIP   $@"
-	@$(COMMON_PATH)/tools/fw_meta.py create_fw \
+	@fw_meta create_fw \
 	  --manifest=$(FW_MANIFEST) \
 	  --src_dir=$(FW_DIR) \
 	  --output=$@
diff --git a/examples/CC3200/sdk.version b/examples/CC3200/sdk.version
index 4775b7a3..1bee90fc 100644
--- a/examples/CC3200/sdk.version
+++ b/examples/CC3200/sdk.version
@@ -1 +1 @@
-docker.cesanta.com:5000/cc3200-build:1.2.0-r2
+docker.cesanta.com:5000/cc3200-build:1.2.0-r3