From 128aa77b781bd7bcd60f2acfbf758325d4186aab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20=C3=96hrstr=C3=B6m?= Date: Sat, 14 Oct 2023 16:21:50 +0200 Subject: [PATCH] Add libxml2 dependency. --- docker/Dockerfile | 4 ++-- snap/snapcraft.yaml | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index a129dfa..40bd386 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,5 +1,5 @@ FROM multiarch/alpine:${TARGETARCH}${TARGETVARIANT}-latest-stable AS build -RUN apk add --no-cache alpine-sdk gcc linux-headers librtlsdr-dev cmake libusb-dev bash +RUN apk add --no-cache alpine-sdk gcc linux-headers librtlsdr-dev libxml2-dev cmake libusb-dev bash RUN git clone https://github.com/wmbusmeters/wmbusmeters.git && \ git clone https://github.com/weetmuts/rtl-wmbus.git && \ git clone https://github.com/merbanan/rtl_433.git @@ -12,7 +12,7 @@ RUN mkdir build && cd build && cmake ../ && make FROM multiarch/alpine:${TARGETARCH}${TARGETVARIANT}-latest-stable as scratch ENV QEMU_EXECVE=1 -RUN apk add --no-cache mosquitto-clients libstdc++ curl libusb rtl-sdr netcat-openbsd +RUN apk add --no-cache mosquitto-clients libstdc++ curl libusb rtl-sdr libxml2 netcat-openbsd WORKDIR /wmbusmeters COPY --from=build /wmbusmeters/build/wmbusmeters /wmbusmeters/wmbusmeters COPY --from=build /rtl-wmbus/build/rtl_wmbus /usr/bin/rtl_wmbus diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index f952f26..fe9e277 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -49,6 +49,7 @@ parts: - g++ - make - librtlsdr-dev + - libxml2-dev stage-packages: - mosquitto-clients - curl @@ -56,6 +57,7 @@ parts: - sysvinit-utils - libusb-1.0-0 - rtl-sdr + - libxml2 prime: - sbin/ - usr/bin/