nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

align with upcoming upstream, switch to edge for newest gcc as used in alpine ci

Browse Source
This commit is contained in:
John
2023-12-30 17:34:23 +01:00
parent a5e315c9b0
commit 303ea9627d
4 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/alpine/APKBUILD
+3 -4
View File
@@ -1,5 +1,5 @@
# Contributor: Tim <timstanleydev@gmail.com> # Contributor: Tim <timstanleydev@gmail.com>
# Maintainer: Tim <timstanleydev@gmail.com> # Maintainer: John <ebusd@ebusd.eu>
pkgname=ebusd pkgname=ebusd
pkgver=23.3 pkgver=23.3
pkgrel=0 pkgrel=0
@@ -8,12 +8,11 @@ url="https://github.com/john30/ebusd"
# Upstream only supports these archs. # Upstream only supports these archs.
arch="x86 x86_64 aarch64 armhf armv7" arch="x86 x86_64 aarch64 armhf armv7"
license="GPL-3.0-only" license="GPL-3.0-only"
makedepends="cmake mosquitto-dev openssl-dev" makedepends="cmake mosquitto-dev openssl-dev samurai"
source="$pkgname-$pkgver.tar.gz::https://github.com/john30/${pkgname}/archive/refs/tags/${pkgver}.tar.gz" source="$pkgname-$pkgver.tar.gz::https://github.com/john30/${pkgname}/archive/refs/tags/${pkgver}.tar.gz"
build() { build() {
cmake -B build \ cmake -B build -G Ninja \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=MinSizeRel \ -DCMAKE_BUILD_TYPE=MinSizeRel \
-DBUILD_TESTING=ON -DBUILD_TESTING=ON
cmake --build build cmake --build build
contrib/alpine/APKBUILD.git
+3 -5
View File
@@ -1,6 +1,5 @@
# Maintainer: John <ebusd@ebusd.eu> # Maintainer: John <ebusd@ebusd.eu>
pkgname=ebusd-git pkgname=ebusd-git
_gitname=ebusd
pkgver=23.3 pkgver=23.3
pkgrel=0 pkgrel=0
pkgdesc="Daemon for communication with eBUS heating systems" pkgdesc="Daemon for communication with eBUS heating systems"
@@ -8,7 +7,7 @@ url="https://github.com/john30/ebusd"
# Upstream only supports these archs. # Upstream only supports these archs.
arch="x86 x86_64 aarch64 armhf armv7" arch="x86 x86_64 aarch64 armhf armv7"
license="GPL-3.0-only" license="GPL-3.0-only"
makedepends="cmake mosquitto-dev openssl-dev" makedepends="cmake mosquitto-dev openssl-dev samurai"
source="$pkgname-$pkgver.tar.gz::https://codeload.github.com/john30/${_gitname}/legacy.tar.gz/refs/heads/master" source="$pkgname-$pkgver.tar.gz::https://codeload.github.com/john30/${_gitname}/legacy.tar.gz/refs/heads/master"
unpack() { unpack() {
@@ -18,11 +17,10 @@ unpack() {
} }
build() { build() {
cmake -B build \ cmake -B build -G Ninja \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=MinSizeRel \ -DCMAKE_BUILD_TYPE=MinSizeRel \
-DBUILD_TESTING=ON \ -DBUILD_TESTING=ON \
"$srcdir" "$srcdir"
cmake --build build cmake --build build
} }
contrib/alpine/build-git.sh
+1 -1
View File
@@ -1,3 +1,3 @@
#!/bin/bash #!/bin/bash
# helper script to check the build from git master is fine # helper script to check the build from git master is fine
docker run -it --rm -v $PWD:/build -w /build/contrib/alpine alpine sh -c 'apk add --upgrade abuild && adduser -D test && addgroup test abuild && su test -c "abuild-keygen -a && mkdir git && cd git && cp ../APKBUILD.git APKBUILD && abuild -r checksum && abuild -r"' docker run -it --rm -v $PWD:/build -w /build/contrib/alpine alpine:edge sh -c 'apk add --upgrade abuild build-base && adduser -D test && addgroup test abuild && su test -c "abuild-keygen -a && mkdir git && cd git && cp ../APKBUILD.git APKBUILD && abuild -r checksum && abuild -r"'
contrib/alpine/build.sh
+1 -1
View File
@@ -1,3 +1,3 @@
#!/bin/bash #!/bin/bash
# helper script to check the release build is fine # helper script to check the release build is fine
docker run -it --rm -v $PWD:/build -w /build/contrib/alpine alpine sh -c 'apk add --upgrade abuild && adduser -D test && addgroup test abuild && su test -c "abuild-keygen -a && abuild -r"' docker run -it --rm -v $PWD:/build -w /build/contrib/alpine alpine:edge sh -c 'apk add --upgrade abuild build-base && adduser -D test && addgroup test abuild && su test -c "abuild-keygen -a && abuild -r"'