harmonize dev and master

docker/code-analysis/Dockerfile

@@ -26,7 +26,6 @@ RUN \
       wget \
       iputils-ping \
       lcov \
-      libtool \
       pkg-config \
       net-tools \
       strace \
@@ -40,9 +39,7 @@ RUN \
       python3-setuptools \
       default-jre \
       cppcheck \
-      flawfinder \
-      libcurl4-openssl-dev
-
+      flawfinder
 # Install dependent libraries
 RUN \
       apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
@@ -53,13 +50,22 @@ RUN \
       cmocka-doc \
       libcmocka-dev \
       libcmocka0 \
+      libcurl4-openssl-dev\
       libnl-3-dev \
       libnl-genl-3-dev \
       libssl-dev \
       libnl-route-3-dev \
       libnfnetlink-dev \
+      libtool \
       libtrace-dev \
-      zlib1g-dev
+      zlib1g-dev  \
+      # Install dependencies for obuspa
+      sqlite3 \
+      libsqlite3-dev \
+      libc-ares-dev \
+      libz-dev \
+      # Install dependencies for ieee1905
+      libpcap-dev
 
 # Remove cached packages.
 RUN rm -rf /var/lib/apt/lists/*
@@ -81,7 +87,6 @@ RUN npm --version
 # install tap-junit
 RUN npm i -g tap-junit
 
-
 # Install JSON-C
 RUN \
       cd /opt/dev && \
@@ -125,9 +130,9 @@ RUN \
 # rpcd
 RUN \
       cd /opt/dev && \
-      git clone https://git.openwrt.org/project/rpcd.git && \
+      git clone https://dev.iopsys.eu/fork/rpcd.git && \
       cd rpcd && \
-      git checkout cfe1e75c91bc1bac82e6caab3e652b0ebee59524 && \
+      git checkout 476af9d9e292aadc43721af8e4288036de268d0c && \
       cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE:String="Release" -DIWINFO_SUPPORT=NO . && \
       make -j2 && \
       make install && \
@@ -205,28 +210,6 @@ RUN \
       wget https://github.com/pmd/pmd/releases/download/pmd_releases%2F6.19.0/pmd-bin-6.19.0.zip && \
       unzip pmd-bin-6.19.0.zip
 
-# libwifi and libdsl
-RUN \
-      cd /opt/dev && \
-      rm -fr easy-soc-libs && \
-      git clone https://dev.iopsys.eu/iopsys/easy-soc-libs.git && \
-      cd easy-soc-libs && \
-      git checkout 7dba6ddc13015f85dd7cc17fc36647fa207269eb && \
-      cd libeasy && \
-      make CFLAGS+="-I/usr/include/libnl3" && \
-      mkdir -p /usr/include/easy && \
-      cp easy.h event.h utils.h /usr/include/easy && \
-      cp -a libeasy*.so* /usr/lib && \
-      cd ../libwifi && \
-      make PLATFORM=TEST && \
-      cp wifi.h /usr/include && \
-      cp -a libwifi-5.so* /usr/lib && \
-      cd ../libdsl && \
-      make PLATFORM=TEST && \
-      cp common.h xdsl.h xtm.h /usr/include && \
-      cp -a libdsl*.so* /usr/lib && \
-      sudo ldconfig
-
 # libwebsockets
 RUN \
      cd /opt/dev && \
@@ -240,7 +223,6 @@ RUN \
      sudo make install && \
      sudo ldconfig
 
-
 # microxml
 RUN \
 	cd /opt/dev && \
@@ -254,41 +236,6 @@ RUN \
 	sudo ln -sf /usr/lib/libmicroxml.so.1.0 /lib/libmicroxml.so && \
 	sudo ln -sf /usr/lib/libmicroxml.so.1.0 /lib/libmicroxml.so.1
 
-#bbf	
-RUN \
-	cd /opt/dev && \
-	git clone https://dev.iopsys.eu/iopsys/bbf.git &&\ 
-	cd /opt/dev/bbf && \
-	autoreconf -i && \
-	./configure --enable-tr181 --enable-tr104 --enable-tr143 --enable-tr157 CPPFLAGS=-DCUSTOM_PREFIX=\\\"X_IOPSYS_EU_\\\" && \
-	make && \
-	cp bin/.libs/libbbfdm.so* /usr/lib/ && \
-	cp bin/.libs/libbbf_api.so* /usr/lib/ && \
-	mkdir /usr/include/libbbfdm && \
-	mkdir /usr/include/libbbf_api && \
-	cp *.h /usr/include/libbbfdm/ && \
-	cp dmtree/tr181/*.h /usr/include/libbbfdm/ && \
-	cp dmtree/tr157/*.h /usr/include/libbbfdm/ && \
-	cp libbbf_api/*.h /usr/include/libbbf_api/
-
-# Install dependencies for obuspa
-RUN \
-      apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
-      sqlite3 \
-      libssl-dev \
-      libcurl4-openssl-dev \
-      libsqlite3-dev \
-      libc-ares-dev \
-      libz-dev \
-      autoconf \
-      automake \
-      libtool
-
-# Install dependencies for ieee1905
-RUN \
-      apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
-      libpcap-dev
-
 WORKDIR /builds/iopsys/
 
 # Prepare supervisor