[Debian-ha-maintainers] Bug#679460: drbd8 - Fails to build two times in a row

[Bastian Blank]

On Thu, Jun 28, 2012 at 10:50:34PM +0200, Bastian Blank wrote:
> drbd8 fails to build two times in a row. The clean target does not
> unmake modifications:

I uploaded the pending NMU including a fix for this problem. Attached is
the complete patch.

Bastian

-- 
Each kiss is as the first.
		-- Miramanee, Kirk's wife, "The Paradise Syndrome",
		   stardate 4842.6
-------------- next part --------------
diff -Nru drbd8-8.3.13/debian/changelog drbd8-8.3.13/debian/changelog
--- drbd8-8.3.13/debian/changelog	2012-06-15 20:35:07.000000000 +0200
+++ drbd8-8.3.13/debian/changelog	2012-06-28 23:07:05.000000000 +0200
@@ -1,3 +1,13 @@
+drbd8 (2:8.3.13-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix name of udev rules file. (closes: #679266)
+  * Disable module version warning for sublevel missmatch.
+    (closes: #659353)
+  * Disable regeneration of buildtags file. (closes: #679460)
+
+ -- Bastian Blank <waldi at debian.org>  Thu, 28 Jun 2012 21:07:04 +0000
+
 drbd8 (2:8.3.13-1) unstable; urgency=low
 
   * Update to latest version for Linux 3.2.0
diff -Nru drbd8-8.3.13/debian/patches/disable-buildtags drbd8-8.3.13/debian/patches/disable-buildtags
--- drbd8-8.3.13/debian/patches/disable-buildtags	1970-01-01 01:00:00.000000000 +0100
+++ drbd8-8.3.13/debian/patches/disable-buildtags	2012-06-28 23:00:43.000000000 +0200
@@ -0,0 +1,25 @@
+Description: Disable regeneration of buildtags file
+Author: Bastian Blank <waldi at debian.org>
+Bug-Debian: http://bugs.debian.org/679460
+
+---
+--- a/drbd/Makefile
++++ b/drbd/Makefile
+@@ -106,8 +106,6 @@
+ 		false;\
+ 	fi
+ 
+-.PHONY: drbd_buildtag.c
+-
+   drbd_buildtag.c:
+ 	@set -e; exec > $@.new;							\
+ 	echo -e "/* automatically generated. DO NOT EDIT. */";			\
+@@ -132,7 +130,7 @@
+ 	echo -e "\t\t\" build by $$USER@$$HOSTNAME, `date "+%F %T"`\";\n}";	\
+ 	mv --force $@.new $@
+ 
+-  kbuild: drbd_buildtag.c
++  kbuild:
+ 	@rm -f .drbd_kernelrelease*
+ 	-test -f ../scripts/adjust_drbd_config_h.sh && \
+ 		KDIR=$(KDIR) O=$(O) $(SHELL) ../scripts/adjust_drbd_config_h.sh
diff -Nru drbd8-8.3.13/debian/patches/disable-version-warning drbd8-8.3.13/debian/patches/disable-version-warning
--- drbd8-8.3.13/debian/patches/disable-version-warning	1970-01-01 01:00:00.000000000 +0100
+++ drbd8-8.3.13/debian/patches/disable-version-warning	2012-06-27 15:31:05.000000000 +0200
@@ -0,0 +1,16 @@
+Description: Disable module version warning for sublevel missmatch
+Author: Bastian Blank <waldi at debian.org>
+Bug-Debian: http://bugs.debian.org/659353
+
+---
+--- drbd8-8.3.13.orig/user/drbdadm_usage_cnt.c
++++ drbd8-8.3.13/user/drbdadm_usage_cnt.c
+@@ -264,7 +264,7 @@ void warn_on_version_mismatch(void)
+ 	else if (cmp & 0xff00)		/* userland is newer minor version */
+ 		msg = "please don't mix different DRBD series.";
+ 	else		/* userland is newer, but only differ in sublevel. */
+-		msg = "preferably kernel and userland versions should match.";
++		return;
+ 
+ 	fprintf(stderr, "DRBD module version: %u.%u.%u\n"
+ 			"   userland version: %u.%u.%u\n%s\n",
diff -Nru drbd8-8.3.13/debian/patches/series drbd8-8.3.13/debian/patches/series
--- drbd8-8.3.13/debian/patches/series	2012-06-15 20:37:35.000000000 +0200
+++ drbd8-8.3.13/debian/patches/series	2012-06-28 22:57:57.000000000 +0200
@@ -1,2 +1,5 @@
 0001-init-interactive-debian-613654.patch
 0002-dpkg-statoverride-instead-of-chgrp-chmod.patch
+udev-rules-name
+disable-version-warning
+disable-buildtags
diff -Nru drbd8-8.3.13/debian/patches/udev-rules-name drbd8-8.3.13/debian/patches/udev-rules-name
--- drbd8-8.3.13/debian/patches/udev-rules-name	1970-01-01 01:00:00.000000000 +0100
+++ drbd8-8.3.13/debian/patches/udev-rules-name	2012-06-27 15:28:09.000000000 +0200
@@ -0,0 +1,16 @@
+Description: Fix name of udev rules file. (closes: #679266)
+Author: Bastian Blank <waldi at debian.org>
+Bug-Debian: http://bugs.debian.org/679266
+
+---
+--- drbd8-8.3.13.orig/scripts/Makefile.in
++++ drbd8-8.3.13/scripts/Makefile.in
+@@ -130,7 +130,7 @@ endif
+ install-udev:
+ ifeq ($(WITH_UDEV),yes)
+ 	mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d
+-	install -m 644 drbd.rules $(DESTDIR)$(sysconfdir)/udev/rules.d/65-drbd.rules$(UDEV_RULE_SUFFIX)
++	install -m 644 drbd.rules $(DESTDIR)$(sysconfdir)/udev/rules.d/65-drbd.rules
+ endif
+ 
+ install-bashcompletion: