From 303ea9627dd425c52dbb9f6ba8a7ded6b5046f37 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Dec 2023 17:34:23 +0100 Subject: [PATCH] align with upcoming upstream, switch to edge for newest gcc as used in alpine ci --- contrib/alpine/APKBUILD | 7 +++---- contrib/alpine/APKBUILD.git | 8 +++----- contrib/alpine/build-git.sh | 2 +- contrib/alpine/build.sh | 2 +- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/contrib/alpine/APKBUILD b/contrib/alpine/APKBUILD index e20f364f..bb1acb88 100644 --- a/contrib/alpine/APKBUILD +++ b/contrib/alpine/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Tim -# Maintainer: Tim +# Maintainer: John pkgname=ebusd pkgver=23.3 pkgrel=0 @@ -8,12 +8,11 @@ url="https://github.com/john30/ebusd" # Upstream only supports these archs. arch="x86 x86_64 aarch64 armhf armv7" 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" build() { - cmake -B build \ - -DCMAKE_INSTALL_PREFIX=/usr \ + cmake -B build -G Ninja \ -DCMAKE_BUILD_TYPE=MinSizeRel \ -DBUILD_TESTING=ON cmake --build build diff --git a/contrib/alpine/APKBUILD.git b/contrib/alpine/APKBUILD.git index 58f21f83..48711351 100644 --- a/contrib/alpine/APKBUILD.git +++ b/contrib/alpine/APKBUILD.git @@ -1,6 +1,5 @@ # Maintainer: John pkgname=ebusd-git -_gitname=ebusd pkgver=23.3 pkgrel=0 pkgdesc="Daemon for communication with eBUS heating systems" @@ -8,7 +7,7 @@ url="https://github.com/john30/ebusd" # Upstream only supports these archs. arch="x86 x86_64 aarch64 armhf armv7" 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" unpack() { @@ -18,11 +17,10 @@ unpack() { } build() { - cmake -B build \ - -DCMAKE_INSTALL_PREFIX=/usr \ + cmake -B build -G Ninja \ -DCMAKE_BUILD_TYPE=MinSizeRel \ -DBUILD_TESTING=ON \ - "$srcdir" + "$srcdir" cmake --build build } diff --git a/contrib/alpine/build-git.sh b/contrib/alpine/build-git.sh index bb09aaf7..ade6166a 100644 --- a/contrib/alpine/build-git.sh +++ b/contrib/alpine/build-git.sh @@ -1,3 +1,3 @@ #!/bin/bash # 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"' \ No newline at end of file +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"' \ No newline at end of file diff --git a/contrib/alpine/build.sh b/contrib/alpine/build.sh index 068b92e5..83e37415 100644 --- a/contrib/alpine/build.sh +++ b/contrib/alpine/build.sh @@ -1,3 +1,3 @@ #!/bin/bash # 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"' \ No newline at end of file +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"' \ No newline at end of file