[DRBD-cvs] debian by phil; Updated debian directory. [Bernd Schuber...
drbd-user@lists.linbit.com
drbd-user@lists.linbit.com
Tue, 6 Jul 2004 10:11:15 +0200 (CEST)
DRBD CVS committal
Author : phil
Project : drbd
Module : debian
Dir : drbd/debian
Modified Files:
Tag: rel-0_7-branch
README.Debian TODO changelog control control.modules copyright
rules
Added Files:
Tag: rel-0_7-branch
Makefile.modules conffiles control.in.MODULE drbd-source.dirs
drbd.dirs drbd.docs drbd.install drbd.manpages drbd.postinst
drbd.postrm drbd.prerm rules.MODULE substvars
Log Message:
Updated debian directory. [Bernd Schubert provided this work, which is
based on work by David Krovich, which is based on ...]
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/debian/README.Debian,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -3 -r1.1 -r1.1.2.1
--- README.Debian 17 May 2001 13:01:54 -0000 1.1
+++ README.Debian 6 Jul 2004 08:11:10 -0000 1.1.2.1
@@ -1,8 +1,10 @@
drbd for Debian
-----------------------
+---------------
-This package includes support for haveing a raid 1 block-device
-over tcp/ip. It exists of a kernel-patch, user mode support, and a
-kernelmodule. The last 2 are mandatory.
+To make sure the default installation of drbd is non-interactive, I
+have set the default value of the inittimeout parameter to be a
+negative number. This may not be what you would like for a production
+setup. See the drbd.conf man page and pay special attention to the
+inittimeout, skip-wait, and load-only options.
- -- Ard van Breemen <ard@telegraafnet.nl>, Wed, 16 May 2001 15:50:32 +0200
+ -- David Krovich <dkrovich@csee.wvu.edu>, Tue May 25 12:47:11 2004
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/debian/TODO,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -3 -r1.1 -r1.1.2.1
--- TODO 21 May 2001 14:25:41 -0000 1.1
+++ TODO 6 Jul 2004 08:11:10 -0000 1.1.2.1
@@ -1,2 +1,4 @@
-* Incorporate heartbeat script into userland package.
-It will need newer heartbeat .deb packages for that.
+Create lintian overrides to deal with bash not handling extglob
+syntax. I'll also contact lintian package maintainers to make sure
+this is the correct thing to do. Refer to #247605 in the BTS for
+background on this.
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/debian/changelog,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -3 -r1.1 -r1.1.2.1
--- changelog 17 May 2001 13:01:54 -0000 1.1
+++ changelog 6 Jul 2004 08:11:10 -0000 1.1.2.1
@@ -1,3 +1,238 @@
+drbd (0.7-pre8-2) unstable; urgency=low
+
+ * fix up the modules source package
+
+ -- Bernd Schubert <bernd-schubert@web.de> Mon, 05 Jul 2004 00:57:38 -0100
+
+drbd (0.7-pre8-1) unstable; urgency=low
+
+ * initial 0.7 debian package
+
+ -- Bernd Schubert <bernd-schubert@web.de> Mon, 21 Jun 2004 19:57:38 -0400
+
+drbd (0.6.12-5) unstable; urgency=low
+
+ * Changed default drbd.conf file to set a negative inittimeout value and
+ updated the README.Debian file to reflect this change.
+ (Closes Bug#221751)
+
+ -- David Krovich <dkrovich@csee.wvu.edu> Tue, 25 May 2004 12:51:15 -0400
+
+drbd (0.6.12-4) unstable; urgency=low
+
+ * Refactored rules file in an attempt to use binary-arch and binary-indep
+ targets more wisely. This is an attempt to fix Bug#244392.
+ * Listed /etc/ha.d/resource.d/drbd in debian/conffiles. (Closes Bug#247606)
+ * Moved drbdsetup from /usr/bin/ to /usr/sbin. I think I introduced this
+ when I overhauled the debian directory in the 0.6.12-1 release.
+ (Closes Bug#247607)
+
+ -- David Krovich <dkrovich@csee.wvu.edu> Sun, 16 May 2004 15:20:59 -0400
+
+drbd (0.6.12-3) unstable; urgency=low
+
+ * After discussing with upstream, tweak /etc/init.d/drbd script so the
+ stop target works if the module is not loaded. (Closes: Bug#243417)
+ * Put the drbd script in the /etc/ha.d/resource.d directory. (Closes: Bug#245219)
+
+ -- David Krovich <dkrovich@csee.wvu.edu> Thu, 22 Apr 2004 18:12:47 -0400
+
+drbd (0.6.12-2) unstable; urgency=low
+
+ * Create /dev/nb[0-7] devices in postinst script. (Closes: Bug#221545)
+
+ -- David Krovich <dkrovich@csee.wvu.edu> Sat, 17 Apr 2004 15:18:29 -0400
+
+drbd (0.6.12-1) unstable; urgency=low
+
+ * new upstream release. (Closes: Bug#239804)
+ * Completely overhauled the debian/ directory.
+ * Changed sequence number in the runlevel to start at 70 and stop
+ at 08. drbd should start after things like ssh, but before
+ heartbeat.
+
+ -- David Krovich <dkrovich@csee.wvu.edu> Mon, 22 Mar 2004 00:04:35 -0500
+
+
+drbd (0.6.10-3) unstable; urgency=low
+ * Added back the drbd.postinst, drbd.postrm, and drbd.prerm scripts until
+ I figure out why they aren't being handled by dh_installinit.
+ * As of drbd-0.6.9, The drbd module no longer builds against just the
+ kernel-headers package and now needs a full kernel-source tree.
+
+ -- David Krovich <dkrovich@csee.wvu.edu> Mon, 26 Jan 2004 00:32:49 -0500
+
+drbd (0.6.10-2) unstable; urgency=low
+
+ * noel: fixed lintian warning:
+ W: drbd: package-contains-CVS-dir usr/share/doc/drbd/HOWTO/CVS/
+ W: drbd: script-in-etc-init.d-not-registered-via-update-rc.d /etc/init.d/drbd
+
+ * Lintian/Linda fixes.
+
+ * Tweaked the drbd-0.6.10.orig.tar.gz to not have a debian/ directory in it.
+ * Stopped tweaking the copyright notice on drbd_fs.c and drbd_receiver.c.
+ I'm not sure how that got there in the first place.
+ * Removed mystery report_to_html.pl.debdiff file.
+ * Put the datadisk in the correct location. (Closes: Bug#221544)
+
+ * Removed drbd.postinst, drbd.postrm, and drbd.prerm as they are
+ being generated by dh_installinit during the build process and do not
+ need to part of the source package.
+ * removed dependancy on automake and autoconf
+ * Changed control.modules to require debhelper >= 4.
+ * Stop settting $KSRC in the rules file.
+
+ * Removed conffiles, files, kernel-patch-wup.substvars as they are
+ unneccessary.
+ * Tightened the build dependancy on debhelper. >=4
+ * Updated Debian packages up to newest upstream version. (Closes: Bug#197906)
+ * Updated Package descriptions. (Closes: Bug#209462)
+ * Verified support for devfs. (Closes: Bug#203552)
+ * I'd like to become a Debian Developer and take over maintenance for
+ this package. I'm working with Debian Devolpers on making this happen.
+
+ -- David Krovich <dkrovich@csee.wvu.edu> Tue, 20 Jan 2004 01:36:58 -0500
+
+drbd (0.6.10-1) unstable; urgency=low
+
+ * With 0.6.9 there was a bug introduced which prevented the sending
+ of ACK packets during resync. Fixed.
+ * A fix to drbdsetup's wait_connect command.
+ * Replaced all invocations of the sleep_on() family functions with the
+ invocations of the wait_event() macros. This removes lost wakup events
+ and race conditions.
+ * New implementation of drbd_wait_ee(). This makes the
+ "(BUG?) Moving bh=%p to done_ee" go away.
+ * Handle the case if vmalloc() of the bitmap fails.
+
+ -- Philipp Reisner <phil@linbit.com> Thu, 12 Dec 2003 15:10:44 +0200
+
+drbd (0.6.9-1) unstable; urgency=low
+
+ * New module build system (using kernel source tree build system)
+ * New net section option 'ko-count'. It allows you to kick out a
+ secondary node which does no longer process data in acceptable time.
+ Its default value is 0 which disables this feature.
+ * Changing syncgroups while resync runs has shows now the correct behaviour.
+ * In case thread creations fails DRBD would deadlock on its own
+ semaphore. Fixed now.
+ * BKL is no longer used on Linux-2.4.x.
+ * Now you can stack mapping block devices like LVM2 (and maybe md) on
+ top of drbd (a one character fix).
+ * drbdsetup wait_connect on a StandAlone node looked like a timeout and
+ forced primary. fixed.
+ * if drbdsetup wait_* in fact did timeout this looked like a failed ioctl.
+ this bug was newly introduced in 0.6.8. fixed.
+ * A fix to a race in _drbd_alloc_ee(). You could trigger this race if
+ your filesystem uses a blocksize < 4K and your machine has multiple CPUs.
+ By Eric W. Biederman.
+ * A maybe bugfix regarding calls to free_page() by Eric W. Biederman.
+ * A cleanup patch to drbd_process_done_ee() by Eric W. Biederman.
+
+ -- Philipp Reisner <phil@linbit.com> Thu, 27 Nov 2003 08:21:34 +0200
+
+drbd (0.6.8-1) unstable; urgency=low
+
+ * Two fixes to the sync-group functionality.
+
+ -- Philipp Reisner <phil@linbit.com> Mon, 20 Oct 2003 11:45:33 +0200
+
+drbd (0.6.7-1) unstable; urgency=low
+
+ * A fix to a bug that could cause data corruption if you use a
+ other blocksize than 4k to access the DRBD device.
+ * A fix to a SMP race in the syncer code. The problem was tirggered
+ when using DRBD on QLogic fiber channel adapters.
+ * Replaced various calls to sleep_on() variants with the wait_event()
+ macros. -- This removes potential (, non-critical) SMP races.
+ * This release includes the sync-group option.
+
+ -- Philipp Reisner <phil@linbit.com> Thu, Oct 13 2003 11:17:27 +0200
+
+drbd (0.6.6-1) unstable; urgency=low
+
+ * In the 0.6.5 release the secondary_remote command was badly broken,
+ it succeeded when it should fail silently. This is fixed now.
+ * Probabely in all previous releases, the resyncer thread did not
+ exit properly if the secondary node goes away during resync.
+ This was not fatal sind the resyncher thread did exit at soon
+ as it gets a network error. This is fixed now.
+ * Some new switches to the drbd script.
+
+ -- Philipp Reisner <phil@linbit.com> Mon, 28 Jul 2003 14:40:43 +0200
+
+drbd (0.6.5-1) unstable; urgency=low
+
+ * Improvements to the build system
+ * Now it is possible to tune the socket send buffer size via drbdsetup/
+ drbd.conf. This is especially usefull for WAN mirroring / using
+ protocol A.
+ * Compatibility code to compile DRBD under RedHat 9.0 (RH's version of
+ Linux-2.4.20)
+ * Improved sample drbd.conf file
+
+ -- Philipp Reisner <phil@linbit.com> Sun, 06 Jul 2003 13:35:00 +0100
+
+drbd (0.6.4-1) unstable; urgency=low
+
+ * Reworked build system (i.e. better Makefiles)
+ * SyncAll works forward instead of backwards. Improves performance on
+ some storage controlers.
+ * Reworked /etc/init.d/drbd script (i.e. better support of
+ different bash releases)
+
+ -- Philipp Reisner <phil@linbit.com> Thu, 01 May 2003 21:00:00 +0100
+
+drbd (0.6.3-1) unstable; urgency=low
+
+ * Lockup of primary if secondary fails during resync. Fixed. (Stupid!)
+ * Probabely SMP only deadlock in the drop-conection code path.
+ * Improved connect code. (The old code could trap into a distributed
+ deadlock, resulting in an endless connect/disconnect loop.)
+ * The 'BitMap too small bug' was actually caused by a patch in
+ SuSE's distribution kernel. This patch makes DRBD 'more' compatible
+ with SuSE's kernel.
+ * Improved code to allocate buffers for the rsynchronisation process.
+ The old code allocated physical adjacent pages although the syncer
+ does not need them! The old code could fail under high memory pressure.
+
+ -- Philipp Reisner <phil@linbit.com> Thu, 20 Mar 2003 20:23:40 +0100
+
+drbd (0.6.2-1) unstable; urgency=low
+
+ * SMP fix in drbd_dio_end_sec()
+ * /etc/init.d/drbd knows about returncodes of fsck
+ * SUSE style rcdrbd
+ * Fixes for uninstall Target of the Makefiles.
+
+ -- Philipp Reisner <phil@linbit.com> Tue, 11 Feb 2003 15:58:49 +0100
+
+drbd (0.6.1-1) unstable; urgency=low
+
+ * Stable release
+
+ -- Philipp Reisner <phil@linbit.com> Mon, 25 Nov 2002 14:51:39 +0100
+
+drbd (0.6-1.pre16-0cvs20020909.1) unstable; urgency=low
+
+ * changed the maintainer to jan@debian.org in agreement with
+ Ard who currently doesn't work on drbd.
+ * changed name of generated drbd-module-... package to include
+ the full version number of the kernel package
+ * place generated drbd-module-... package in $(KSRC)/..
+
+ -- Jan Niehusmann <jan@debian.org> Fri, 13 Sep 2002 15:57:01 +0200
+
+drbd (0.6-1.pre16-0cvs20020909) unstable; urgency=low
+
+ * updated version
+ * strange version number because debian versioning doesn't handle
+ -pre versions sanely
+ * uploading to unstable. (Closes: Bug#130031)
+
+ -- Jan Niehusmann <jan@debian.org> Wed, 11 Sep 2002 13:10:03 +0200
+
drbd (cvs20010511-1) unstable; urgency=low
* First deb-anized version
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/debian/control,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -3 -r1.3 -r1.3.2.1
--- control 23 May 2001 16:48:54 -0000 1.3
+++ control 6 Jul 2004 08:11:10 -0000 1.3.2.1
@@ -1,29 +1,41 @@
Source: drbd
Section: misc
Priority: extra
-Maintainer: Ard van Breemen <ard@telegraafnet.nl>
-Build-Depends: debhelper (>= 2), debconf-utils, dh-kpatches (>=0.5), sp, docbook2man
-
-Package: drbd-source
-Architecture: all
-Section: misc
-Recommends: dpkg-dev, kernel-package, debhelper (>= 2), debconf-utils
-Description: RAID 1 over tcp/ip for Linux module source.
- This package provides the source code for the drbd module.
- The kernel source is required to compile this module.
+Maintainer: David Krovich <dkrovich@csee.wvu.edu>
+Build-Depends: debhelper (>= 4), debconf-utils, sp, docbook-utils
+Standards-Version: 3.5.10
Package: drbd
-Architecture: i386
+Architecture: any
Section: misc
-Depends: debconf
+Depends: debconf, ${misc:Depends}
Suggests: heartbeat
-Description: RAID 1 over tcp/ip for Linux utilities.
- This package contains the files needed to control the drbd kernel module.
+Description: RAID 1 over tcp/ip for Linux utilities
+ Drbd is a block device which is designed to build high availability
+ clusters by providing a virtual shared device which keeps disks in nodes
+ synchronised using TCP/IP. This simulates RAID 1 but avoiding the
+ use of uncommon hardware (shared SCSI buses or Fibre Channel).
+ It is currently limited to fail-over HA clusters.
+ .
+ This package contains the programs that will control the
+ drbd kernel module provided in drbd-source. You will need a clustering
+ service (such as heartbeat) to fully implement it.
+ .
+ Homepage: http://www.drbd.org
-package: kernel-patch-wup
+Package: drbd-source
Architecture: all
Section: misc
-Depends: patch
-Description: Export wake_up_process kernel patch.
- This patches the kernel so that modules can call the
- wake_up_process kernel call.
+Recommends: dpkg-dev, kernel-package, debhelper (>= 4), debconf-utils
+Description: RAID 1 over tcp/ip for Linux module source
+ Drbd is a block device which is designed to build high availability
+ clusters by providing a virtual shared device which keeps disks in nodes
+ synchronised using TCP/IP. This simulates RAID 1 but avoiding the
+ use of uncommon hardware (shared SCSI buses or Fibre Channel).
+ It is currently limited to fail-over HA clusters.
+ .
+ This package contains the programs that will control the
+ drbd kernel module provided in drbd-source. You will need a clustering
+ service (such as heartbeat) to fully implement it.
+ .
+ Homepage: http://www.drbd.org
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/debian/control.modules,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -3 -r1.1 -r1.1.2.1
--- control.modules 17 May 2001 13:01:54 -0000 1.1
+++ control.modules 6 Jul 2004 08:11:10 -0000 1.1.2.1
@@ -1,14 +1,37 @@
Source: drbd
Section: ha
Priority: extra
-Maintainer: Ard van Breemen <ard@telegraafnet.nl>
-Build-Depends: debhelper (>= 2), autoconf, automake, kernel-headers, cpio, debconf-utils
-Description: RAID 1 over tcp/ip for Linux.
- Drbd adds raid 1 over tcp/ip to a linux system.
+Maintainer: David Krovich <dkrovich@csee.wvu.edu>
+Build-Depends: debhelper (>= 4), kernel-source, cpio, debconf-utils
+Description: RAID 1 over tcp/ip for Linux
+ Drbd is a block device which is designed to build high availability
+ clusters by providing a virtual shared device which keeps disks in nodes
+ synchronised using TCP/IP. This simulates RAID 1 but avoiding the
+ use of uncommon hardware (shared SCSI buses or Fibre Channel).
+ It is currently limited to fail-over HA clusters.
+ .
+ This package contains the programs that will control the
+ drbd kernel module provided in drbd-source. You will need a clustering
+ service (such as heartbeat) to fully implement it.
+ .
+ Homepage: http://www.drbd.org
Package: drbd-module-#KVERS#
-Architecture: i386
-Recommends: dpkg-dev, kernel-package, debhelper (>= 2), debconf-utils, drbd
+Architecture: any
+Recommends: dpkg-dev, kernel-package, debhelper (>= 4), debconf-utils, drbd
Description: RAID 1 over tcp/ip for Linux kernel module.
This package provides the kernel module for linux kernel #KVERS#
- You have to install the drbd package to be able to use it.
+ You have to install the drbd package to be able to use it
+ .
+ Drbd is a block device which is designed to build high availability
+ clusters by providing a virtual shared device which keeps disks in nodes
+ synchronised using TCP/IP. This simulates RAID 1 but avoiding the
+ use of uncommon hardware (shared SCSI buses or Fibre Channel).
+ It is currently limited to fail-over HA clusters.
+ .
+ This package contains the programs that will control the
+ drbd kernel module provided in drbd-source. You will need a clustering
+ service (such as heartbeat) to fully implement it.
+ .
+ Homepage: http://www.drbd.org
+
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/debian/copyright,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -3 -r1.1 -r1.1.2.1
--- copyright 21 May 2001 17:12:01 -0000 1.1
+++ copyright 6 Jul 2004 08:11:10 -0000 1.1.2.1
@@ -1,4 +1,20 @@
+David Krovich <dkrovich@csee.wvu.edu> adopted the packages from Jan
+Niehusman <jan@debian.org> and updated them to sync back up with
+upstream.
+
+Debianization of this package was started by Ard van Breemen <ard@telegraafnet.nl>.
+Later, Jan Niehusmann <jan@debian.org> finished the packaging and made the
+initial upload.
+
+It was downloaded from http://www.linbit.com/en/article/articleview/34/1/11/
+More information can be found at http://www.drbd.org/
+
Drbd is free software; you can redistribute them and/or modify them under
the terms of the GNU General Public License as published by the Free Software
Foundation; either version 2 of the License, or (at your option) any later
version.
+
+On Debian systems, the complete text of the GNU General Public
+License can be found in /usr/share/common-licenses/GPL file.
+
+
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/debian/rules,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -3 -r1.5 -r1.5.2.1
--- rules 23 May 2001 16:49:37 -0000 1.5
+++ rules 6 Jul 2004 08:11:10 -0000 1.5.2.1
@@ -1,149 +1,106 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# debian/rules file - for drbd
-# Patterned after the pcmcia-cs package by Brian Mays.
-
-# STATUS
-# drbd package seems fine. Doesn't need any other things
-
-package=drbd
-KSRC?=/usr/src/linux
-MOD_DIR?='.'
-kvers=`cat debian/KVERS`
-PKGVERSION=$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)
-MVARUSUBDIRS=$(shell grep ^SUBDIRS Makefile.vars | sed 's/ drbd / /g' | sed 's/ = /=/g'|cut -d '\#' -f1 )
-#MVARKSUBDIRS=drbd
-export DH_VERBOSE=1
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 by Joey Hess.
+#
+# This version is for a hypothetical package that builds an
+# architecture-dependant package, as well as an architecture-independent
+# package.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -g
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL_PROGRAM += -s
+endif
-SMPFLAG=$(shell grep -q '^CONFIG_SMP=y' $(KSRC)/.config && echo "-D__SMP__")
-
-install-kernelpatch:
+build-arch-stamp:
dh_testdir
- dh_testroot
- dh_installdirs -p kernel-patch-wup
- dh_installkpatches -p kernel-patch-wup
-binary-kernelpatch: install-kernelpatch
- dh_testdir
- dh_testroot
- dh_installdocs -pkernel-patch-wup
- dh_installchangelogs -pkernel-patch-wup
- dh_installdeb -pkernel-patch-wup
- dpkg-gencontrol -pkernel-patch-wup -Pdebian/kernel-patch-wup
- dh_fixperms -pkernel-patch-wup
- dpkg-deb --build debian/kernel-patch-wup ..
-
-binary-indep: binary-source binary-kernelpatch
- $(checkdir)
-
-
-binary-arch: checkroot binary-drbd
- $(checkdir)
-
-binary-drbd: checkroot build
- $(checkdir)
- $(RM) -r debian/drbd
- dh_installdirs -pdrbd DEBIAN usr/sbin var/lib/drbd
-# Install changelog & copyright
- dh_installman -pdrbd documentation/drbd.conf.5 documentation/drbdsetup.8
- dh_installdocs -pdrbd TODO README
- dh_installchangelogs -pdrbd ChangeLog
- install -m755 user/drbdsetup debian/drbd/usr/sbin/
- dh_compress -pdrbd
- # We don't wan't the examples to be compressed :)
- dh_installexamples -pdrbd scripts/datadisk scripts/drbd scripts/drbd.conf
- dh_strip -pdrbd
- dh_fixperms -pdrbd
-# Generate deb file
- dpkg-gencontrol -pdrbd -Pdebian/drbd
- dpkg-deb --build debian/drbd ..
-
-binary: binary-arch binary-indep
-
-binary-source:
- $(checkdir)
- $(RM) -r debian/src
- dh_installdirs -psrc DEBIAN usr/src/modules/$(package)/debian usr/share/doc/drbd-source
- # Install files
- cp -a debian/rules debian/changelog debian/control.modules debian/src/usr/src/modules/$(package)/debian
- cp -a debian/control.modules debian/src/usr/src/modules/$(package)/debian/control
- cp -a drbd debian/src/usr/src/modules/$(package)/
- cp Makefile.vars debian/src/usr/src/modules/$(package)/
- chown -R root.src debian/src/usr/src/modules/$(package)/
- chmod -R g+w debian/src/usr/src/modules/$(package)/
-# find debian/src -type d | xargs chmod 755
-# find debian/src -type f -perm -100 | xargs chmod 755
-# find debian/src -type f -not -perm -100 | xargs chmod 644
- cd debian/src/usr/src && \
- tar cf $(package).tar modules && \
- $(RM) -r modules/$(package)
- gzip -9 debian/src/usr/src/$(package).tar
- chmod 644 debian/src/usr/src/$(package).tar.gz
- dh_fixperms -psrc
- # Install changelog & copyright
- dh_installchangelogs -psrc ChangeLog
- dh_compress -psrc
- # Generate deb file
- dpkg-gencontrol -pdrbd-source -Pdebian/src
- dpkg-deb --build debian/src ..
-
-
-build:
- $(checkdir)
- $(MAKE) "$(MVARUSUBDIRS)"
-# Could not get docbook2man to work...
-# But at least we have manpages for now :)
- cd documentation && nsgmls drbdsetup.sgml | sgmlspl /usr/lib/perl5/sgmlspl-specs/docbook2man-spec.pl
- cd documentation && nsgmls drbd.conf.sgml | sgmlspl /usr/lib/perl5/sgmlspl-specs/docbook2man-spec.pl
+ cd user && $(MAKE)
+ cd documentation && $(MAKE)
+ cd scripts && $(MAKE)
+ touch build-stamp
+
+build-arch: build-arch-stamp
+ dh_testdir -a
+ dh_testroot -a
+ dh_clean -a -k
+ dh_installdirs -a
+ dh_install -a
clean:
- $(MAKE) clean
- dh_clean
-
-checkroot:
- $(checkdir)
- test root = "`whoami`"
-
-# This is used when kernel-package is building the package.
-# Build the kernel module .deb.
-build-modules:
- dh_testdir
- cd drbd && $(MAKE) INCLUDE=-I$(KSRC)/include KERNVER=$(KVERS) CC=gcc272 SMPFLAG=$(SMPFLAG)
-
-binary-modules: build-modules
- dh_clean -k
dh_testdir
dh_testroot
+ rm -f build-stamp
+ cd user && $(MAKE) clean
+ cd documentation && $(MAKE) clean
+ cd scripts && $(MAKE) clean
+ dh_clean
- rm -f debian/control.save
- cp debian/control debian/control.save
- rm -f debian/control
- sed 's/#KVERS#/$(KVERS)/g' debian/control.modules > debian/control
- # And set up files so debhelper can find them.
- dh_installdirs lib/modules/$(KVERS)/misc
- install -m644 drbd/drbd.o debian/tmp/lib/modules/$(KVERS)/misc
- dh_installdocs
- dh_installmodules
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol -- -v$(PKGVERSION)
- dh_makeshlibs
- dh_md5sums
- dh_builddeb --destdir=$(MODULE_LOC)/..
-
-kdist_image: binary-modules clean
-
-kdist: kdist_clean binary-modules
-
-kdist_clean:
- dh_testdir
- cd drbd && $(MAKE) INCLUDE=-I$(KSRC)/include KERNVER=$(KVERS) clean
-
-source diff:
- @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+build-indep:
+ dh_testdir -i
+ dh_testroot -i
+ dh_clean -i -k
+ dh_installdirs -i
+ dh_install -i
+# cp debian/rules.MODULE debian/drbd-source/usr/src/modules/drbd/debian/rules
+ for file in debian/*.MODULE; do \
+ cp $$file debian/drbd-source/usr/src/modules/drbd/$${file%%.MODULE}; \
+ done
+ cp debian/changelog debian/drbd-source/usr/src/modules/drbd/debian
+ # touch debian/control file so debian/rules clean works the first time
+ touch debian/drbd-source/usr/src/modules/drbd/debian/control
+ cp -a drbd/* debian/drbd-source/usr/src/modules/drbd/drbd
+ cp Makefile debian/drbd-source/usr/src/modules/drbd
+# cp Makefile.vars debian/drbd-source/usr/src/modules/drbd
+ cp drbd_config.h debian/drbd-source/usr/src/modules/drbd
+ cd debian/drbd-source/usr/src; \
+ chmod 0775 modules/drbd/debian/rules; \
+ tar pzfvc drbd.tar.gz modules; \
+ rm -rf modules/
+
+binary-indep:build-indep
+ dh_testdir -i
+ dh_testroot -i
+
+ dh_installdocs -i
+ dh_installman -i
+ dh_installchangelogs -i ChangeLog
+# dh_installdebconf -i
+# dh_installmodules -i
+ dh_strip -i
+ dh_link -i
+ dh_compress -i
+ dh_fixperms -i
+ dh_installdeb -i
+ dh_shlibdeps -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
+
+
+binary-arch: build-arch
+ dh_testdir -a
+ dh_testroot -a
+
+ dh_installdocs -a
+ dh_installman -a
+ dh_installchangelogs -a ChangeLog
+# dh_installdebconf -a
+# dh_installmodules -a
+ dh_strip -a
+ dh_link -a
+ dh_compress -a
+ dh_fixperms -a
+ dh_installdeb -a
+ dh_shlibdeps -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
-.PHONY: binary binary-arch binary-indep binary-modules \
- clean clean-modules checkroot \
- kconf kdist kdist_image kdist_changes
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install