From: Bastian Dehn <hhaalo@arcor.de>
Date: Wed, 22 Apr 2026 19:32:35 +0000 (+0200)
Subject: add extra version for builds
X-Git-Tag: v1.1.28^2~14
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=8362a26abe7cb4e25f2ab53c41e304d478a5f288;p=sane-kds-s2000w-net.git

add extra version for builds
---

diff --git a/builder/build-in-container b/builder/build-in-container
index 2d9cd88..7a5d52e 100755
--- a/builder/build-in-container
+++ b/builder/build-in-container
@@ -7,13 +7,20 @@ main()
 	mkdir -p build
 	cp builder/run build/
 
-	local codename=
-	local distro=
 	for distro in $distros; do
-		codename=${distro##*:}
-		cat $scriptpath/Containerfile.template | sed "s/\$distro/$distro/" > build/Containerfile-$codename
-		podman build -f build/Containerfile-$codename -t sane-kds-s2000w-net-builder-$codename
-		podman run -v ./:/source --rm sane-kds-s2000w-net-builder-$codename || return $?
+		local distro_postfix=${distro/:/-}
+		cat $scriptpath/Containerfile.template \
+			| sed "s/\$distro/$distro/" \
+			> build/Containerfile-$distro_postfix
+		podman build \
+			-f build/Containerfile-$distro_postfix \
+			-t sane-kds-s2000w-net-builder-$distro_postfix
+		podman run \
+			--rm \
+			-v ./:/source \
+			-e EXTRA_VERSION=$distro_postfix \
+			sane-kds-s2000w-net-builder-$distro_postfix \
+			|| return $?
 	done
 }
 
diff --git a/builder/run b/builder/run
index 3be3391..9357f65 100644
--- a/builder/run
+++ b/builder/run
@@ -50,7 +50,7 @@ build_package()
 	cd /app-build \
 		|| errlog "could not change directory to /app-build" \
 		|| return $?
-	cmake -DEXTRA_VERSION="-$VERSION_CODENAME" \
+	cmake -DEXTRA_VERSION="-$EXTRA_VERSION" \
 		-DCMAKE_BUILD_TYPE=Release /source \
 		|| errlog "could not create build with cmake" \
 		|| return $?
@@ -65,7 +65,7 @@ build_package()
 	cd /app-imagemagick-build \
 		|| errlog "could not change directory to /app-imagemagick-build " \
 		|| return $?
-	cmake -DEXTRA_VERSION="-imagemagick-$VERSION_CODENAME" \
+	cmake -DEXTRA_VERSION="-imagemagick-$EXTRA_VERSION" \
 		-DCMAKE_BUILD_TYPE=Release -DIMAGEMAGICK=ON /source \
 		|| errlog "could not create build with cmake" \
 		|| return $?
@@ -77,15 +77,15 @@ build_package()
 
 copy_package()
 {
-	mkdir -p /source/build-$VERSION_CODENAME \
-		|| errlog "could not create directory /source/build-$VERSION_CODENAME" \
+	mkdir -p /source/build-$EXTRA_VERSION \
+		|| errlog "could not create directory /source/build-$EXTRA_VERSION" \
 		|| return $?
 	echo "ℹ️ INFO: copy package"
-	cp /app-build/*.deb /source/build-$VERSION_CODENAME \
-		|| errlog "could not copy package to /source/build-$VERSION_CODENAME" \
+	cp /app-build/*.deb /source/build-$EXTRA_VERSION \
+		|| errlog "could not copy package to /source/build-$EXTRA_VERSION" \
 		|| return $?
-	cp /app-imagemagick-build/*.deb /source/build-$VERSION_CODENAME \
-		|| errlog "could not copy package to /source/build-$VERSION_CODENAME" \
+	cp /app-imagemagick-build/*.deb /source/build-$EXTRA_VERSION \
+		|| errlog "could not copy package to /source/build-$EXTRA_VERSION" \
 		|| return $?
 }
 
@@ -93,9 +93,6 @@ main()
 {
 	echo "⭐ START: run"
 
-	source /etc/os-release \
-		|| errlog "could not load /etc/os-release" \
-		|| return $?
 	run_tests || return $?
 	build_package || return $?
 	copy_package || return $?