From 314459310aa22615cbd9751c4dd56e1244287a46 Mon Sep 17 00:00:00 2001 From: Maxim Devaev Date: Thu, 20 Apr 2023 19:30:16 +0300 Subject: [PATCH] testenv: libgpiod from the repo --- testenv/Dockerfile | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/testenv/Dockerfile b/testenv/Dockerfile index 6e07f4e3..452015f8 100644 --- a/testenv/Dockerfile +++ b/testenv/Dockerfile @@ -60,6 +60,7 @@ RUN pacman --noconfirm --ask=4 -Syy \ python-hidapi \ python-ldap \ python-zstandard \ + libgpiod \ freetype2 \ nginx-mainline \ tesseract \ @@ -84,18 +85,6 @@ RUN npm install htmlhint -g \ && npm install @babel/eslint-parser -g WORKDIR / -ARG LIBGPIOD_VERSION -ENV LIBGPIOD_PKG libgpiod-$LIBGPIOD_VERSION -RUN curl \ - -o $LIBGPIOD_PKG.tar.gz \ - https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/$LIBGPIOD_PKG.tar.gz \ - && tar -xzvf $LIBGPIOD_PKG.tar.gz \ - && cd $LIBGPIOD_PKG \ - && ./autogen.sh --prefix=/usr --enable-tools=yes --enable-bindings-python \ - && make PREFIX=/usr install \ - && cd - \ - && rm -rf $LIBGPIOD_PKG{,.tar.gz} - ARG USTREAMER_MIN_VERSION ENV USTREAMER_MIN_VERSION $USTREAMER_MIN_VERSION RUN echo $USTREAMER_MIN_VERSION @@ -107,7 +96,7 @@ RUN git clone https://github.com/pikvm/ustreamer \ RUN mkdir -p \ /etc/kvmd/{nginx,vnc} \ - /var/lib/kvmd/msd/{images,meta} \ + /var/lib/kvmd/msd \ /var/lib/kvmd/pst/data \ /opt/vc/bin