Use axparameter from native-sdk

AxisCommunications · Mar 19, 2024 · 5800aee · 5800aee
1 parent 3379f76
commit 5800aee
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -6,16 +6,10 @@ ARG DOCKER_COMPOSE_VERSION=v2.18.1
 ARG REPO=axisecp
 ARG ACAPARCH=armv7hf
 
-ARG VERSION=1.10
+ARG VERSION=1.13
 ARG UBUNTU_VERSION=22.04
 ARG NATIVE_SDK=acap-native-sdk
 
-ARG ACAP3_SDK_VERSION=3.5
-ARG ACAP3_UBUNTU_VERSION=20.04
-ARG ACAP3_SDK=acap-sdk
-
-FROM ${REPO}/${ACAP3_SDK}:${ACAP3_SDK_VERSION}-${ACAPARCH}-ubuntu${ACAP3_UBUNTU_VERSION} as acap-sdk
-
 FROM ${REPO}/${NATIVE_SDK}:${VERSION}-${ACAPARCH}-ubuntu${UBUNTU_VERSION} as build_image
 
 RUN <<EOF
@@ -93,13 +87,6 @@ ARG ACAPARCH
 ARG SLIRP4NETNS_VERSION=1.2.0
 ARG ROOTLESS_EXTRAS_VERSION=${DOCKER_VERSION}
 
-# Copy over axparameter from the acap-sdk
-COPY --from=acap-sdk /opt/axis/acapsdk/sysroots/${ACAPARCH}/usr/include/axsdk/ax_parameter /opt/axis/acapsdk/sysroots/${ACAPARCH}/usr/include/axsdk
-COPY --from=acap-sdk /opt/axis/acapsdk/sysroots/${ACAPARCH}/usr/lib/libaxparameter.so /opt/axis/acapsdk/sysroots/${ACAPARCH}/usr/lib/libaxparameter.so
-COPY --from=acap-sdk /opt/axis/acapsdk/sysroots/${ACAPARCH}/usr/lib/libaxparameter.so.1 /opt/axis/acapsdk/sysroots/${ACAPARCH}/usr/lib/libaxparameter.so.1
-COPY --from=acap-sdk /opt/axis/acapsdk/sysroots/${ACAPARCH}/usr/lib/libaxparameter.so.1.0 /opt/axis/acapsdk/sysroots/${ACAPARCH}/usr/lib/libaxparameter.so.1.0
-COPY --from=acap-sdk /opt/axis/acapsdk/sysroots/${ACAPARCH}/usr/lib/pkgconfig/axparameter.pc /opt/axis/acapsdk/sysroots/${ACAPARCH}/usr/lib/pkgconfig/axparameter.pc
-
 COPY app /opt/app
 COPY --from=ps /export/ps /opt/app
 COPY --from=nsenter /export/nsenter /opt/app

diff --git a/app/dockerdwrapperwithcompose.c b/app/dockerdwrapperwithcompose.c
@@ -15,7 +15,7 @@
  */
 
 #include <arpa/inet.h>
-#include <axsdk/ax_parameter.h>
+#include <axsdk/axparameter.h>
 #include <errno.h>
 #include <glib.h>
 #include <mntent.h>