From a84edf5408291651f21d519df206ea6182b92dfc Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Tue, 15 Dec 2009 10:19:03 -0800 Subject: [PATCH] debian: Break rules for datapath module out of debian/rules. debian/rules included makefiles from /usr/share/modass/include. Unfortunately these makefiles set some environment variables to values that we do not want in the general Debian build, e.g. on this machine they set CC to gcc-4.1. It appears that it is generally good practice to break out the kernel module rules from the general-purpose rules anyhow, so this commit does so. --- debian/openvswitch-datapath-source.install | 1 - debian/po/templates.pot | 13 +++--- debian/rules | 47 +++------------------- debian/rules.modules | 41 +++++++++++++++++++ 4 files changed, 53 insertions(+), 49 deletions(-) create mode 100755 debian/rules.modules diff --git a/debian/openvswitch-datapath-source.install b/debian/openvswitch-datapath-source.install index d1acc894..943245ca 100644 --- a/debian/openvswitch-datapath-source.install +++ b/debian/openvswitch-datapath-source.install @@ -2,5 +2,4 @@ debian/changelog usr/src/modules/openvswitch-datapath/debian debian/control usr/src/modules/openvswitch-datapath/debian debian/compat usr/src/modules/openvswitch-datapath/debian debian/*.modules.in usr/src/modules/openvswitch-datapath/debian -debian/rules usr/src/modules/openvswitch-datapath/debian _debian/openvswitch.tar.gz usr/src/modules/openvswitch-datapath diff --git a/debian/po/templates.pot b/debian/po/templates.pot index abccbc42..bf9953ff 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: dev@openvswitch.org\n" -"POT-Creation-Date: 2009-05-11 13:38-0700\n" +"POT-Creation-Date: 2009-12-15 09:36-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -188,8 +188,9 @@ msgstr "" #. Description #: ../openvswitch-switch-config.templates:6001 msgid "" -"Ensure that the OpenFlow DHCP server is properly configured. See ovs-openflowd(8) " -"for instructions on how to configure a DHCP server for controller discovery." +"Ensure that the OpenFlow DHCP server is properly configured. See ovs-" +"openflowd(8) for instructions on how to configure a DHCP server for " +"controller discovery." msgstr "" #. Type: boolean @@ -293,9 +294,9 @@ msgstr "" #. Description #: ../openvswitch-switch-config.templates:11001 msgid "" -"The controller location must be specifed as \"ssl:IP[:PORT]\" to connect " -"to the controller over SSL (recommended for security) or \"tcp:IP[:PORT]\" " -"to connect over cleartext TCP." +"The controller location must be specifed as \"ssl:IP[:PORT]\" to connect to " +"the controller over SSL (recommended for security) or \"tcp:IP[:PORT]\" to " +"connect over cleartext TCP." msgstr "" #. Type: string diff --git a/debian/rules b/debian/rules index 4cf5b388..0d0abf16 100755 --- a/debian/rules +++ b/debian/rules @@ -10,23 +10,6 @@ # 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 @@ -46,6 +29,7 @@ configure-stamp: dh_testdir test -e configure || ./boot.sh test -d _debian || mkdir _debian + echo $$CC cd _debian && ( \ test -e Makefile || \ ../configure --prefix=/usr --localstatedir=/var --enable-ssl \ @@ -78,31 +62,6 @@ clean: 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 @@ -110,6 +69,10 @@ install-indep: build-indep dh_clean -k -i dh_installdirs -i 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 diff --git a/debian/rules.modules b/debian/rules.modules new file mode 100755 index 00000000..4f39ceed --- /dev/null +++ b/debian/rules.modules @@ -0,0 +1,41 @@ +#! /usr/bin/make -f + +PACKAGE=openvswitch-datapath-module +MA_DIR ?= /usr/share/modass +-include $(MA_DIR)/include/generic.make +-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 + +kdist_clean: + dh_testdir + dh_testroot + dh_clean + rm -rf openvswitch + +.PHONY: kdist_config +kdist_config: prep-deb-files + +.PHONY: binary-modules +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) + -- 2.30.2