X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=debian%2Frules;h=70cc1d8bf0910dfe37998cea9b1627a6586c55e3;hb=02e0adddf474091a182e0721febb969564b6398b;hp=39dcbe9f33547c078d9b8e85adc3b91e9393deb2;hpb=2bac6e62066644385e379d90bbdbbbeab626fe89;p=fs%2Flustre-release.git diff --git a/debian/rules b/debian/rules index 39dcbe9..70cc1d8 100755 --- a/debian/rules +++ b/debian/rules @@ -28,8 +28,8 @@ endif #CC?=gcc-3.3 #export CC -# This is the debhelper compatability version to use. -export DH_COMPAT=5 +# This is the debhelper compatibility version to use. +export DH_COMPAT=7 # Module-assistant stuff PACKAGE=lustre-client-modules @@ -40,30 +40,27 @@ MA_DIR ?= /usr/share/modass ARCH=$(shell dpkg --print-architecture) TOP_DIR:=$(shell pwd) -# the lustre build process. This is $(KERNEL_VERSION) +# This is the Lustre version VERSION=$(shell sed -n -e '1s/.*(\(.*\)) .*/\1/p' debian/changelog) -#SUPPORTED_KERNELS=2.6.27 -SUPPORTED_KERNELS=2.6.18 2.6.20 2.6.22 UPVERSION=$(shell echo $VERSION | sed -e 's/-[^-]*$$//') -#KERNEL_VERSION=2.6.27 -# the kernel version to build all of this with -#KVER=2.6.27-11-generic -# if the above is not set, default to whatever kernel is booted -KVER?=$$(uname -r) -KERNEL_TREE=/lib/modules/$(KVER)/build + +# KVER is set to LINUXRELEASE being by autoconf which is either +# $(uname -r) or the version of the source specified by the user +KVER?=$(LINUXRELEASE) + # KVERS, KSRC are the kernel version and source to use when building lustre # Will be the default when building lustre-utils, etc but whatever module-assistant # supplied when building modules -KVERS?=$(KERNEL_VERSION) -#KSRC?=$(KERNEL_TREE) -KSRC=$(KERNEL_TREE) +KVERS?=$(KVER) +KSRC?=$(LINUX_OBJ) +KSRC_TREE?=$(LINUX) +IB_OPTIONS?="" # Packages PATCH_PKG=linux-patch-lustre UTILS_PKG=lustre-utils TESTS_PKG=lustre-tests DEV_PKG=lustre-dev -LIB_PKG=liblustre SOURCE_PKG=lustre-source MODS_PKG=lustre-client-modules @@ -75,6 +72,11 @@ MODS_PKG=lustre-client-modules BUILDDIR=. SRCDIR=. +AVAIL_CPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1) +ifneq ($(AVAIL_CPUS),1) + PMAKEARGS := -j $(AVAIL_CPUS) +endif + autogen: autogen-stamp autogen-stamp: patch-stamp # see if any patches requires us to run autogen @@ -84,19 +86,22 @@ autogen-stamp: patch-stamp # needed autogen.sh scripts # see https://bugzilla.lustre.org/attachment.cgi?id=27156 # for an example) - if grep "^--- .*\/autoconf" debian/patches/*; then \ - if [ ! -f autogen.sh ]; then \ + if grep -e "^--- .*\/autoconf\/" \ + -e "^--- .*\/autoMakefile\.am" \ + -e "^--- .*\/Makefile\.am" \ + -e "^--- .*\/configure\.ac" \ + -e "^--- .*\/configure\.in" \ + debian/patches/*; then \ + if [ ! -f build/autogen.sh ]; then \ echo "You have patches which require autogen.sh to be run, but it doesn't exist"; \ echo "Please see https://bugzilla.lustre.org/attachment.cgi?id=27156"; \ exit 1; \ fi; \ cp /usr/share/misc/config.sub config.sub; \ - cp /usr/share/misc/config.sub libsysio/config.sub; \ cp /usr/share/misc/config.sub ldiskfs/config.sub; \ cp /usr/share/misc/config.guess config.guess; \ - cp /usr/share/misc/config.guess libsysio/config.guess; \ cp /usr/share/misc/config.guess ldiskfs/config.guess; \ - sh ./autogen.sh; \ + sh build/autogen.sh; \ fi; \ touch $@ @@ -106,10 +111,8 @@ configure-stamp: autogen-stamp debian/control.main debian/control.modules.in # touch files to same date, to avoid auto* find . -type f -print0 | xargs -0 touch -r COPYING; \ if [ "$(BUILDDIR)" != "." ]; then \ - mkdir -p $(BUILDDIR)/build $(BUILDDIR)/lustre/contrib $(BUILDDIR)/libsysio; \ + mkdir -p $(BUILDDIR)/build $(BUILDDIR)/lustre/contrib; \ cp build/Makefile $(BUILDDIR)/build/; \ - cp lustre/contrib/mpich-*.patch $(BUILDDIR)/lustre/contrib/; \ - ln -s ../../../libsysio/include $(BUILDDIR)/libsysio/; \ fi ( cd $(BUILDDIR) && \ $(SRCDIR)/configure --disable-dependency-tracking \ @@ -125,7 +128,7 @@ build-arch build-indep: build build: build-stamp build-stamp: patch-stamp configure-stamp dh_testdir - $(MAKE) -C $(BUILDDIR) + $(MAKE) -C $(BUILDDIR) $(PMAKEARGS) $(MAKE) -C $(BUILDDIR) DESTDIR=$(TOP_DIR)/debian/tmp install # jump our lustre-client-modules into the control file if not using m-a if ! $(USE_MA); then \ @@ -140,8 +143,9 @@ build-stamp: patch-stamp configure-stamp # let's try and operate as close as the user would and not build modules # here (for now) # instead we will build the modules with m-a in the "make debs" target -# binary-arch: binary-$(UTILS_PKG) binary-$(TESTS_PKG) binary-$(DEV_PKG) binary-$(LIB_PKG) binary-$(MODS_PKG) binary-kern-mods -binary-arch: binary-$(UTILS_PKG) binary-$(TESTS_PKG) binary-$(DEV_PKG) binary-$(LIB_PKG) +# binary-arch: binary-$(UTILS_PKG) binary-$(TESTS_PKG) binary-$(DEV_PKG) \ +# binary-$(MODS_PKG) binary-kern-mods +binary-arch: binary-$(UTILS_PKG) binary-$(TESTS_PKG) binary-$(DEV_PKG) binary-indep: binary-$(PATCH_PKG) binary-$(SOURCE_PKG) @@ -193,7 +197,6 @@ binary-$(UTILS_PKG): build-stamp dh_installman -p $(UTILS_PKG) dh_install -p $(UTILS_PKG) dh_makeshlibs -p $(UTILS_PKG) - dh_shlibdeps -L $(LIB_PKG) -l debian/$(LIB_PKG)/usr/lib dh_installexamples -p $(UTILS_PKG) dh_installchangelogs -p $(UTILS_PKG) lustre/ChangeLog dh_compress -p $(UTILS_PKG) @@ -212,7 +215,6 @@ binary-$(TESTS_PKG): build-stamp dh_installman -p $(TESTS_PKG) dh_install -p $(TESTS_PKG) dh_makeshlibs -p $(TESTS_PKG) - dh_shlibdeps -L $(LIB_PKG) -l debian/$(LIB_PKG)/usr/lib dh_installexamples -p $(TESTS_PKG) dh_installchangelogs -p $(TESTS_PKG) lustre/ChangeLog dh_compress -p $(TESTS_PKG) @@ -237,23 +239,6 @@ binary-$(DEV_PKG): build-stamp dh_md5sums -p $(DEV_PKG) dh_builddeb -p $(DEV_PKG) -binary-$(LIB_PKG): build-stamp - dh_testdir - dh_testroot - dh_installdirs -p $(LIB_PKG) - dh_installdocs -p $(LIB_PKG) - dh_install -p $(LIB_PKG) - dh_makeshlibs -p $(LIB_PKG) - dh_shlibdeps -L $(LIB_PKG) -l debian/$(LIB_PKG)/usr/lib - dh_installchangelogs -p $(LIB_PKG) lustre/ChangeLog - dh_compress -p $(LIB_PKG) - dh_installdeb -p $(LIB_PKG) - dh_strip -p $(LIB_PKG) - dh_fixperms -p $(LIB_PKG) - dh_gencontrol -p $(LIB_PKG) - dh_md5sums -p $(LIB_PKG) - dh_builddeb -p $(LIB_PKG) - binary-$(SOURCE_PKG): build-stamp dh_testdir dh_testroot @@ -301,7 +286,6 @@ binary-$(MODS_PKG): build-stamp dh_installdocs -p $(MODS_PKG)-$(KVER); \ dh_install -p $(MODS_PKG)-$(KVER); \ dh_makeshlibs -p $(MODS_PKG)-$(KVER); \ - dh_shlibdeps -L $(LIB_PKG) -l debian/$(LIB_PKG)/usr/lib; \ dh_installchangelogs -p $(MODS_PKG)-$(KVER) lustre/ChangeLog; \ dh_compress -p $(MODS_PKG)-$(KVER); \ dh_installdeb -p $(MODS_PKG)-$(KVER); \ @@ -350,27 +334,29 @@ kdist_config: prep-deb-files patch-stamp # touch files to same date, to avoid auto* find . -type f -print0 | xargs -0 touch -r COPYING \; # Doesn't seem possible to only build modules... - ./configure --with-linux=$(KSRC) \ + ./configure --with-linux=$(KSRC_TREE) \ + --with-linux-obj=$(KSRC) \ + --disable-server \ --disable-quilt \ --disable-dependency-tracking \ --disable-doc \ --disable-utils \ - --disable-liblustre \ + --disable-iokit \ --disable-snmp \ - --enable-ldiskfs \ - --disable-zerocopy \ --disable-tests \ - --enable-quota + --enable-quota \ + --with-kmp-moddir=updates \ + $(IB_OPTIONS) -kdist_configure: kdist_config +kdist_configure: kdist_config # the binary-modules rule is invoked by module-assistant while processing the # kdist* targets. It is called by module-assistant or make-kpkg and *not* # during a normal build binary-modules: prep-deb-files dh_testroot - dh_clean -k - $(MAKE) + dh_prep + $(MAKE) $(PMAKEARGS) $(MAKE) install DESTDIR=$(CURDIR)/debian/$(PKGNAME) # Remove stuff that doesn't belong (no module-only target) cd $(CURDIR)/debian/$(PKGNAME) && rm -rf usr sbin etc @@ -383,12 +369,12 @@ binary-modules: prep-deb-files dh_gencontrol -- -v$(VERSION) dh_md5sums -p $(PKGNAME) dh_builddeb --destdir=$(DEB_DESTDIR) -p $(PKGNAME) - dh_clean -k -p $(PKGNAME) + dh_prep -p $(PKGNAME) clean: dh_testdir dh_testroot - dpatch deapply-all + dpatch deapply-all -v -$(MAKE) distclean rm -rf debian/substvars debian/*.bak debian/*~ *~ *-stamp debian/$(PATCH_PKG) ls -d debian/lustre-client-modules-* | grep -v _KVERS_ | xargs rm -f || true @@ -403,11 +389,11 @@ clean: patch: patch-stamp patch-stamp: - dpatch apply-all + dpatch apply-all -v touch $@ unpatch: - dpatch deapply-all + dpatch deapply-all -v rm -rf debian/patched patch-stamp .PHONY: binary-arch clean source diff binary binary-indep binary-arch install configure