From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 25 Jan 2025 18:22:32 +0000 (+0000)
Subject: jenkins: Try to include the build ID in Pakfire's version
X-Git-Tag: 0.9.30~374
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a486c507c0a4a507fcce6808a4a24bd2a32bee5;p=pakfire.git

jenkins: Try to include the build ID in Pakfire's version

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/Makefile.am b/Makefile.am
index 290e0294..20f6b934 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1134,7 +1134,6 @@ dist_configsdistros_DATA = \
 
 substitutions = \
        '|PACKAGE_NAME=$(PACKAGE_NAME)|' \
-       '|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \
        '|bindir=$(bindir)|' \
        '|libexecdir=$(libexecdir)|' \
        '|sysconfdir=$(sysconfdir)|'
diff --git a/configure.ac b/configure.ac
index 375f9571..f44d010c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,6 +81,17 @@ AS_IF([test "x$enable_online_tests" = "xyes"], [
 	AC_DEFINE(ENABLE_ONLINE_TESTS, [1], [Online Tests])
 ])
 
+# Release
+
+AC_ARG_WITH([release],
+	[AS_HELP_STRING([--with-release=STRING], [Set the package release (default: empty)])],
+	[PACKAGE_RELEASE=$withval], [PACKAGE_RELEASE=""])
+
+AC_DEFINE_UNQUOTED(
+	[PACKAGE_VERSION],
+	["$PACKAGE_VERSION$PACKAGE_RELEASE"],
+	[The package version string])
+
 # Man Pages
 
 have_man_pages=no
diff --git a/debian/rules b/debian/rules
index bfac62f9..16874d7b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,8 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 # Enable debug code
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-debug --disable-static
+	dh_auto_configure -- --enable-debug --disable-static \
+		$(if $(BUILD_ID),--with-release=".build-$(BUILD_ID)")
 
 # Ignore if the testsuite fails
 override_dh_auto_test: