r908 - in lvm2/trunk/debian: . patches

Bastian Blank waldi at alioth.debian.org
Sun May 27 11:52:38 UTC 2012


Author: waldi
Date: Sun May 27 11:52:38 2012
New Revision: 908

Log:
* debian/changelog: Update.
* debian/patches: Remove patch.
* debian/rules: Force -j1 for sub-make.

Deleted:
   lvm2/trunk/debian/patches/rules-subdir.patch
Modified:
   lvm2/trunk/debian/changelog
   lvm2/trunk/debian/patches/series
   lvm2/trunk/debian/rules

Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog	Sun May 27 11:40:19 2012	(r907)
+++ lvm2/trunk/debian/changelog	Sun May 27 11:52:38 2012	(r908)
@@ -1,3 +1,9 @@
+lvm2 (2.02.95-4) UNRELEASED; urgency=low
+
+  * Force building with -j1.
+
+ -- Bastian Blank <waldi at debian.org>  Sun, 27 May 2012 13:51:57 +0200
+
 lvm2 (2.02.95-3) unstable; urgency=low
 
   * Fix build-dependency.

Modified: lvm2/trunk/debian/patches/series
==============================================================================
--- lvm2/trunk/debian/patches/series	Sun May 27 11:40:19 2012	(r907)
+++ lvm2/trunk/debian/patches/series	Sun May 27 11:52:38 2012	(r908)
@@ -3,5 +3,4 @@
 dirs.patch
 force-modprobe.patch
 #libdm-atomic.patch
-rules-subdir.patch
 implicit-pointer.patch

Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules	Sun May 27 11:40:19 2012	(r907)
+++ lvm2/trunk/debian/rules	Sun May 27 11:52:38 2012	(r908)
@@ -25,7 +25,8 @@
 LVM2APP_ABINAME = 2.2
 LVM2CMD_ABINAME = 2.02
 
-MAKE_SELF = $(MAKE) -f debian/rules
+MAKE_REAL := $(MAKE) -j1
+MAKE_SELF := $(MAKE) -f debian/rules
 
 BUILD_DIR = debian/build
 STAMPS_DIR = debian/stamps
@@ -112,11 +113,10 @@
 build_deb: $(STAMPS_DIR)/build_deb
 build_udeb: $(STAMPS_DIR)/build_udeb
 
-.NOTPARALLEL: $(STAMPS_DIR)/build_%
 $(STAMPS_DIR)/build_%: DIR = $(BUILD_DIR)/build_$*
 $(STAMPS_DIR)/build_%: $(STAMPS_DIR)/setup_%
 	dh_testdir
-	$(MAKE) -C $(DIR) LIB_VERSION_DM=$(DEVMAPPER_ABINAME)
+	+$(MAKE_REAL) -C $(DIR) LIB_VERSION_DM=$(DEVMAPPER_ABINAME)
 	touch $@
 
 $(BUILD_DIR) $(STAMPS_DIR):
@@ -136,7 +136,7 @@
 	dh_testdir
 	dh_testroot
 	rm -rf $(INSTALL_DIR)
-	$(MAKE) -C $(DIR) install DESTDIR=$(CURDIR)/$(INSTALL_DIR) LIB_VERSION_DM=$(DEVMAPPER_ABINAME)
+	+$(MAKE_REAL) -C $(DIR) install DESTDIR=$(CURDIR)/$(INSTALL_DIR) LIB_VERSION_DM=$(DEVMAPPER_ABINAME)
 	touch $@
 
 install-base-prep:



More information about the pkg-lvm-commits mailing list