X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=debian%2Frules;h=c8b6c636fcdc57917fab428bdd15d88db3ae284a;hb=6b8558f867edc8a9e1e2e2bd4f052a57caf5e863;hp=4cf5b388a22034afe322678ab216fadae31c0ee2;hpb=819a2d4c8adce1af5e77d514a66ed88e7dcb8a43;p=openvswitch diff --git a/debian/rules b/debian/rules index 4cf5b388..c8b6c636 100755 --- a/debian/rules +++ b/debian/rules @@ -10,30 +10,20 @@ # Modified to make a template file for a multi-binary package with separated # build-arch and build-indep targets by Bill Allombert 2001 -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -# This has to be exported to make some magic below work. -export DH_OPTIONS - -# prefix of the target package name -PACKAGE=openvswitch-datapath-module -# modifieable for experiments or debugging m-a -MA_DIR ?= /usr/share/modass -# load generic variable handling --include $(MA_DIR)/include/generic.make -# load default rules --include $(MA_DIR)/include/common-rules.make - -DATAPATH_CONFIGURE_OPTS = - # Official build number. Leave set to 0 if not an official build. BUILD_NUMBER = 0 +PACKAGE=openvswitch +pdkms=openvswitch-datapath-dkms +DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([0-9]:)*([^-]+).*,\2,p') +srcfiles := $(filter-out debian, $(wildcard * .[^.]*)) + 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 @@ -46,10 +36,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 @@ -60,7 +52,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 $@ @@ -76,54 +72,39 @@ clean: rm -rf _debian [ ! -f Makefile ] || $(MAKE) distclean dh_clean - debconf-updatepo - -kdist_clean: - dh_clean - rm -rf openvswitch - -kdist_config: prep-deb-files - -binary-modules: DSTDIR = $(CURDIR)/debian/$(PKGNAME)/lib/modules/$(KVERS) -binary-modules: prep-deb-files - dh_testdir - dh_testroot - dh_clean -k - tar xzf openvswitch.tar.gz - cd openvswitch && ./configure --with-l26=$(KSRC) $(DATAPATH_CONFIGURE_OPTS) --with-build-number=$(BUILD_NUMBER) - cd openvswitch && $(MAKE) -C datapath/linux-2.6 - install -d -m755 $(DSTDIR) - install -m644 openvswitch/datapath/linux-2.6/*_mod.ko $(DSTDIR)/ - dh_installdocs - dh_installchangelogs - dh_compress - dh_fixperms - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb --destdir=$(DEB_DESTDIR) 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 + + #dkms stuff + # setup the dirs + dh_installdirs -p$(pdkms) usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION) + + # copy the source + cd debian/$(pdkms)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION) && tar xvzf $(CURDIR)/_debian/openvswitch.tar.gz && mv openvswitch/* . && rmdir openvswitch + + # Prepare dkms.conf from the dkms.conf.in template + sed "s/__VERSION__/$(DEB_UPSTREAM_VERSION)/g" debian/dkms.conf.in > debian/$(pdkms)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/dkms.conf 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 @@ -136,13 +117,15 @@ binary-common: dh_installexamples dh_installdebconf dh_installlogrotate - dh_installinit + dh_installinit -R -Nopenvswitch-switch + dh_installinit -R -popenvswitch-switch --error-handler=init_script_error dh_installcron - dh_installman + dh_installman --language=C dh_link dh_strip --dbg-package=openvswitch-dbg dh_compress - dh_fixperms -X var/log/core + dh_fixperms + dh_python2 dh_perl dh_makeshlibs dh_installdeb @@ -157,3 +140,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: