[DRBD-cvs] r1549 - in trunk: . debian drbd

[svn at svn.drbd.org]

Author: lars
Date: 2004-09-21 13:05:25 +0200 (Tue, 21 Sep 2004)
New Revision: 1549

Modified:
   trunk/ChangeLog
   trunk/Makefile
   trunk/debian/drbd.docs
   trunk/drbd.spec.in
   trunk/drbd/Makefile
Log:
removed all references to translations and HOWTO from the buildsystem files.
make rpm does work again (for me).

make tarball/rpm does no longer require updates to the debian changelog,
but verifies that ChangeLog mentions the current version tag

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2004-09-21 00:10:45 UTC (rev 1548)
+++ trunk/ChangeLog	2004-09-21 11:05:25 UTC (rev 1549)
@@ -4,6 +4,10 @@
  Cumulative changes since last tarball.
  For even more detail, use "svn log" and "svn diff".
 
+0.8_pre1
+--------
+ * remove all kernel 2.4.x compatibility crap
+
 0.7.4 (api:76/proto:74)
 -----
  * Fixed a critical bug with Linux-2.4.x and HIGHMEM!

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2004-09-21 00:10:45 UTC (rev 1548)
+++ trunk/Makefile	2004-09-21 11:05:25 UTC (rev 1549)
@@ -84,10 +84,14 @@
 	then \
 	   echo "You need to update the %changelog in drbd.spec.in"; \
 	   up2date=false; fi; \
+	if ! grep "^$$dver_re$$" >/dev/null 2>&1 ChangeLog; \
+	then \
+	   echo "You need to update ChangeLog"; \
+	   up2date=false; fi ; \
 	if ! grep "^drbd ($$dver_re-" >/dev/null 2>&1 debian/changelog; \
 	then \
-	   echo "You need to update debian/changelog"; \
-	   up2date=false; fi ; \
+	   echo -e "\n\n\tdebian/changelog needs some update\n"; \
+	   : do not fail the build because of outdated debian/changelog ; fi ; \
 	$$up2date
 
 # XXX this is newly created whenever the toplevel makefile does something.
@@ -125,8 +129,7 @@
 	echo drbd-$(DIST_VERSION)/drbd_config.h >> .filelist     ;\
 	echo drbd-$(DIST_VERSION)/drbd/drbd_buildtag.c >> .filelist ;\
 	echo drbd-$(DIST_VERSION)/.filelist >> .filelist         ;\
-	for d in documentation/{ja,pt_BR}; do test -e $$d/Makefile && echo drbd-$(DIST_VERSION)/$$d/Makefile >> .filelist ; done
-	@echo "./.filelist updated."
+	echo "./.filelist updated."
 
 # tgz will no longer automatically update .filelist,
 # so the tgz and therefore rpm target will work within

Modified: trunk/debian/drbd.docs
===================================================================
--- trunk/debian/drbd.docs	2004-09-21 00:10:45 UTC (rev 1548)
+++ trunk/debian/drbd.docs	2004-09-21 11:05:25 UTC (rev 1549)
@@ -1,3 +1 @@
 documentation/NFS-Server-README.txt
-documentation/HOWTO/Makefile
-documentation/HOWTO/DRBD-HOWTO.sgml

Modified: trunk/drbd/Makefile
===================================================================
--- trunk/drbd/Makefile	2004-09-21 00:10:45 UTC (rev 1548)
+++ trunk/drbd/Makefile	2004-09-21 11:05:25 UTC (rev 1549)
@@ -64,6 +64,11 @@
     KDIR := /lib/modules/$(shell uname -r)/build
   endif
 
+  KDIR_Makefile_PATCHLEVEL = $(shell grep "^PATCHLEVEL = " $(KDIR)/Makefile | cut -d " " -f 3 )
+  ifneq ($(findstring $(KDIR_Makefile_PATCHLEVEL),12345),)
+    $(error "won't compile with this kernel version")
+  endif
+
   # shell ls, because some of them may be missing
   # inside a patched kernel source tree
   SRC_FILES := $(shell ls 2>/dev/null\

Modified: trunk/drbd.spec.in
===================================================================
--- trunk/drbd.spec.in	2004-09-21 00:10:45 UTC (rev 1548)
+++ trunk/drbd.spec.in	2004-09-21 11:05:25 UTC (rev 1549)
@@ -80,11 +80,7 @@
 
 %install
 make install PREFIX=%{buildroot}/ MANDIR=%{_mandir}
-cd documentation
-mv HOWTO HOWTO.orig
-mkdir HOWTO
-find HOWTO.orig/ -name "*.html" -exec cp -p '{}' HOWTO \;
-cd ../drbd
+cd drbd
 mv .kernel.config.gz k-config-%{kernelversion}.gz
 
 FILELIST="%{_builddir}/%{name}-%{version}/file.list"
@@ -128,15 +124,8 @@
 %{_mandir}/man8/drbdsetup.8.gz
 %{_mandir}/man8/drbdadm.8.gz
 %{_mandir}/man5/drbd.conf.5.gz
-%{_mandir}/ja/man8/drbd.8.gz
-%{_mandir}/ja/man8/drbdsetup.8.gz
-%{_mandir}/ja/man5/drbd.conf.5.gz
-%{_mandir}/pt_BR/man8/drbd.8.gz
-%{_mandir}/pt_BR/man8/drbdsetup.8.gz
-%{_mandir}/pt_BR/man5/drbd.conf.5.gz
 %doc scripts/drbd.conf
 %doc documentation/NFS-Server-README.txt
-%doc documentation/HOWTO
 %doc COPYING
 %doc README
 %doc file.list
@@ -182,6 +171,10 @@
 /sbin/depmod -a -F /boot/System.map-%{kernelversion} %{kernelversion} >/dev/null 2>&1 || true
 
 %changelog
+* Tue Sep 21 2004 02:39:53 +0200 Lars Ellenberg <l.g.e at web.de>
+- drbd (0.8_pre1-1)
+  * remove all kernel 2.4.x compatibility crap
+
 * Thu Sep 9 2004 19:50:00 +0200 Philipp Reisner <phil at linbit.com>
 - drbd (0.7.4-1)
   * Fixed a critical bug with Linux-2.4.x and HIGHMEM!