From 2a365c07be07bad89b6344af176b21e373369241 Mon Sep 17 00:00:00 2001
From: vdutta <vivek.dutta@iopsys.eu>
Date: Mon, 4 Oct 2021 16:31:33 +0530
Subject: [PATCH] Align with iopsys 6.3 release
---
docker/code-analysis/Dockerfile | 10 +++++-----
static-code-analysis.yml | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/docker/code-analysis/Dockerfile b/docker/code-analysis/Dockerfile
index d5578c8..d540072 100644
--- a/docker/code-analysis/Dockerfile
+++ b/docker/code-analysis/Dockerfile
@@ -103,7 +103,7 @@ RUN \
cd /opt/dev && \
git clone git://git.openwrt.org/project/libubox.git && \
cd libubox && mkdir build && cd build && \
- git checkout b36a3a90098db64a46029355e308897c97fbe13d && \
+ git checkout b14c4688612c05c78ce984d7bde633bce8703b1e && \
cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE:String="Release" .. && \
make -j2 && \
make install
@@ -113,7 +113,7 @@ RUN \
cd /opt/dev && \
git clone git://git.openwrt.org/project/uci.git && \
cd uci && \
- git checkout 4b3db1179747b6a6779029407984bacef851325c && \
+ git checkout 52bbc99f69ea6f67b6fe264f424dac91bde5016c && \
cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE:String="Release" -DBUILD_LUA=OFF . && \
make -j2 && \
make install
@@ -123,7 +123,7 @@ RUN \
cd /opt/dev && \
git clone https://git.openwrt.org/project/ubus.git && \
cd ubus && \
- git checkout 2537be01858710e714c329153760c64fe3f8a73e && \
+ git checkout 4fc532c8a55ba8217ad67d7fd47c5eb9a8aba044 && \
cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE:String="Release" -DBUILD_LUA=OFF -DBUILD_EXAMPLES=OFF . && \
make -j2 && \
make install
@@ -133,7 +133,7 @@ RUN \
cd /opt/dev && \
git clone https://dev.iopsys.eu/fork/rpcd.git && \
cd rpcd && \
- git checkout 2af78699b70a8d6a6b562f9c37ef9aa51f9e2c1a && \
+ git checkout 52d280b20e00c9f80624e55cd37f6c68fb5e2389 && \
cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE:String="Release" -DIWINFO_SUPPORT=NO . && \
make -j2 && \
make install && \
@@ -217,7 +217,7 @@ RUN \
cd microxml && \
autoreconf -i; \
cd /opt/dev/microxml && \
- ./configure --prefix=/usr --enable-threads --enable-shared --enable-static && \
+ ./configure --prefix=/usr --disable-threads --enable-shared --enable-static && \
make && \
sudo make install && \
sudo ln -sf /usr/lib/libmicroxml.so.1.0 /lib/libmicroxml.so && \
diff --git a/static-code-analysis.yml b/static-code-analysis.yml
index b1cf10e..47cedb0 100644
--- a/static-code-analysis.yml
+++ b/static-code-analysis.yml
@@ -3,7 +3,7 @@ variables:
RUN_CPPCHECK: "cppcheck --enable=all --check-config --error-exitcode=1"
RUN_CPD: "/home/user/pmd-bin-6.19.0/bin/run.sh cpd --minimum-tokens 100 --language c --exclude ./test/cmocka --files"
SOURCE_FOLDER: "src"
- COMMON_IMAGE: "iopsys/code-analysis:0.9"
+ COMMON_IMAGE: "iopsys/code-analysis:latest"
DEBUG: "FALSE"
run_static_code_analysis:
--
GitLab