X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=debian%2Frules;h=37d321b7d183fb947470babece4abcf6c8b8d7a0;hb=fc999dda6a9e3f42add70b371889a7419ff569c2;hp=0d0abf1647f4d88736da6b7141dd07967f9043ba;hpb=02dd3123a0e312f1d33403e744af52dd6096f12d;p=sliver-openvswitch.git

diff --git a/debian/rules b/debian/rules
index 0d0abf164..37d321b7d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,9 +14,11 @@
 BUILD_NUMBER = 0
 
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-MAKEFLAGS += -j$(NUMJOBS)
+PARALLEL = -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+else
+PARALLEL =
 endif
+MAKEFLAGS += $(PARALLEL)
 
 ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 CFLAGS += -O0
@@ -29,11 +31,12 @@ configure-stamp:
 	dh_testdir
 	test -e configure || ./boot.sh
 	test -d _debian || mkdir _debian
+	echo $(DEB_BUILD_OPTIONS)
 	echo $$CC
 	cd _debian && ( \
 		test -e Makefile || \
 		../configure --prefix=/usr --localstatedir=/var --enable-ssl \
-			--with-build-number=$(BUILD_NUMBER) \
+			--sysconfdir=/etc --with-build-number=$(BUILD_NUMBER) \
 			CFLAGS="$(CFLAGS)" $(DATAPATH_CONFIGURE_OPTS))
 	touch configure-stamp
 
@@ -44,7 +47,11 @@ build-arch: build-arch-stamp
 build-arch-stamp: configure-stamp 
 	$(MAKE) -C _debian
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	$(MAKE) -C _debian check
+	if $(MAKE) -C _debian check TESTSUITEFLAGS='$(PARALLEL)'; then :; \
+	else \
+		cat _debian/tests/testsuite.log; \
+		exit 1; \
+	fi
 endif
 	touch $@
 
@@ -60,33 +67,29 @@ clean:
 	rm -rf _debian
 	[ ! -f Makefile ] || $(MAKE) distclean
 	dh_clean 
-	debconf-updatepo
 
 install: install-indep install-arch
 install-indep: build-indep
 	dh_testdir
 	dh_testroot
-	dh_clean -k -i 
+	dh_prep -i
 	dh_installdirs -i
+	$(MAKE) -C _debian DESTDIR=$(CURDIR)/debian/tmp install
 	dh_install -i
 	sed 's/^BUILD_NUMBER = .*/BUILD_NUMBER = $(BUILD_NUMBER)/' \
 		< debian/rules.modules \
 		> debian/openvswitch-datapath-source/usr/src/modules/openvswitch-datapath/debian/rules
 	chmod 755 debian/openvswitch-datapath-source/usr/src/modules/openvswitch-datapath/debian/rules
 	cd debian/openvswitch-datapath-source/usr/src && tar -c modules | bzip2 -9 > openvswitch-datapath.tar.bz2 && rm -rf modules
-	install -m644 debian/openvswitch-pki-server.apache2 debian/openvswitch-pki-server/etc/apache2/sites-available/openvswitch-pki
-	install -m1777 -d debian/corekeeper/var/log/core
 
 install-arch: build-arch
 	dh_testdir
 	dh_testroot
-	dh_clean -k -s 
+	dh_prep -s
 	dh_installdirs -s
-	$(MAKE) -C _debian DESTDIR=$(CURDIR)/debian/openvswitch install
-	cp debian/openvswitch-switch-config.overrides debian/openvswitch-switch-config/usr/share/lintian/overrides/openvswitch-switch-config
+	$(MAKE) -C _debian DESTDIR=$(CURDIR)/debian/tmp install
 	cp debian/openvswitch-switch.template debian/openvswitch-switch/usr/share/openvswitch/switch/default.template
 	dh_install -s
-	env TERMINFO=debian/openvswitch-switchui/usr/share/terminfo tic -x extras/ezio/ezio3.ti
 
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-indep
@@ -99,13 +102,14 @@ binary-common:
 	dh_installexamples
 	dh_installdebconf
 	dh_installlogrotate
-	dh_installinit
+	dh_installinit -R
 	dh_installcron
 	dh_installman
 	dh_link
 	dh_strip --dbg-package=openvswitch-dbg
 	dh_compress 
-	dh_fixperms -X var/log/core
+	dh_fixperms
+	dh_pysupport
 	dh_perl
 	dh_makeshlibs
 	dh_installdeb
@@ -120,3 +124,9 @@ binary-arch: install-arch
 
 binary: binary-arch binary-indep
 .PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
+
+# This GNU make extensions disables parallel builds for the current Makefile
+# but not for sub-Makefiles.  This is appropriate here because build-arch and
+# build-indep both invoke "make" on OVS, which can update some of the same
+# targets in ways that conflict (e.g. both update tests/testsuite).
+.NOTPARALLEL: