From 1de94be4474997f1d9dea7a6cbf3347581b28757 Mon Sep 17 00:00:00 2001 From: Carsten Schafer Date: Thu, 14 Mar 2024 15:11:23 -0400 Subject: [PATCH] WIFI-12939: change to TIP repos for libraries Signed-off-by: Carsten Schafer --- BUILDING.md | 62 +++++++++++++++++++++++++++++------------------------ Dockerfile | 12 +++++------ 2 files changed, 40 insertions(+), 34 deletions(-) diff --git a/BUILDING.md b/BUILDING.md index b627e06d..17770aec 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -1,5 +1,5 @@ # Building from source -In order to build the OWGW, you will need to install its dependencies, which includes the following: +In order to build OWGW, you will need to install its dependencies, which includes the following: - cmake - boost - POCO 1.10.1 or later @@ -12,43 +12,43 @@ In order to build the OWGW, you will need to install its dependencies, which inc 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 20.4. ```bash -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 // default-libmysqlclient-dev -sudo apt install nlohmann-json-dev +sudo apt install git cmake g++ libssl-dev libmariadb-dev \ + libpq-dev libaprutil1-dev apache2-dev libboost-all-dev \ + librdkafka-dev // default-libmysqlclient-dev \ + 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 cmake .. cmake --build . --config Release sudo cmake --build . --target install +cd ../.. -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 cmake .. cmake --build . --config Release sudo cmake --build . --target install +cd ../.. -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 cmake .. cmake --build . --config Release sudo cmake --build . --target install +cd ../.. git clone https://github.com/fmtlib/fmt --branch 9.0.0 /fmtlib cd fmtlib @@ -57,56 +57,59 @@ cd cmake-build cmake .. make make install +cd ../.. -cd ~ git clone https://github.com/Telecominfraproject/wlan-cloud-ucentralgw cd wlan-cloud-ucentralgw mkdir cmake-build cd cmake-build cmake .. make -j 8 +cd ../.. ``` ## Fedora 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 cmake g++ openssl-devel mysql-devel mysql apr-util-devel boost boost-devel \ + 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-v2 +git clone https://github.com/Telecominfraproject/wlan-cloud-lib-poco --branch poco-tip-v1 poco cd poco mkdir cmake-build cd cmake-build cmake .. 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 cmake .. cmake --build . --config Release sudo cmake --build . --target install +cd ../.. -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 cmake .. cmake --build . --config Release sudo cmake --build . --target install +cd ../.. -cd ~ git clone https://github.com/Telecominfraproject/wlan-cloud-ucentralgw cd wlan-cloud-ucentralgw mkdir cmake-build cd cmake-build cmake .. make +cd ../.. ``` ## macOS Build @@ -125,7 +128,7 @@ brew install openssl \ nlohmann-json \ fmt -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 pushd poco mkdir cmake-build push cmake-build @@ -135,7 +138,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 cppkafka pushd cppkafka mkdir cmake-build pushd cmake-build @@ -145,10 +148,10 @@ sudo cmake --build . --target install popd popd -git clone https://github.com/AriliaWireless/valijson --branch tip-v1 -cd valijson +git clone https://github.com/Telecominfraproject/wlan-cloud-lib-valijson --branch tip-v1 valijson +pushd valijson mkdir cmake-build -cd cmake-build +pushd cmake-build cmake .. cmake --build . --config Release sudo cmake --build . --target install @@ -171,20 +174,23 @@ support. You can build with only SQLite support by not installing the packages f adding -DSMALL_BUILD=1 on the cmake build line. ```bash -sudo apt install git cmake g++ libssl-dev libaprutil1-dev apache2-dev libboost-all-dev libyaml-cpp-dev -git clone https://github.com/stephb9959/poco +sudo apt install git cmake g++ libssl-dev libaprutil1-dev apache2-dev \ + libboost-all-dev libyaml-cpp-dev + +git clone https://github.com/Telecominfraproject/wlan-cloud-lib-poco --branch poco-tip-v1 poco cd poco mkdir cmake-build cd cmake-build cmake .. cmake --build . --config Release sudo cmake --build . --target install +cd ../.. -cd ~ git clone https://github.com/Telecominfraproject/wlan-cloud-ucentralgw cd wlan-cloud-ucentralgw mkdir cmake-build cd cmake-build cmake -DSMALL_BUILD=1 .. make +cd ../.. ``` diff --git a/Dockerfile b/Dockerfile index 629f9faa..d1eb639e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,8 +17,8 @@ FROM build-base AS poco-build ARG POCO_VERSION -ADD https://api.github.com/repos/AriliaWireless/poco/git/refs/tags/${POCO_VERSION} version.json -RUN git clone https://github.com/AriliaWireless/poco --branch ${POCO_VERSION} /poco +ADD https://api.github.com/repos/Telecominfraproject/wlan-cloud-lib-poco/git/refs/tags/${POCO_VERSION} version.json +RUN git clone https://github.com/Telecominfraproject/wlan-cloud-lib-poco --branch ${POCO_VERSION} /poco WORKDIR /poco RUN mkdir cmake-build @@ -31,8 +31,8 @@ FROM build-base AS cppkafka-build ARG CPPKAFKA_VERSION -ADD https://api.github.com/repos/AriliaWireless/cppkafka/git/refs/tags/${CPPKAFKA_VERSION} version.json -RUN git clone https://github.com/AriliaWireless/cppkafka --branch ${CPPKAFKA_VERSION} /cppkafka +ADD https://api.github.com/repos/Telecominfraproject/wlan-cloud-lib-cppkafka/git/refs/tags/${CPPKAFKA_VERSION} version.json +RUN git clone https://github.com/Telecominfraproject/wlan-cloud-lib-cppkafka --branch ${CPPKAFKA_VERSION} /cppkafka WORKDIR /cppkafka RUN mkdir cmake-build @@ -45,8 +45,8 @@ FROM build-base AS valijson-build ARG VALIJASON_VERSION -ADD https://api.github.com/repos/AriliaWireless/valijson/git/refs/tags/${VALIJASON_VERSION} version.json -RUN git clone https://github.com/AriliaWireless/valijson --branch ${VALIJASON_VERSION} /valijson +ADD https://api.github.com/repos/Telecominfraproject/wlan-cloud-lib-valijson/git/refs/tags/${VALIJASON_VERSION} version.json +RUN git clone https://github.com/Telecominfraproject/wlan-cloud-lib-valijson --branch ${VALIJASON_VERSION} /valijson WORKDIR /valijson RUN mkdir cmake-build