From 012e4ab5c77726bf83896fc4e83f773474e77bf3 Mon Sep 17 00:00:00 2001 From: Jo Date: Sun, 10 Mar 2024 16:24:47 +0100 Subject: [PATCH] Added documentation, fixed attaching to the release --- .github/workflows/debuild.yml | 3 +++ README.md | 19 +++++++++++++------ debian/changelog | 7 +++++++ 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/.github/workflows/debuild.yml b/.github/workflows/debuild.yml index ec64d29..7c2447b 100644 --- a/.github/workflows/debuild.yml +++ b/.github/workflows/debuild.yml @@ -149,6 +149,9 @@ jobs: if [[ "${{ matrix.distribution }}" != trixie ]]; then exit fi + if [ "${{ matrix.architecture }}" == armhf ] && [ "${{ matrix.os }}" == debian ]; then + exit + fi assets=() for asset in $PBRT/result/libsml*_${{ matrix.architecture }}.{deb,changes,buildinfo}; do assets+=("-a" "$asset") diff --git a/README.md b/README.md index a1cfb52..eb22d57 100644 --- a/README.md +++ b/README.md @@ -22,14 +22,19 @@ Ubuntu The resulting binaries are located in sml/lib -#### Debian Packages +#### Debian and Raspbian Packages [![Hosted By: Cloudsmith](https://img.shields.io/badge/OSS%20hosting%20by-cloudsmith-blue?logo=cloudsmith&style=flat-square)](https://cloudsmith.com) -We now build Debian packages for amd64, armhf and arm64 as part of our releases. -The ones attached to the release are meant for trixie. These and packages for -bookworm and bullseye are also provided through a repository graciously provided by -[Cloudsmith](https://cloudsmith.com). +We now build Debian packages for amd64, armhf and arm64 and Raspbian packages +for armhf as part of our releases. Unfortunately Debian armhf packages do not +run on Raspberry Pi 1 although the architecture on the RPi is named armhf. +Using Raspian armhf packages fixes that. + +The ones attached to the release are meant for trixie. In case of the armhf +architecture the attached package is build for Raspbian. These and packages for +bookworm and bullseye are also provided through a repository graciously provided +by [Cloudsmith](https://cloudsmith.com). The setup of the repository is also [explained by Cloudsmith](https://cloudsmith.io/~volkszaehler/repos/volkszaehler-org-project/setup/#formats-deb). @@ -38,7 +43,9 @@ This boils down to adding a file to /etc/apt/sources.list.d/ containing deb [signed-by=/usr/share/keyrings/volkszaehler-volkszaehler-org-project-archive-keyring.gpg] https://dl.cloudsmith.io/public/volkszaehler/volkszaehler-org-project/deb/debian bookworm main deb-src [signed-by=/usr/share/keyrings/volkszaehler-volkszaehler-org-project-archive-keyring.gpg] https://dl.cloudsmith.io/public/volkszaehler/volkszaehler-org-project/deb/debian bookworm main ``` -(replace bookworm with your current distro) and retrieving the key as a trusted one +You need to replace bookworm with your distro and debian with raspbian in case +you are using an RPi 1. You also need to retrieve our repository key as a +trusted one. ``` curl -1sLf "https://dl.cloudsmith.io/public/volkszaehler/volkszaehler-org-project/gpg.21DBDAC56DF44DA1.key" | \ gpg --dearmor > /usr/share/keyrings/volkszaehler-volkszaehler-org-project-archive-keyring.gpg diff --git a/debian/changelog b/debian/changelog index 7f4a0a8..ac70c65 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libsml (1.1.3) unstable; urgency=medium + + * Added build for Raspbian. + * Removed armel architecture. + + -- Joachim Zobel Sun, 10 Mar 2024 15:59:59 +0100 + libsml (1.1.2) unstable; urgency=medium * Added the libsml-utils package for sml_server