@LDISKFS_ENABLED_FALSE@BUILD_OSD_LDISKFS = false
@ZFS_ENABLED_TRUE@BUILD_OSD_ZFS = true
@ZFS_ENABLED_FALSE@BUILD_OSD_ZFS = false
+@BUILD_LUSTREIOKIT_TRUE@BUILD_LUSTREIOKIT = true
+@BUILD_LUSTREIOKIT_FALSE@BUILD_LUSTREIOKIT = false
AUTOMAKE_OPTIONS = foreign
modules: $(DEP) all-sources
$(MAKE) CC="$(CC)" $(CROSS_VARS) -C $(LINUX_OBJ) \
-f $(PWD)/build/Makefile LUSTRE_LINUX_CONFIG=$(LINUX_CONFIG) \
- LINUXINCLUDE='$(EXTRA_LNET_INCLUDE) -I$$(srctree)/arch/$$(SRCARCH)/include -I$$(srctree)/arch/$$(SRCARCH)/include/generated -Iinclude $$(if $$(KBUILD_SRC),-Iinclude2 -I$$(srctree)/include) -I$$(srctree)/arch/$$(SRCARCH)/include/uapi -Iarch/$$(SRCARCH)/include/generated/uapi -I$$(srctree)/include/uapi -Iinclude/generated/uapi -include $(CONFIG_INCLUDE)' \
+ LINUXINCLUDE='-I$$(srctree)/arch/$$(SRCARCH)/include -I$$(srctree)/arch/$$(SRCARCH)/include/generated -Iinclude $$(if $$(KBUILD_SRC),-Iinclude2 -I$$(srctree)/include) -I$$(srctree)/arch/$$(SRCARCH)/include/uapi -Iarch/$$(SRCARCH)/include/generated/uapi -I$$(srctree)/include/uapi -Iinclude/generated/uapi -include $(CONFIG_INCLUDE)' \
$(MODULE_TARGET)=$(PWD) -o tmp_include_depends -o scripts -o \
include/config/MARKER $@
endif # LINUX
endif # MODULES
dist-hook:
- $(RM) $(distdir)/lustre-iokit/*.spec
find $(distdir) -name .deps -o \
-name CVS -o \
-name .svn -o \
build/Rules.in \
build/gen_filelist.sh
-rpms-real: @PACKAGE_TARNAME@.spec dist Makefile
+rpms: @PACKAGE_TARNAME@.spec dist Makefile
@CONFIGURE_ARGS=""; \
for arg in $(ac_configure_args); do \
case $$arg in \
--with-release=* ) ;; \
+ --with-kmp-moddir=* ) ;; \
--enable-tests | --disable-tests ) ;; \
--with-linux=* | --with-linux-obj=* ) ;; \
* ) CONFIGURE_ARGS="$$CONFIGURE_ARGS '$$arg'" ;; \
RPMARGS="$$RPMARGS --define \"kobjdir @LINUX_OBJ@\""; \
fi; \
fi; \
+ if [ -n "@KMP_MODDIR@" ]; then \
+ RPMARGS="$$RPMARGS --define \"kmoddir @KMP_MODDIR@\""; \
+ fi; \
if [ -n "@CROSS_PATH@" ]; then \
if [[ "X$(BUILD_SERVER)" = Xtrue ]]; then \
echo -e "\n" \
if [[ "X$(BUILD_OSD_ZFS)" = Xtrue ]]; then \
RPMARGS="$$RPMARGS --with zfs"; \
fi; \
+ if [[ "X$(BUILD_LUSTREIOKIT)" = Xfalse ]]; then \
+ RPMARGS="$$RPMARGS --without lustre_iokit"; \
+ fi; \
echo "Building Lustre RPM with $$RPMARGS"; \
eval rpmbuild $$RPMARGS -ta $(distdir).tar.gz
-srpm-real: @PACKAGE_TARNAME@.spec dist Makefile
+srpm: @PACKAGE_TARNAME@.spec dist Makefile
if [[ "X$(BUILD_TESTS)" = Xfalse ]]; then \
RPMARGS="--without lustre_tests"; \
fi; \
+ if [[ "X$(BUILD_LUSTREIOKIT)" = Xfalse ]]; then \
+ RPMARGS="$$RPMARGS --without lustre_iokit"; \
+ fi; \
eval rpmbuild $$RPMARGS -ts $(distdir).tar.gz
-rpms:
-if BUILD_LUSTREIOKIT
- $(MAKE) -C @LUSTREIOKIT_SUBDIR@ $(AM_MAKEFLAGS) $@
-endif
- $(MAKE) $(AM_MAKEFLAGS) rpms-real
-
-srpm:
-if BUILD_LUSTREIOKIT
- $(MAKE) -C @LUSTREIOKIT_SUBDIR@ $(AM_MAKEFLAGS) $@
-endif
- $(MAKE) $(AM_MAKEFLAGS) srpm-real
-
# In the debs target, first make sure what's in the changelog reflects
# the software version. Here's how we could dig the version out of the
# autoconf version file directly:
rm -f ${CSTK} ${CSTKO}
module-dist-hook:
- if [ -d CVS -o -d .git ]; then \
- perl lustre/scripts/make_META.pl > $(distdir)/META; \
+ if [ -d .git ]; then \
+ perl lustre/scripts/version_tag.pl --make_META > $(distdir)/META; \
elif [ -f META ]; then \
cp META $(distdir)/META; \
else \