[PATCH] gnumach: debian/rules: Add custom keyword to custom built packages and uname -v
Hello,
As talked about on IRC, it would be nice to add the custom keyword to the kernel
version for custom built kernels. The attached patch fixes this and also add the
keyword to the built Debian packages as well as shorten the gnumach-image
package names containing the kernel a little.
Thanks!
--- a/debian/rules.orig 2016-03-11 23:03:06.000000000 +0100
+++ b/debian/rules 2016-04-20 16:07:25.000000000 +0200
@@ -14,7 +14,16 @@
DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
ifneq (,$(filter custom,$(DEB_BUILD_OPTIONS)))
-VERSION := $(NOEPOCH_VERSION)
+VERSION := $(NOGIT_VERSION).custom
+SFX1=.custom-486
+SFX2=.custom-xen-486
+SFX3=.custom-486-dbg
+SFX4=.custom-xen-486-dbg
+else
+SFX1=-486
+SFX2=-xen-486
+SFX3=-486-dbg
+SFX4=-xen-486-dbg
endif
MACHINE := 486
@@ -81,7 +90,8 @@
dh_testdir
-mkdir build
- cd build && PACKAGE_VERSION_SUFFIX=-486 ../configure $(drivers) \
+ cd build && PACKAGE_VERSION_SUFFIX="$(SFX1)" ../configure \
+ $(drivers) \
CFLAGS="$(CFLAGS)" \
$(common_configure)
@@ -89,7 +99,7 @@
dh_testdir
-mkdir build-xen
- cd build-xen && PACKAGE_VERSION_SUFFIX=-xen-486 ../configure \
+ cd build-xen && PACKAGE_VERSION_SUFFIX="$(SFX2)" ../configure \
CFLAGS="$(CFLAGS)" \
$(common_configure) \
--enable-platform=xen
@@ -98,14 +108,16 @@
dh_testdir
-mkdir build-dbg
- cd build-dbg && PACKAGE_VERSION_SUFFIX=-486-dbg ../configure --enable-kdb $(drivers) \
- $(common_configure) \
+ cd build-dbg && PACKAGE_VERSION_SUFFIX="$(SFX3)" ../configure \
+ --enable-kdb $(drivers) \
+ $(common_configure)
build-xen-dbg/config.status: configure
dh_testdir
-mkdir build-xen-dbg
- cd build-xen-dbg && PACKAGE_VERSION_SUFFIX=-xen-486-dbg ../configure --enable-kdb \
+ cd build-xen-dbg && PACKAGE_VERSION_SUFFIX="$(SFX4)" ../configure \
+ --enable-kdb \
$(common_configure) \
--enable-platform=xen
Reply to: