[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-317-g242d669
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-317-g242d669
|
From: Fabien M <fa...@us...> - 2013-07-19 12:35:51
|
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 242d6696e59a44c170b1255669099141cf185a36 (commit)
via 4e40f613c448a0b5dee6f9f44c4a6f3026cec4b2 (commit)
from e709107de891c7d848f9f3fb453a56ab3b4e8bc7 (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 242d6696e59a44c170b1255669099141cf185a36
Author: Fabien Marteau <fab...@ar...>
Date: Fri Jul 19 14:35:00 2013 +0200
[buildroot][package][beremiz] install beremiz host side
commit 4e40f613c448a0b5dee6f9f44c4a6f3026cec4b2
Author: Fabien Marteau <fab...@ar...>
Date: Fri Jul 19 13:23:47 2013 +0200
[buildroot] cleanup matiec package
-----------------------------------------------------------------------
Summary of changes:
.../2013.05/208-armadeus-add_beremiz.patch | 72 +++++++++++++++++---
.../2013.05/209-armadeus-add_matiec.patch | 17 +++--
patches/buildroot/2013.05/cleanup_buildroot.sh | 1 +
3 files changed, 73 insertions(+), 17 deletions(-)
diff --git a/patches/buildroot/2013.05/208-armadeus-add_beremiz.patch b/patches/buildroot/2013.05/208-armadeus-add_beremiz.patch
index 9d39aa3..db10ece 100644
--- a/patches/buildroot/2013.05/208-armadeus-add_beremiz.patch
+++ b/patches/buildroot/2013.05/208-armadeus-add_beremiz.patch
@@ -7,8 +7,8 @@ Signed-off-by: Fabien Marteau <fab...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2013-07-17 16:32:49.446416826 +0200
-+++ buildroot/package/Config.in 2013-07-17 16:33:31.622417483 +0200
+--- buildroot.orig/package/Config.in 2013-07-19 13:36:05.527970007 +0200
++++ buildroot/package/Config.in 2013-07-19 14:29:27.255886081 +0200
@@ -119,6 +119,7 @@
menu "Graphic libraries and applications (graphic/text)"
@@ -20,24 +20,32 @@ Index: buildroot/package/Config.in
Index: buildroot/package/beremiz/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/beremiz/Config.in 2013-07-17 18:03:16.974501310 +0200
-@@ -0,0 +1,11 @@
++++ buildroot/package/beremiz/Config.in 2013-07-19 13:37:01.331968545 +0200
+@@ -0,0 +1,19 @@
+comment "Beremiz needs Python 2.7 and pyro"
+ depends on !BR2_PACKAGE_PYTHON || !BR2_PACKAGE_PYTHON_PYRO
+
-+menuconfig BR2_PACKAGE_BEREMIZ
-+ bool "Beremiz"
++config BR2_PACKAGE_BEREMIZ
++ bool "beremiz runtime"
+ depends on BR2_PACKAGE_PYTHON
+ depends on BR2_PACKAGE_PYTHON_PYRO
+ help
-+ This option enable beremiz framework.
++ This option enable beremiz runtime
++
++ http://www.beremiz.org/
++
++config BR2_PACKAGE_HOST_BEREMIZ
++ bool "beremiz framework"
++ depends on BR2_PACKAGE_HOST_MATIEC
++ help
++ This option enable beremiz host framework
+
+ http://www.beremiz.org/
Index: buildroot/package/beremiz/beremiz.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/beremiz/beremiz.mk 2013-07-17 18:10:12.046507771 +0200
-@@ -0,0 +1,18 @@
++++ buildroot/package/beremiz/beremiz.mk 2013-07-19 14:11:18.343914624 +0200
+@@ -0,0 +1,25 @@
+#############################################################
+#
+# Beremiz
@@ -49,10 +57,52 @@ Index: buildroot/package/beremiz/beremiz.mk
+BEREMIZ_SITE_METHOD = hg
+
+BEREMIZ_DEPENDENCIES = python python-pyro
++HOST_BEREMIZ_DEPENDENCIES = host-matiec
+
+define BEREMIZ_INSTALL_TARGET_CMDS
-+ mkdir -p $(TARGET_DIR)/usr/lib/beremiz/
-+ cp -r $(@D)/* $(TARGET_DIR)/usr/lib/beremiz/
++ mkdir -p $(TARGET_DIR)/opt/beremiz/
++ cp -r $(@D)/* $(TARGET_DIR)/opt/beremiz/
++endef
++
++define HOST_BEREMIZ_INSTALL_CMDS
++ mkdir -p $(HOST_DIR)/opt/beremiz/
++ cp -r $(@D)/* $(HOST_DIR)/opt/beremiz/
+endef
+
+$(eval $(generic-package))
++$(eval $(host-generic-package))
+Index: buildroot/package/beremiz/host-beremiz-fix_compare_and_swap_problem_to_be_removed_with_kernel_3.1.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/beremiz/host-beremiz-fix_compare_and_swap_problem_to_be_removed_with_kernel_3.1.patch 2013-07-19 14:29:40.107885746 +0200
+@@ -0,0 +1,30 @@
++Index: beremiz_trunk/targets/Linux/plc_Linux_main.c
++===================================================================
++--- beremiz_trunk.orig/targets/Linux/plc_Linux_main.c 2013-07-19 14:27:11.655889635 +0200
+++++ beremiz_trunk/targets/Linux/plc_Linux_main.c 2013-07-19 14:27:54.111888523 +0200
++@@ -17,10 +17,25 @@
++ {
++ return __sync_val_compare_and_swap(atomicvar, compared, exchange);
++ }
+++/*
++ long long AtomicCompareExchange64(long long* atomicvar, long long compared, long long exchange)
++ {
++ return __sync_val_compare_and_swap(atomicvar, compared, exchange);
++ }
+++*/
+++static pthread_mutex_t cs_mutex = PTHREAD_MUTEX_INITIALIZER;
+++long long AtomicCompareExchange64(long long* atomicvar, long long compared, long long exchange)
+++{
+++ long long res;
+++
+++ pthread_mutex_lock(&cs_mutex);
+++ res=*atomicvar;
+++ if(*atomicvar == compared){
+++ *atomicvar = exchange;
+++ }
+++ pthread_mutex_unlock(&cs_mutex);
+++ return res;
+++}
++
++ void PLC_GetTime(IEC_TIME *CURRENT_TIME)
++ {
diff --git a/patches/buildroot/2013.05/209-armadeus-add_matiec.patch b/patches/buildroot/2013.05/209-armadeus-add_matiec.patch
index b6ee55d..39f6bae 100644
--- a/patches/buildroot/2013.05/209-armadeus-add_matiec.patch
+++ b/patches/buildroot/2013.05/209-armadeus-add_matiec.patch
@@ -5,8 +5,8 @@ Signed-off-by: Fabien Marteau <fab...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2013-07-19 11:16:10.912190054 +0200
-+++ buildroot/package/Config.in 2013-07-19 11:16:12.540190012 +0200
+--- buildroot.orig/package/Config.in 2013-07-19 14:29:27.255886081 +0200
++++ buildroot/package/Config.in 2013-07-19 14:30:41.067884146 +0200
@@ -83,6 +83,7 @@
endif
source "package/intltool/Config.in"
@@ -18,7 +18,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/matiec/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/matiec/Config.in 2013-07-19 11:16:12.544190011 +0200
++++ buildroot/package/matiec/Config.in 2013-07-19 14:30:41.067884146 +0200
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_HOST_MATIEC
+ bool "matiec"
@@ -29,8 +29,8 @@ Index: buildroot/package/matiec/Config.in
Index: buildroot/package/matiec/matiec.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/matiec/matiec.mk 2013-07-19 11:16:12.544190011 +0200
-@@ -0,0 +1,17 @@
++++ buildroot/package/matiec/matiec.mk 2013-07-19 14:30:41.067884146 +0200
+@@ -0,0 +1,22 @@
+#############################################################
+#
+# matiec
@@ -45,13 +45,18 @@ Index: buildroot/package/matiec/matiec.mk
+ (cd $(@D); autoreconf)
+endef
+
++define HOST_MATIEC_INSTALL_CMDS
++ mkdir -p $(HOST_DIR)/opt/matiec/
++ cp -r $(@D)/* $(HOST_DIR)/opt/matiec/
++endef
++
+HOST_MATIEC_PRE_CONFIGURE_HOOKS += HOST_MATIEC_AUTORECONFIGURE
+
+$(eval $(host-autotools-package))
Index: buildroot/package/matiec/host-matiec-001-fix_bison_compilation_error.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/matiec/host-matiec-001-fix_bison_compilation_error.patch 2013-07-19 13:10:43.380009910 +0200
++++ buildroot/package/matiec/host-matiec-001-fix_bison_compilation_error.patch 2013-07-19 14:30:41.067884146 +0200
@@ -0,0 +1,13 @@
+Index: matiec/stage1_2/iec_bison.yy
+===================================================================
diff --git a/patches/buildroot/2013.05/cleanup_buildroot.sh b/patches/buildroot/2013.05/cleanup_buildroot.sh
index 123e19d..a8f096f 100755
--- a/patches/buildroot/2013.05/cleanup_buildroot.sh
+++ b/patches/buildroot/2013.05/cleanup_buildroot.sh
@@ -12,6 +12,7 @@ rm -rf buildroot/package/gpm/
rm -rf buildroot/package/python-pygame/
rm -rf buildroot/package/python-pyro/
rm -rf buildroot/package/uucp/
+rm -rf buildroot/package/matiec/
rm -f buildroot/package/multimedia/libsndfile/libsndfile-1.0.*-srconly.patch
rm -rf buildroot/package/multimedia/flite/
rm -rf buildroot/package/libcurl/
hooks/post-receive
--
armadeus
|
