summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Tokarev <mjt@tls.msk.ru>2014-10-04 18:54:30 +0400
committerMichael Tokarev <mjt@tls.msk.ru>2014-10-04 20:32:00 +0400
commitfbb57805a9f4464bded172510269000f1794201f (patch)
tree98a39e780fa0ca8a1511e1d472c1d7dadf4e28b8 /debian
parent9511929b813f0122bfbb0595ee921188091e201d (diff)
simplify d/rules, build udeb in a subdir
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog1
-rwxr-xr-xdebian/rules60
2 files changed, 31 insertions, 30 deletions
diff --git a/debian/changelog b/debian/changelog
index 3b0dc10b..93ebd150 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ mdadm (3.3.2-2) UNRELEASED; urgency=medium
* removed references to MAIL_TO from /etc/default/mdadm (pre-2.x mdadm)
* removed AUTOSTART variable from /etc/default/mdadm
(system will start arrays listed in mdadm.conf)
+ * simplify d/rules, build udeb in a subdir (for now, to be removed)
-- Michael Tokarev <mjt@tls.msk.ru> Sat, 04 Oct 2014 15:43:57 +0400
diff --git a/debian/rules b/debian/rules
index dfd3d0f2..3a7921c3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,42 +9,41 @@
LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
CXFLAGS = $(shell dpkg-buildflags --get CFLAGS) \
$(shell dpkg-buildflags --get CPPFLAGS)
-BUILDFLAGS = CXFLAGS="$(CXFLAGS)" LDFLAGS="$(LDFLAGS)"
+BUILDFLAGS = CXFLAGS="$(CXFLAGS)" LDFLAGS="$(LDFLAGS)" DEBIAN=yes
+DESTDIR = $(CURDIR)/debian/mdadm
+DESTDIR_UDEB = $(DESTDIR)-udeb
-.PHONY: configure
-configure:
+build-arch: build-stamp
-build: configure build-stamp
build-stamp:
dh_testdir
- $(MAKE) -f debian/rules mdadm.udeb DEBIAN=yes
- $(MAKE) clean
- $(MAKE) -f debian/rules mdadm DEBIAN=yes
+ $(MAKE) all $(BUILDFLAGS) CONFFILE=/etc/mdadm/mdadm.conf CONFFILE2=/etc/mdadm.conf
touch $@
-mdadm.udeb: configure
- dh_testdir
- $(MAKE) mdadm mdmon $(BUILDFLAGS) CONFFILE=/tmp/mdadm.conf
- mv mdadm mdadm.udeb
- mv mdmon mdmon.udeb
-.PHONY: mdadm.udeb mdmon.udeb
+# udeb rules should go, the only diff is the conffile location,
+# and d-i specifies path explicitly when needed
+
+udeb/dir-stamp:
+ rm -rf udeb
+ mkdir udeb
+ ln *.[ch] Makefile udeb/
+ touch $@
-mdadm: configure
+build-arch: udeb/build-stamp
+
+udeb/build-stamp: udeb/dir-stamp
dh_testdir
- $(MAKE) all $(BUILDFLAGS) CONFFILE=/etc/mdadm/mdadm.conf CONFFILE2=/etc/mdadm.conf
-.PHONY: mdadm
+ $(MAKE) -C udeb mdadm mdmon $(BUILDFLAGS) CONFFILE=/tmp/mdadm.conf
+ touch $@
clean:
dh_testdir
rm -f build-stamp
- [ ! -f Makefile ] || $(MAKE) clean
- rm -f mdadm.udeb mdmon.udeb mdadm
+ $(MAKE) clean
+ rm -rf udeb
dh_clean
- debconf-updatepo
-install: DESTDIR=$(CURDIR)/debian/mdadm
-install: DESTDIR_UDEB=$(DESTDIR)-udeb
-install: build
+install-arch: build-arch
dh_testdir
dh_clean -k
dh_installdirs
@@ -63,13 +62,11 @@ install: build
install -Dm0755 debian/bugscript $(DESTDIR)/usr/share/bug/mdadm/script
install -Dm0644 debian/presubj $(DESTDIR)/usr/share/bug/mdadm/presubj
- install -Dm0755 mdadm.udeb $(DESTDIR_UDEB)/sbin/mdadm
- install -Dm0755 mdmon.udeb $(DESTDIR_UDEB)/sbin/mdmon
+ install -Dm0755 udeb/mdadm $(DESTDIR_UDEB)/sbin/mdadm
+ install -Dm0755 udeb/mdmon $(DESTDIR_UDEB)/sbin/mdmon
install -Dm0644 udev-md-raid-arrays.rules $(DESTDIR_UDEB)/lib/udev/rules.d/63-md-raid-arrays.rules
-binary-indep: build install
-
-binary-arch: build install
+binary-arch: install-arch
dh_testdir
dh_testroot
dh_installdebconf
@@ -92,7 +89,10 @@ binary-arch: build install
dh_md5sums
dh_builddeb
-binary: binary-indep binary-arch
+build: build-arch
+install: install-arch
+binary: binary-arch
build-indep:
-build-arch: build
-.PHONY: build build-indep build-arch clean binary-indep binary-arch binary install configure
+install-indep:
+binary-indep:
+.PHONY: clean build build-indep build-arch binary binary-indep binary-arch install install-indep install-arch