From 1d9683144626856d5cb458b989f9c2810f2639fb Mon Sep 17 00:00:00 2001 From: Carsten Schafer Date: Tue, 19 Mar 2024 17:14:09 -0400 Subject: [PATCH 1/2] WIFI-12939: change to TIP repos for libraries Signed-off-by: Carsten Schafer --- BUILDING.md | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/BUILDING.md b/BUILDING.md index 843c923..b94eb02 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -12,19 +12,19 @@ In order to build the OWANALYTICS, you will need to install its dependencies, wh The build is done in 2 parts. The first part is to build a local copy of the framework tailored to your environment. This framework is called [Poco](https://github.com/pocoproject/poco). The version used in this project has a couple of fixes -from the master copy needed for cmake. Please use the version of this [Poco fix](https://github.com/AriliaWireless/poco). Building +from the master copy needed for cmake. Please use the version of this [Poco fix](https://github.com/Telecominfraproject/wlan-cloud-lib-poco). Building Poco may take several minutes depending on the platform you are building on. ## Ubuntu -These instructions have proven to work on Ubuntu 23.04. +These instructions have proven to work on Ubuntu 20.4. ```bash -sudo apt install git cmake g++ libssl-dev libmariadb-dev libmariadbclient-dev-compat +sudo apt install git cmake g++ libssl-dev libmariadb-dev sudo apt install libpq-dev libaprutil1-dev apache2-dev libboost-all-dev -sudo apt install librdkafka-dev -sudo apt install zlib1g-dev nlohmann-json3-dev ca-certificates libcurl4-openssl-dev +sudo apt install librdkafka-dev default-libmysqlclient-dev +sudo apt install nlohmann-json-dev cd ~ -git clone https://github.com/AriliaWireless/poco --branch poco-tip-v2 +git clone https://github.com/Telecominfraproject/wlan-cloud-lib-poco --branch poco-tip-v1 poco cd poco mkdir cmake-build cd cmake-build @@ -33,7 +33,7 @@ cmake --build . --config Release sudo cmake --build . --target install cd ~ -git clone https://github.com/AriliaWireless/cppkafka --branch tip-v1 +git clone https://github.com/Telecominfraproject/wlan-cloud-lib-cppkafka --branch tip-v1 cppkafka cd cppkafka mkdir cmake-build cd cmake-build @@ -42,7 +42,7 @@ cmake --build . --config Release sudo cmake --build . --target install cd ~ -git clone https://github.com/AriliaWireless/valijson --branch tip-v1 +git clone https://github.com/Telecominfraproject/wlan-cloud-lib-valijson --branch tip-v1 valijson cd valijson mkdir cmake-build cd cmake-build @@ -71,11 +71,11 @@ make -j 8 The following instructions have proven to work on Fedora 33 ```bash sudo yum install cmake g++ openssl-devel mysql-devel mysql apr-util-devel boost boost-devel -sudo yum install yaml-cpp-devel lua-devel +sudo yum install yaml-cpp-devel lua-devel sudo dnf install postgresql.x86_64 librdkafka-devel sudo dnf install postgresql-devel json-devel -git clone https://github.com/AriliaWireless/poco --branch poco-tip-v1 +git clone https://github.com/Telecominfraproject/wlan-cloud-lib-poco --branch poco-tip-v1 cd poco mkdir cmake-build cd cmake-build @@ -83,7 +83,7 @@ cmake .. cmake --build . --config Release sudo cmake --build . --target install -git clone https://github.com/AriliaWireless/cppkafka --branch tip-v1 +git clone https://github.com/Telecominfraproject/wlan-cloud-lib-cppkafka --branch tip-v1 cd cppkafka mkdir cmake-build cd cmake-build @@ -92,7 +92,7 @@ cmake --build . --config Release sudo cmake --build . --target install cd ~ -git clone https://github.com/AriliaWireless/valijson --branch tip-v1 +git clone https://github.com/Telecominfraproject/wlan-cloud-lib-valijson --branch tip-v1 cd valijson mkdir cmake-build cd cmake-build @@ -125,7 +125,7 @@ brew install openssl \ nlohmann-json \ fmt -git clone https://github.com/AriliaWireless/poco --branch poco-tip-v1 +git clone https://github.com/Telecominfraproject/wlan-cloud-lib-poco --branch poco-tip-v1 pushd poco mkdir cmake-build push cmake-build @@ -135,7 +135,7 @@ sudo cmake --build . --target install popd popd -git clone https://github.com/AriliaWireless/cppkafka --branch tip-v1 +git clone https://github.com/Telecominfraproject/wlan-cloud-lib-cppkafka --branch tip-v1 pushd cppkafka mkdir cmake-build pushd cmake-build @@ -145,7 +145,7 @@ sudo cmake --build . --target install popd popd -git clone https://github.com/AriliaWireless/valijson --branch tip-v1 +git clone https://github.com/Telecominfraproject/wlan-cloud-lib-valijson --branch tip-v1 cd valijson mkdir cmake-build cd cmake-build From 85fc28974c2b6e9e9e30c63ff690313e852e6168 Mon Sep 17 00:00:00 2001 From: Carsten Schafer Date: Tue, 19 Mar 2024 17:18:15 -0400 Subject: [PATCH 2/2] Update to more recent version of instructions Signed-off-by: Carsten Schafer --- BUILDING.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/BUILDING.md b/BUILDING.md index b94eb02..3e93c13 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -16,12 +16,12 @@ from the master copy needed for cmake. Please use the version of this [Poco fix] Poco may take several minutes depending on the platform you are building on. ## Ubuntu -These instructions have proven to work on Ubuntu 20.4. +These instructions have proven to work on Ubuntu 23.04. ```bash -sudo apt install git cmake g++ libssl-dev libmariadb-dev +sudo apt install git cmake g++ libssl-dev libmariadb-dev libmariadbclient-dev-compat sudo apt install libpq-dev libaprutil1-dev apache2-dev libboost-all-dev -sudo apt install librdkafka-dev default-libmysqlclient-dev -sudo apt install nlohmann-json-dev +sudo apt install librdkafka-dev +sudo apt install zlib1g-dev nlohmann-json3-dev ca-certificates libcurl4-openssl-dev cd ~ git clone https://github.com/Telecominfraproject/wlan-cloud-lib-poco --branch poco-tip-v1 poco