[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-253-g6ab1789

[Fabien M <fa...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  6ab1789742ee14ab40071ba5413e9bc1536ceec8 (commit)
       via  f80d3a10724cfb46ed7f3fc49888239c84b41a65 (commit)
       via  4009f1dd20ee86e89734c81342d79de062fe077b (commit)
       via  9ce9be947006bf4d2013ae47b2fb1613dfab3d26 (commit)
       via  1f9383ff4259181a7cc2169bd6189fd40c9d2407 (commit)
      from  fb171838bb8d3160d1e1dea4ee32f33e4ea58b60 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6ab1789742ee14ab40071ba5413e9bc1536ceec8
Merge: f80d3a10724cfb46ed7f3fc49888239c84b41a65 fb171838bb8d3160d1e1dea4ee32f33e4ea58b60
Author: Fabien Marteau <fab...@ar...>
Date:   Tue Jun 28 15:25:13 2011 +0200

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit f80d3a10724cfb46ed7f3fc49888239c84b41a65
Merge: 4009f1dd20ee86e89734c81342d79de062fe077b 044fd59f56b8510b6074c264d088403a574d7b09
Author: Fabien Marteau <fab...@ar...>
Date:   Tue Jun 28 10:45:48 2011 +0200

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit 4009f1dd20ee86e89734c81342d79de062fe077b
Merge: 9ce9be947006bf4d2013ae47b2fb1613dfab3d26 ee8eb7655cb49b082c0c601e590a389bbeb153e9
Author: Fabien Marteau <fab...@ar...>
Date:   Tue Jun 28 10:15:14 2011 +0200

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit 9ce9be947006bf4d2013ae47b2fb1613dfab3d26
Merge: 1f9383ff4259181a7cc2169bd6189fd40c9d2407 f39412fe7cbbd63aa6fb64c0a60b854e78f88d20
Author: Fabien Marteau <fab...@ar...>
Date:   Mon Jun 27 19:09:26 2011 +0200

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit 1f9383ff4259181a7cc2169bd6189fd40c9d2407
Author: Fabien Marteau <fab...@ar...>
Date:   Fri Jun 24 18:14:00 2011 +0200

    [buildroot][package][straton] Packaging completed (with demo version)

-----------------------------------------------------------------------

Summary of changes:
 buildroot/package/armadeus/straton/Config.in  |   11 +-------
 buildroot/package/armadeus/straton/straton.mk |   33 ++++++++++++++++++-------
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/buildroot/package/armadeus/straton/Config.in b/buildroot/package/armadeus/straton/Config.in
index ad50b2e..41eda04 100644
--- a/buildroot/package/armadeus/straton/Config.in
+++ b/buildroot/package/armadeus/straton/Config.in
@@ -24,11 +24,10 @@ config BR2_PACKAGE_STRATON_BIN
 	help
 	  Straton runtime binary. This runtime is not free
 	  ask ARMadeus Systems to obtain it. If you have
-	  the tar.gz select this option then give the full
-	  path name in "straton runtime path" field
+	  the tar.gz, copy it under your downloads/ directory
 
 config BR2_PACKAGE_STRATON_DEMO
-	bool "straton_demo (TODO)"
+	bool "straton_demo"
 	help
 	  Straton demo runtime. This runtime will be stopped
 	  after 10 minutes running. It can be relaunched each
@@ -43,10 +42,4 @@ config BR2_PACKAGE_STRATON_DEV_DIR
 	help
 	  Straton runtime development code directory
 
-config BR2_PACKAGE_STRATON_BIN_DIR
-	string "straton runtime path"
-	depends on BR2_PACKAGE_STRATON_BIN
-	default "/straton_dir/straton-armadeus-0.1.tar.gz"
-	help
-	  straton runtime full path
 endif
diff --git a/buildroot/package/armadeus/straton/straton.mk b/buildroot/package/armadeus/straton/straton.mk
index aa00e21..8b499e5 100644
--- a/buildroot/package/armadeus/straton/straton.mk
+++ b/buildroot/package/armadeus/straton/straton.mk
@@ -7,18 +7,10 @@ STRATON_VERSION = 0.1
 STRATON_DEPENDENCIES = straton_ios
 STRATON_BIN_NAME = straton
 
+# STRATON DEV
 ifeq ($(BR2_PACKAGE_STRATON_DEV),y)
 STRATON_SITE=$(BR2_PACKAGE_STRATON_DEV_DIR)
 STRATON_SITE_METHOD=copy
-endif
-ifeq ($(BR2_PACKAGE_STRATON_BIN),y)
-STRATON_SITE=$(BR2_PACKAGE_STRATON_BIN_DIR)
-STRATON_SITE_METHOD=copy
-endif
-ifeq ($(BR2_PACKAGE_STRATON_DEMO),y)
-STRATON_SITE=http://TODO
-STRATON_SITE_METHOD=wget
-endif
 
 define STRATON_BUILD_CMDS
 	$(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" STAGING_DIR="$(STAGING_DIR)" \
@@ -28,5 +20,28 @@ endef
 define STRATON_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0755 $(STRATON_DIR)/bin/t5hmi $(TARGET_DIR)/usr/bin/$(STRATON_BIN_NAME)
 endef
+endif
+
+# STRATON BIN
+ifeq ($(BR2_PACKAGE_STRATON_BIN),y)
+STRATON_SITE=http://ask_for_binary
+STRATON_SITE_METHOD=wget
+#STRATON_SOURCE=straton-$(STRATON_VERSION).tar.gz
+
+define STRATON_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 0755 $(STRATON_DIR)/straton $(TARGET_DIR)/usr/bin/$(STRATON_BIN_NAME)
+endef
+
+endif
+
+# STRATON DEMO
+ifeq ($(BR2_PACKAGE_STRATON_DEMO),y)
+STRATON_SITE=ftp://ftp2.armadeus.com
+STRATON_SOURCE=straton_demo-$(STRATON_VERSION).tar.gz
+
+define STRATON_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 0755 $(STRATON_DIR)/straton $(TARGET_DIR)/usr/bin/$(STRATON_BIN_NAME)
+endef
+endif
 
 $(eval $(call GENTARGETS,package,straton))


hooks/post-receive
-- 
armadeus