From 03d09391015f12909a2520a2dc56c9c2fcc56ea6 Mon Sep 17 00:00:00 2001 From: txtsd Date: Thu, 31 Oct 2024 18:36:31 +0530 Subject: [PATCH] chore: Try using libnl3-static from alpine Signed-off-by: txtsd --- .github/scripts/build.sh | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/.github/scripts/build.sh b/.github/scripts/build.sh index 342c1d5..c09df0e 100755 --- a/.github/scripts/build.sh +++ b/.github/scripts/build.sh @@ -3,32 +3,9 @@ set -x # General updates apk update -apk add cmake openssl openssl-dev openssl-libs-static linux-headers ninja-is-really-ninja alpine-sdk runuser sudo sed - -# Setup build environment -addgroup $(whoami) abuild -mkdir -p /var/cache/distfiles -chmod a+w /var/cache/distfiles -chgrp abuild /var/cache/distfiles -chmod g+w /var/cache/distfiles -cwd=$(pwd) - -# Create user to run abuild -adduser -G abuild -g "Alpine Package Builder" -s /bin/ash -D abuilder -echo "abuilder ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers - -# Build static libnl3 -runuser -u abuilder -- /usr/bin/abuild-keygen -n -a -i -b 4096 -cd /home/abuilder -runuser -u abuilder -- git clone https://gitlab.alpinelinux.org/alpine/aports.git --depth 1 -cd /home/abuilder/aports/main/libnl3 -# runuser -u abuilder -- /bin/sed -i "s/subpackages=\"/subpackages=\"\$pkgname-static /" APKBUILD -runuser -u abuilder -- /bin/sed -i "s/--disable-static/--enable-static/" APKBUILD -runuser -u abuilder -- /usr/bin/abuild -r -apk add /home/abuilder/packages/main/$(abuild -A)/libnl3* +apk add cmake openssl openssl-dev openssl-libs-static linux-headers ninja-is-really-ninja alpine-sdk runuser sudo sed libnl3-static libnl3-dev # Build static DPITunnel -cd ${cwd} -cmake -B build -DCMAKE_BUILD_TYPE=RELEASE -DSTATIC_BINARY=true -G Ninja . +cmake -S . -B build -DCMAKE_BUILD_TYPE=RELEASE -DSTATIC_BINARY=true -G Ninja cmake --build build