From 54a893091866bfb5a3efd8cd88bf6df434c4b1dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20=C3=96hrstr=C3=B6m?= Date: Sun, 11 Feb 2024 23:27:52 +0100 Subject: [PATCH] Add necessary libxslt deps. --- .github/workflows/build_debian.yml | 2 +- .github/workflows/build_ubuntu.yml | 2 +- deb/copyright | 26 ++++++++++++++++++++------ docker/Dockerfile | 4 ++-- scripts/collect_copyrights.sh | 6 +++--- snap/snapcraft.yaml | 2 ++ 6 files changed, 29 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build_debian.yml b/.github/workflows/build_debian.yml index 587efc3..e2e0083 100644 --- a/.github/workflows/build_debian.yml +++ b/.github/workflows/build_debian.yml @@ -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 diff --git a/.github/workflows/build_ubuntu.yml b/.github/workflows/build_ubuntu.yml index 02991e1..ef05e3e 100644 --- a/.github/workflows/build_ubuntu.yml +++ b/.github/workflows/build_ubuntu.yml @@ -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 diff --git a/deb/copyright b/deb/copyright index c7ad10e..c217977 100644 --- a/deb/copyright +++ b/deb/copyright @@ -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. diff --git a/docker/Dockerfile b/docker/Dockerfile index 9ca3e1d..62cf357 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -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 diff --git a/scripts/collect_copyrights.sh b/scripts/collect_copyrights.sh index 51a6534..1178c1a 100755 --- a/scripts/collect_copyrights.sh +++ b/scripts/collect_copyrights.sh @@ -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 diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index fe9e277..96294d0 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -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/