Add necessary libxslt deps.

pull/1167/head
Fredrik Öhrström 2024-02-11 23:27:52 +01:00
rodzic f446efa11d
commit 54a8930918
6 zmienionych plików z 29 dodań i 13 usunięć

Wyświetl plik

@ -12,7 +12,7 @@ jobs:
run: |
sudo apt install -y eatmydata
sudo eatmydata apt install -y devscripts debhelper
sudo eatmydata apt build-dep -y . || sudo eatmydata apt install -y librtlsdr-dev adduser
sudo eatmydata apt build-dep -y . || sudo eatmydata apt install -y librtlsdr-dev libxml2-dev libxslt1-dev adduser
- id: PREPARE_SOURCE
run: |
ln -s deb debian

Wyświetl plik

@ -11,7 +11,7 @@ jobs:
- id: INSTALL_ADDITIONAL_BUILD_DEPENDENCIES
run: |
sudo apt install -y eatmydata
sudo eatmydata apt-get install librtlsdr-dev libusb-dev
sudo eatmydata apt-get install librtlsdr-dev libusb-dev libxml2-dev libxslt1-dev
- id: CONFIGURE
run: eatmydata ./configure
- id: MAKE

Wyświetl plik

@ -35,11 +35,6 @@ Copyright: 2023 Fredrik Öhrström
2021 Vincent Privat
License: GPL-3+
Files: src/driver_iperl.cc
Copyright: 2022 Fredrik Öhrström
2018 David Mallon
License: GPL-3+
Files: src/driver_izar.cc
Copyright: 2019 Jacek Tomasiak
2023 Fredrik Öhrström
@ -54,7 +49,7 @@ License: GPL-3+
Files: src/driver_minomess.cc
Copyright: 2021 Olli Salonen
2022 Fredrik Öhrström
2023 Fredrik Öhrström
License: GPL-3+
Files: src/driver_sensostar.cc
@ -106,6 +101,25 @@ License: GPL-3+
On Debian systems, the complete text of the GNU General Public License
version 3 can be found in file "/usr/share/common-licenses/GPL-3".
License: MIT
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
License: CC0
The authors, and therefore would be copyright holders, have as much
as possible relinguished their copyright to the public domain.

Wyświetl plik

@ -1,5 +1,5 @@
FROM asymworks/multiarch-alpine:${TARGETARCH}${TARGETVARIANT}-latest-stable AS build
RUN apk add --no-cache alpine-sdk gcc linux-headers librtlsdr-dev libxml2-dev cmake libusb-dev bash
RUN apk add --no-cache alpine-sdk gcc linux-headers librtlsdr-dev libxml2-dev libxslt1-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 asymworks/multiarch-alpine:${TARGETARCH}${TARGETVARIANT}-latest-stable as scratch
ENV QEMU_EXECVE=1
RUN apk add --no-cache mosquitto-clients libstdc++ curl libusb rtl-sdr libxml2 netcat-openbsd
RUN apk add --no-cache mosquitto-clients libstdc++ curl libusb rtl-sdr libxml2 libxslt1 netcat-openbsd
WORKDIR /wmbusmeters
COPY --from=build /wmbusmeters/build/wmbusmeters /wmbusmeters/wmbusmeters
COPY --from=build /rtl-wmbus/build/rtl_wmbus /usr/bin/rtl_wmbus

Wyświetl plik

@ -41,12 +41,12 @@ do
if grep -q -i "gpl-3.0-or-later" $f
then
license="GPL-3+"
elif grep -q -i "MIT" $f
then
license="MIT"
elif grep -q -i "CC0" $f
then
license="CC0"
elif grep -q -i "MIT" $f
then
license="MIT"
else
echo "Unknown license in file: "+$f
exit 1

Wyświetl plik

@ -50,6 +50,7 @@ parts:
- make
- librtlsdr-dev
- libxml2-dev
- libxslt1-dev
stage-packages:
- mosquitto-clients
- curl
@ -58,6 +59,7 @@ parts:
- libusb-1.0-0
- rtl-sdr
- libxml2
- libxslt1
prime:
- sbin/
- usr/bin/