[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-168-ga22696d
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-168-ga22696d
|
From: Fabien M <fa...@us...> - 2011-06-10 11:42:44
|
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 a22696d160f45e01d8e9789674ede2a59dec561b (commit)
via c928945fab98e3eb250561841cc3b26569a50d01 (commit)
via 409d5fa9bf702b0c8530fb55bd29c092d6eed39e (commit)
via 0974b352c9c715355fb0b3e3759d3a1fb73ca79c (commit)
via df9ec03c5bbb5a49468bed7be235d392dd58d4a0 (commit)
from 2644319a8cdab4de25f58aef8900329da7e43a6b (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 a22696d160f45e01d8e9789674ede2a59dec561b
Author: Fabien Marteau <fab...@ar...>
Date: Fri Jun 10 13:42:00 2011 +0200
[buildroot][package][straton] adding staging dir parameter
commit c928945fab98e3eb250561841cc3b26569a50d01
Author: Fabien Marteau <fab...@ar...>
Date: Thu Jun 9 19:13:27 2011 +0200
[buildroot][package][straton] Change makefile according to new copy download target
commit 409d5fa9bf702b0c8530fb55bd29c092d6eed39e
Author: Fabien Marteau <fab...@ar...>
Date: Thu Jun 9 19:12:29 2011 +0200
[buildroot][package][straton] Change menuconfig to use a select list
commit 0974b352c9c715355fb0b3e3759d3a1fb73ca79c
Author: Fabien Marteau <fab...@ar...>
Date: Thu Jun 9 19:08:07 2011 +0200
[buildroot] Adding capability to copy directory from the computer instead of downloading the package from the internet
commit df9ec03c5bbb5a49468bed7be235d392dd58d4a0
Author: Fabien Marteau <fab...@ar...>
Date: Thu Jun 9 12:04:25 2011 +0200
[buildroot][package][straton] Adding straton menu
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/armadeus/Config.in | 1 +
buildroot/package/armadeus/straton/Config.in | 52 +++++++++++++++
buildroot/package/armadeus/straton/straton.mk | 30 +++++++++
...buildroot-Adding_copy_method_for_download.patch | 66 ++++++++++++++++++++
4 files changed, 149 insertions(+), 0 deletions(-)
create mode 100644 buildroot/package/armadeus/straton/Config.in
create mode 100644 buildroot/package/armadeus/straton/straton.mk
create mode 100644 patches/buildroot/2010.11/150-buildroot-Adding_copy_method_for_download.patch
diff --git a/buildroot/package/armadeus/Config.in b/buildroot/package/armadeus/Config.in
index 642cf5a..f4a91a1 100644
--- a/buildroot/package/armadeus/Config.in
+++ b/buildroot/package/armadeus/Config.in
@@ -10,6 +10,7 @@ source package/armadeus/imxssi/Config.in
source package/armadeus/max5821ctrl/Config.in
source package/armadeus/pps/Config.in
source package/armadeus/rxtx/Config.in
+source package/armadeus/straton/Config.in
source package/armadeus/testsuite/Config.in
source package/armadeus/tfp410ctrl/Config.in
diff --git a/buildroot/package/armadeus/straton/Config.in b/buildroot/package/armadeus/straton/Config.in
new file mode 100644
index 0000000..ad50b2e
--- /dev/null
+++ b/buildroot/package/armadeus/straton/Config.in
@@ -0,0 +1,52 @@
+comment "Select as_devices package to use straton"
+ depends on !(BR2_PACKAGE_AS_DEVICES)
+
+config BR2_PACKAGE_STRATON
+ bool "straton IEC-61131-3 environment"
+ default n
+ depends on BR2_PACKAGE_AS_DEVICES
+
+if BR2_PACKAGE_AS_DEVICES
+choice
+ prompt "Straton version"
+ default BR2_PACKAGE_STRATON_DEMO
+ depends on BR2_PACKAGE_STRATON
+
+config BR2_PACKAGE_STRATON_DEV
+ bool "straton_dev"
+ help
+ Developpement code for straton plc application.
+ This code is not GPL then you have to ask
+ ARMadeus Systems to obtain it.
+
+config BR2_PACKAGE_STRATON_BIN
+ bool "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
+
+config BR2_PACKAGE_STRATON_DEMO
+ bool "straton_demo (TODO)"
+ help
+ Straton demo runtime. This runtime will be stopped
+ after 10 minutes running. It can be relaunched each
+ 10 minutes.
+
+endchoice
+
+config BR2_PACKAGE_STRATON_DEV_DIR
+ string "straton development directory"
+ default "/straton/runtime"
+ depends on BR2_PACKAGE_STRATON_DEV
+ 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
new file mode 100644
index 0000000..4f2d0dd
--- /dev/null
+++ b/buildroot/package/armadeus/straton/straton.mk
@@ -0,0 +1,30 @@
+#############################################################
+#
+# straton
+#
+#############################################################
+STRATON_VERSION = 0.1
+STRATON_DEPENDENCIES = as_devices
+
+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)" -C $(@D) all
+endef
+
+define STRATON_INSTALL_TARGET_CMDS
+ $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/foo.d
+endef
+
+$(eval $(call GENTARGETS,package,straton))
diff --git a/patches/buildroot/2010.11/150-buildroot-Adding_copy_method_for_download.patch b/patches/buildroot/2010.11/150-buildroot-Adding_copy_method_for_download.patch
new file mode 100644
index 0000000..1f36eb4
--- /dev/null
+++ b/patches/buildroot/2010.11/150-buildroot-Adding_copy_method_for_download.patch
@@ -0,0 +1,66 @@
+Adding capability to copy directory from the computer instead of
+downloading the package from the internet
+
+Signed-off-by :Â Fabien Marteau <fab...@ar...>
+---
+
+Index: buildroot/Config.in
+===================================================================
+--- buildroot.orig/Config.in 2011-06-09 17:13:58.000000000 +0200
++++ buildroot/Config.in 2011-06-09 17:14:31.000000000 +0200
+@@ -17,6 +17,10 @@
+
+ menu "Commands"
+
++config BR2_COPY
++ string "Copy command"
++ default "cp -R "
++
+ config BR2_WGET
+ string "Wget command"
+ default "wget --passive-ftp -nd -t 3"
+Index: buildroot/package/Makefile.package.in
+===================================================================
+--- buildroot.orig/package/Makefile.package.in 2011-06-09 17:14:58.000000000 +0200
++++ buildroot/package/Makefile.package.in 2011-06-09 19:04:07.000000000 +0200
+@@ -73,6 +73,7 @@
+ SVN:=$(call qstrip,$(BR2_SVN)) $(QUIET)
+ BZR:=$(call qstrip,$(BR2_BZR)) $(QUIET)
+ GIT:=$(call qstrip,$(BR2_GIT)) $(QUIET)
++COPY:=$(call qstrip,$(BR2_COPY)) $(QUIET)
+
+ # Default spider mode is 'DOWNLOAD'. Other possible values are 'SOURCE_CHECK'
+ # used by the _source-check target and 'SHOW_EXTERNAL_DEPS', used by the
+@@ -154,6 +155,24 @@
+ echo $(2)
+ endef
+
++define DOWNLOAD_COPY
++ pushd $(DL_DIR) > /dev/null && \
++ $(COPY) $($(PKG)_SITE) $($(PKG)_DL_DIR)/ && \
++ $(TAR) czf $($(PKG)_SOURCE) $($(PKG)_BASE_NAME)/ && \
++ rm -rf $($(PKG)_DL_DIR) && \
++ popd > /dev/null
++endef
++
++define SOURCE_CHECK_COPY
++ test -e $($(PKG)_SITE)
++endef
++
++define SHOW_EXTERNAL_DEPS_COPY
++ echo $(2)
++endef
++
++
++
+ ################################################################################
+ # DOWNLOAD -- Download helper. Will try to download source from:
+ # 1) BR2_PRIMARY_SITE if enabled
+@@ -175,6 +194,7 @@
+ case "$($(PKG)_SITE_METHOD)" in \
+ git) $($(DL_MODE)_GIT) && exit ;; \
+ svn) $($(DL_MODE)_SVN) && exit ;; \
++ copy) $($(DL_MODE)_COPY) && exit ;; \
+ *) $(call $(DL_MODE)_WGET,$(1),$(2)) && exit ;; \
+ esac ; \
+ fi ; \
hooks/post-receive
--
armadeus
|
