X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=debian%2Frules;h=70cc1d8bf0910dfe37998cea9b1627a6586c55e3;hp=a872fb1c3126bae87d7d6b7900b1c13b61a9e7fd;hb=2deec088aa4e1153bc00730c2b1b4bf5d40d275a;hpb=6ca43d539b2856d68d330023f04643f9e09a8cfa diff --git a/debian/rules b/debian/rules index a872fb1..70cc1d8 100755 --- a/debian/rules +++ b/debian/rules @@ -13,7 +13,6 @@ DEB_BUILD_GNU_SYSTEM = $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM) DEB_BUILD_GNU_CPU = $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU) - # whether to use module-assistant to build the kernel modules or not USE_MA = true @@ -33,11 +32,7 @@ endif export DH_COMPAT=7 # Module-assistant stuff -ifneq (,$(findstring server,$(DEB_BUILD_PROFILES))) - PACKAGE=lustre-server-modules -else - PACKAGE=lustre-client-modules -endif +PACKAGE=lustre-client-modules MA_DIR ?= /usr/share/modass -include $(MA_DIR)/include/generic.make -include $(MA_DIR)/include/common-rules.make @@ -61,22 +56,13 @@ KSRC?=$(LINUX_OBJ) KSRC_TREE?=$(LINUX) IB_OPTIONS?="" -# Packages provided for both client and server builds +# Packages PATCH_PKG=linux-patch-lustre +UTILS_PKG=lustre-utils TESTS_PKG=lustre-tests DEV_PKG=lustre-dev SOURCE_PKG=lustre-source -SOURCE_PKG=lustre-source - -# Packages that are only built for server OR client builds -# The difference is that server build contain more modules & utils -ifneq (,$(findstring server,$(DEB_BUILD_PROFILES))) - UTILS_PKG=lustre-server-utils - MODS_PKG=lustre-server-modules -else - UTILS_PKG=lustre-client-utils - MODS_PKG=lustre-client-modules -endif +MODS_PKG=lustre-client-modules #Build dir #BUILDDIR=debian/build @@ -119,18 +105,6 @@ autogen-stamp: patch-stamp fi; \ touch $@ -# This section configures the lustre-utilities packages. -# -# Both client and server builds are quite similar, as the utilities build -# must create the modules too, to produce the "osd_.so" libraries. -# -# The main difference is that the utilities build does not archive the -# modules, whereas the modules build omits the utilities, to create two -# neatly separated debian files. -# -# Note: KERNEL_SRC, KERNEL_CFG, ZFS_SRC and SPL_SRC need to be set from the -# outside. This is done by "make debs". As such, invoking "debuild" or such -# direct debian build tools will lead to a client-only build. configure: configure-stamp configure-stamp: autogen-stamp debian/control.main debian/control.modules.in dh_testdir @@ -140,33 +114,13 @@ configure-stamp: autogen-stamp debian/control.main debian/control.modules.in mkdir -p $(BUILDDIR)/build $(BUILDDIR)/lustre/contrib; \ cp build/Makefile $(BUILDDIR)/build/; \ fi - # Determine flags that are different between server/client module builds - echo "Enabled Build Profiles: $${DEB_BUILD_PROFILES}" - if echo "$${DEB_BUILD_PROFILES}" | grep -q "server"; then \ - export EXTRAFLAGS="--enable-server"; \ - else \ - export EXTRAFLAGS="--disable-server"; \ - fi; \ - if echo "$${DEB_BUILD_PROFILES}" | grep -q "zfs"; then \ - export EXTRAFLAGS="$${EXTRAFLAGS} --with-zfs=$${ZFS_SRC} --with-spl=$${SPL_SRC}"; \ - else \ - export EXTRAFLAGS="$${EXTRAFLAGS} --without-zfs" ; \ - fi; \ - if echo "$${DEB_BUILD_PROFILES}" | grep -q "ldiskfs"; then \ - export EXTRAFLAGS="$${EXTRAFLAGS} \ - --enable-ldiskfs --enable-quilt"; \ - else \ - export EXTRAFLAGS="$${EXTRAFLAGS} --disable-ldiskfs"; \ - fi; \ - echo "Final value of EXTRAFLAGS: $${EXTRAFLAGS}"; \ ( cd $(BUILDDIR) && \ - $(SRCDIR)/configure --disable-dependency-tracking \ - --with-linux=$${KERNEL_SRC} \ - --with-linux-config=$${KERNEL_CFG} \ - --disable-snmp \ - --enable-quota \ - $${EXTRAFLAGS} \ - ); \ + $(SRCDIR)/configure --disable-dependency-tracking \ + --disable-modules \ + --disable-snmp \ + --disable-client \ + --enable-quota \ + --disable-server ) touch $@ build-arch build-indep: build @@ -176,7 +130,7 @@ build-stamp: patch-stamp configure-stamp dh_testdir $(MAKE) -C $(BUILDDIR) $(PMAKEARGS) $(MAKE) -C $(BUILDDIR) DESTDIR=$(TOP_DIR)/debian/tmp install - # jump our lustre-[client|server]-modules into the control file if not using m-a + # jump our lustre-client-modules into the control file if not using m-a if ! $(USE_MA); then \ (cat debian/control.main; sed -e '1,/^$$/d' -e "s/_KVERS_/$(KVER)/g" < debian/control.modules.in) > debian/control; \ for file in debian/*_KVERS_*; do \ @@ -317,7 +271,6 @@ binary-$(SOURCE_PKG): build-stamp # if only we could use m-a for this, but this stupid "compliant.list" # thing fouls that up binary-kern-mods: - # Build client or server modules mkdir -p debian/m-a_root/usr_src/modules ln -s ../../../../ debian/m-a_root/usr_src/modules/lustre m-a -t -u debian/m-a_root/ -d -v -k $(KSRC) build lustre @@ -326,7 +279,7 @@ binary-kern-mods: # an alternative (to module-assistant) method of building the kernel modules binary-$(MODS_PKG): build-stamp if ! $(USE_MA); then \ - cp debian/$(MODS_PKG).install debian/$(MODS_PKG)-$(KVER).install ; \ + cp debian/lustre-client-modules.install debian/lustre-client-modules-$(KVER).install ; \ dh_testdir; \ dh_testroot; \ dh_installdirs -p $(MODS_PKG)-$(KVER); \ @@ -343,7 +296,6 @@ binary-$(MODS_PKG): build-stamp dh_builddeb -p $(MODS_PKG)-$(KVER); \ fi - ### ### For module-assistant ### @@ -381,39 +333,20 @@ kdist_config: prep-deb-files patch-stamp #-$(MAKE) -C $(KSRC) prepare scripts # touch files to same date, to avoid auto* find . -type f -print0 | xargs -0 touch -r COPYING \; - # Determine flags that are different between server/client module builds - # Note: It doesn't seem possible to *only* build modules. - echo "Enabled Build Profiles: $${DEB_BUILD_PROFILES}" - if echo "$${DEB_BUILD_PROFILES}" | grep -q "server"; then \ - export EXTRAFLAGS="--enable-server"; \ - else \ - export EXTRAFLAGS="--disable-server"; \ - fi; \ - if echo "$${DEB_BUILD_PROFILES}" | grep -q "zfs"; then \ - export EXTRAFLAGS="$${EXTRAFLAGS} --with-zfs=$${ZFS_SRC} --with-spl=$${SPL_SRC}"; \ - else \ - export EXTRAFLAGS="$${EXTRAFLAGS} --without-zfs" ; \ - fi; \ - if echo "$${DEB_BUILD_PROFILES}" | grep -q "ldiskfs"; then \ - export EXTRAFLAGS="$${EXTRAFLAGS} \ - --enable-ldiskfs --enable-quilt"; \ - else \ - export EXTRAFLAGS="$${EXTRAFLAGS} --disable-ldiskfs"; \ - fi; \ - echo "Final value of EXTRAFLAGS: $${EXTRAFLAGS}"; \ + # Doesn't seem possible to only build modules... ./configure --with-linux=$(KSRC_TREE) \ - --with-linux-obj=$(KSRC) \ - --disable-dependency-tracking \ - --disable-doc \ - --disable-iokit \ - --disable-snmp \ - --disable-tests \ - --disable-utils \ - --enable-quota \ - --with-kmp-moddir=updates \ - $${EXTRAFLAGS} \ - $(IB_OPTIONS) - + --with-linux-obj=$(KSRC) \ + --disable-server \ + --disable-quilt \ + --disable-dependency-tracking \ + --disable-doc \ + --disable-utils \ + --disable-iokit \ + --disable-snmp \ + --disable-tests \ + --enable-quota \ + --with-kmp-moddir=updates \ + $(IB_OPTIONS) kdist_configure: kdist_config @@ -444,7 +377,7 @@ clean: dpatch deapply-all -v -$(MAKE) distclean rm -rf debian/substvars debian/*.bak debian/*~ *~ *-stamp debian/$(PATCH_PKG) - ls -d debian/lustre-*-modules-* | grep -v _KVERS_ | xargs rm -f || true + ls -d debian/lustre-client-modules-* | grep -v _KVERS_ | xargs rm -f || true # only remove this if the clean was not called from kdist_clean if [ "$$MA_SOURCE_PKG" = "" ]; then \ rm -rf debian/m-a_root; \