From 45212d3b2fd22fdeec8e0062844eaff8de3039a0 Mon Sep 17 00:00:00 2001
From: Cedric Roux <cedric.roux@eurecom.fr>
Date: Tue, 8 Aug 2017 09:58:36 +0200
Subject: [PATCH] hotfix: protobuf-c compilation failure
protobuf-c does not compile anymore.
Let's handle this a bit better.
We now install protobuf and protobuf-c only for the
flexran agent. That is, if you want to use the flexran
agent, you need to install protobuf/protobuf-c and
you do it this way:
./build_oai -I -a
(you add -a)
Other targets don't need protobuf nor protobuf-c, so
it's not installed by the -I command of build_oai,
unless you pass -a with -I.
Also, we now use protobuf 3.3.0, not 2.6.1. The code
has been adapted, a quick test seems to indicate that
the system works, but it has not been intensively tested.
---
cmake_targets/build_oai | 5 +++++
cmake_targets/tools/build_helper | 14 ++++++++------
openair2/ENB_APP/MESSAGES/V2/config_common.proto | 2 +-
openair2/ENB_APP/MESSAGES/V2/config_messages.proto | 2 +-
.../ENB_APP/MESSAGES/V2/control_delegation.proto | 2 +-
.../ENB_APP/MESSAGES/V2/controller_commands.proto | 1 +
openair2/ENB_APP/MESSAGES/V2/flexran.proto | 4 ++--
openair2/ENB_APP/MESSAGES/V2/header.proto | 1 +
openair2/ENB_APP/MESSAGES/V2/mac_primitives.proto | 1 +
openair2/ENB_APP/MESSAGES/V2/stats_common.proto | 1 +
openair2/ENB_APP/MESSAGES/V2/stats_messages.proto | 1 +
openair2/ENB_APP/MESSAGES/V2/time_common.proto | 1 +
12 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/cmake_targets/build_oai b/cmake_targets/build_oai
index 93a7ac073e..c0cd450757 100755
--- a/cmake_targets/build_oai
+++ b/cmake_targets/build_oai
@@ -448,6 +448,11 @@ function main() {
flash_firmware_bladerf
fi
fi
+ if [ "$FLEXRAN_AGENT" == "1" ] ; then
+ echo_info "installing protobuf/protobuf-c for flexran agent support"
+ install_protobuf_from_source
+ install_protobuf_c_from_source
+ fi
fi
if [ "$INSTALL_OPTIONAL" = "1" ] ; then
diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper
index a57040449c..6c16666963 100755
--- a/cmake_targets/tools/build_helper
+++ b/cmake_targets/tools/build_helper
@@ -184,10 +184,14 @@ install_protobuf_from_source(){
(
cd /tmp
echo "Downloading protobuf"
- rm -rf /tmp/protobuf-2.6.1.tar.gz* /tmp/protobuf-2.6.1
- wget https://github.com/google/protobuf/releases/download/v2.6.1/protobuf-2.6.1.tar.gz
- tar -xzvf protobuf-2.6.1.tar.gz --owner $USER --group $USER --no-same-owner
- cd protobuf-2.6.1/
+ #rm -rf /tmp/protobuf-2.6.1.tar.gz* /tmp/protobuf-2.6.1
+ #wget https://github.com/google/protobuf/releases/download/v2.6.1/protobuf-2.6.1.tar.gz
+ #tar -xzvf protobuf-2.6.1.tar.gz --owner $USER --group $USER --no-same-owner
+ #cd protobuf-2.6.1/
+ rm -rf /tmp/protobuf-cpp-3.3.0.tar.gz* /tmp/protobuf-3.3.0
+ wget https://github.com/google/protobuf/releases/download/v3.3.0/protobuf-cpp-3.3.0.tar.gz
+ tar -xzvf protobuf-cpp-3.3.0.tar.gz --owner $USER --group $USER --no-same-owner
+ cd protobuf-3.3.0/
./configure
echo "Compiling protobuf"
make -j`nproc`
@@ -410,8 +414,6 @@ check_install_oai_software() {
install_asn1c_from_source
$SUDO rm -fr /opt/ssh
$SUDO git clone https://gist.github.com/2190472.git /opt/ssh
- install_protobuf_from_source
- install_protobuf_c_from_source
}
### Remove Nettle installation which was done from sources
diff --git a/openair2/ENB_APP/MESSAGES/V2/config_common.proto b/openair2/ENB_APP/MESSAGES/V2/config_common.proto
index 51ae711277..7b392b6b3b 100644
--- a/openair2/ENB_APP/MESSAGES/V2/config_common.proto
+++ b/openair2/ENB_APP/MESSAGES/V2/config_common.proto
@@ -1,4 +1,4 @@
-//'syntax = "proto2";'
+syntax = "proto2";
package protocol;
//
diff --git a/openair2/ENB_APP/MESSAGES/V2/config_messages.proto b/openair2/ENB_APP/MESSAGES/V2/config_messages.proto
index 441e193569..ac939b828c 100644
--- a/openair2/ENB_APP/MESSAGES/V2/config_messages.proto
+++ b/openair2/ENB_APP/MESSAGES/V2/config_messages.proto
@@ -1,4 +1,4 @@
-//'syntax = "proto2";'
+syntax = "proto2";
package protocol;
import "config_common.proto";
diff --git a/openair2/ENB_APP/MESSAGES/V2/control_delegation.proto b/openair2/ENB_APP/MESSAGES/V2/control_delegation.proto
index 3a5efaf7d4..0f7e34de15 100644
--- a/openair2/ENB_APP/MESSAGES/V2/control_delegation.proto
+++ b/openair2/ENB_APP/MESSAGES/V2/control_delegation.proto
@@ -1,4 +1,4 @@
-//'syntax = "proto2";'
+syntax = "proto2";
package protocol;
enum flex_control_delegation_type {
diff --git a/openair2/ENB_APP/MESSAGES/V2/controller_commands.proto b/openair2/ENB_APP/MESSAGES/V2/controller_commands.proto
index cbec332b30..c92f171b0e 100644
--- a/openair2/ENB_APP/MESSAGES/V2/controller_commands.proto
+++ b/openair2/ENB_APP/MESSAGES/V2/controller_commands.proto
@@ -1,3 +1,4 @@
+syntax = "proto2";
package protocol;
import "mac_primitives.proto";
diff --git a/openair2/ENB_APP/MESSAGES/V2/flexran.proto b/openair2/ENB_APP/MESSAGES/V2/flexran.proto
index 3a1d40bca6..8c0c300efe 100644
--- a/openair2/ENB_APP/MESSAGES/V2/flexran.proto
+++ b/openair2/ENB_APP/MESSAGES/V2/flexran.proto
@@ -1,4 +1,4 @@
-//'syntax = "proto2";'
+syntax = "proto2";
package protocol;
import "stats_messages.proto";
@@ -40,7 +40,7 @@ enum flexran_direction {
}
enum flexran_err {
- option allow_alias = true;
+ //option allow_alias = true;
// message errors
NO_ERR = 0;
MSG_DEQUEUING = -1;
diff --git a/openair2/ENB_APP/MESSAGES/V2/header.proto b/openair2/ENB_APP/MESSAGES/V2/header.proto
index dfd5ea6c99..939429f51f 100644
--- a/openair2/ENB_APP/MESSAGES/V2/header.proto
+++ b/openair2/ENB_APP/MESSAGES/V2/header.proto
@@ -1,3 +1,4 @@
+syntax = "proto2";
package protocol;
message flex_header {
diff --git a/openair2/ENB_APP/MESSAGES/V2/mac_primitives.proto b/openair2/ENB_APP/MESSAGES/V2/mac_primitives.proto
index be7c72ab7b..89b8f0e380 100644
--- a/openair2/ENB_APP/MESSAGES/V2/mac_primitives.proto
+++ b/openair2/ENB_APP/MESSAGES/V2/mac_primitives.proto
@@ -1,3 +1,4 @@
+syntax = "proto2";
package protocol;
//
diff --git a/openair2/ENB_APP/MESSAGES/V2/stats_common.proto b/openair2/ENB_APP/MESSAGES/V2/stats_common.proto
index 080883ea97..fa985bf9cc 100644
--- a/openair2/ENB_APP/MESSAGES/V2/stats_common.proto
+++ b/openair2/ENB_APP/MESSAGES/V2/stats_common.proto
@@ -1,3 +1,4 @@
+syntax = "proto2";
package protocol;
//
diff --git a/openair2/ENB_APP/MESSAGES/V2/stats_messages.proto b/openair2/ENB_APP/MESSAGES/V2/stats_messages.proto
index 1b1567dda1..d8c0651fa1 100644
--- a/openair2/ENB_APP/MESSAGES/V2/stats_messages.proto
+++ b/openair2/ENB_APP/MESSAGES/V2/stats_messages.proto
@@ -1,3 +1,4 @@
+syntax = "proto2";
package protocol;
//import "header.proto";
diff --git a/openair2/ENB_APP/MESSAGES/V2/time_common.proto b/openair2/ENB_APP/MESSAGES/V2/time_common.proto
index 30a56bb776..8bd2497443 100644
--- a/openair2/ENB_APP/MESSAGES/V2/time_common.proto
+++ b/openair2/ENB_APP/MESSAGES/V2/time_common.proto
@@ -1,3 +1,4 @@
+syntax = "proto2";
package protocol;
enum flex_harq_status {
--
GitLab