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 290e0294cc1bae8873c0c02ea5a49f280bd0d7e5..20f6b934607975bfc7a9e1d38c72e3fa3270c260 100644 (file)
--- 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 375f957103a38251026dbe7a171eb22b60f84a92..f44d010ca2eb6d089b518919fc2c4c787237a221 100644 (file)
--- 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 bfac62f98ded2f833ff4643a99a6b2f8923117c1..16874d7b68e9aceea1d760be2ad26e21edb17baf 100755 (executable)
--- 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: