From cd9fdc7a913e6082deae841cf0ccd04b57a80dd7 Mon Sep 17 00:00:00 2001 From: Carsten Schafer Date: Tue, 19 Mar 2024 16:41:58 -0400 Subject: [PATCH] WIFI-12939: change to TIP repos for libraries Signed-off-by: Carsten Schafer --- BUILDING.md | 32 ++++++++++++++++++-------------- Dockerfile | 13 +++++++------ 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/BUILDING.md b/BUILDING.md index 4afa362..b15bbd8 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -1,5 +1,5 @@ # Building from source -In order to build the OWPROV, you will need to install its dependencies, which includes the following: +In order to build OWPROV, you will need to install its dependencies, which includes the following: - cmake - boost - POCO 1.10.1 or later @@ -12,19 +12,19 @@ In order to build the OWPROV, you will need to install its dependencies, which i 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 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 cd ~ -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 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 @@ -50,7 +50,8 @@ cmake .. cmake --build . --config Release sudo cmake --build . --target install -git clone https://github.com/fmtlib/fmt --branch 9.0.0 /fmtlib +cd ~ +git clone https://github.com/fmtlib/fmt --branch 9.0.0 fmtlib cd fmtlib mkdir cmake-build cd cmake-build @@ -71,11 +72,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 poco cd poco mkdir cmake-build cd cmake-build @@ -83,7 +84,8 @@ cmake .. cmake --build . --config Release sudo cmake --build . --target install -git clone https://github.com/AriliaWireless/cppkafka --branch tip-v1 +cd ~ +git clone https://github.com/Telecominfraproject/wlan-cloud-lib-cppkafka --branch tip-v1 cppkafka cd cppkafka mkdir cmake-build cd cmake-build @@ -92,7 +94,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 @@ -125,7 +127,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 poco pushd poco mkdir cmake-build push cmake-build @@ -135,7 +137,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,7 +147,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 valijson cd valijson mkdir cmake-build cd cmake-build @@ -172,6 +174,8 @@ 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 + +cd ~ git clone https://github.com/stephb9959/poco cd poco mkdir cmake-build diff --git a/Dockerfile b/Dockerfile index 29ecb98..c17a2dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,8 +15,9 @@ 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 @@ -29,8 +30,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 @@ -43,8 +44,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