SUBDIRS := @LDISKFS_SUBDIR@ . @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ @LUSTREIOKIT_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre
-DIST_SUBDIRS := @LDISKFS_DIST_SUBDIR@ @SNMP_DIST_SUBDIR@ libsysio lustre-iokit @LIBCFS_SUBDIR@ lnet lustre config contrib
-SOURCES_SUBDIRS := @LIBCFS_SUBDIR@ lnet lustre
-RPM_SUBDIRS := @LDISKFS_SUBDIR@ @LUSTREIOKIT_SUBDIR@
-MODULE_SYMVERS_DEPS = module-symvers
+DIST_SUBDIRS := ldiskfs @SNMP_DIST_SUBDIR@ libsysio lustre-iokit @LIBCFS_SUBDIR@ lnet lustre config contrib
@TESTS_TRUE@BUILD_TESTS = true
@TESTS_FALSE@BUILD_TESTS = false
@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
FIND_TAG_FILES_CMD = find $(top_srcdir) \
- -path $(top_srcdir)/ldiskfs/ldiskfs/linux-stage \
+ -path $(top_srcdir)/ldiskfs/linux-stage \
-prune -false -o -type f -name '*.[hc]'
-MAKEEACHSUBDIR = \
- for subdir in $(RPM_SUBDIRS) ; do \
- echo "Making $@ in $$subdir" ; \
- cd $$subdir ; \
- $(MAKE) $(AM_MAKEFLAGS) $@ ; \
- cd - ; \
- echo "Finished $@ in $$subdir" ; \
- done
-
# these empty rules are needed so that automake doesn't add its own
# recursive rules
etags-recursive:
if MODULES
sources: all-sources
-all-sources: $(MODULE_SYMVERS_DEPS)
- for dir in $(SOURCES_SUBDIRS) ; do \
- $(MAKE) sources -C $$dir || exit $$? ; \
- done
+all-sources: module-symvers
+ $(MAKE) sources -C lustre || exit $$?
if LINUX
all-am: modules
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)/ldiskfs/*.spec
- $(RM) $(distdir)/lustre-iokit/*.spec
find $(distdir) -name .deps -o \
-name CVS -o \
-name .svn -o \
top_distdir="$(top_distdir)" distdir="$(distdir)" \
module-dist-hook
-EXTRA_DIST = @PACKAGE_TARNAME@.spec \
- build/Makefile \
- build/Rules.in
-
-if ARCH_MIC
-EXTRA_DIST += build/gen_filelist.sh
-endif
-
-rpms-real: @PACKAGE_TARNAME@.spec dist Makefile
- CONFIGURE_ARGS=$$(echo $$(eval echo $(ac_configure_args)) | \
- sed -re 's/--(en|dis)able-tests//'); \
- if [ -n "@LINUX@" ]; then \
- CONFIGURE_ARGS=$$(echo $$(eval echo $$CONFIGURE_ARGS) | \
- sed -re 's/--with-linux=[^ ][^ ]*//'); \
- RPMARGS="--define \"kdir @LINUX@\""; \
- CONFIGURE_ARGS=$$(echo $$(eval echo $$CONFIGURE_ARGS) | \
- sed -re 's/--with-linux-obj=[^ ][^ ]*//'); \
+EXTRA_DIST = @PACKAGE_TARNAME@.spec \
+ build/Makefile \
+ build/Rules.in \
+ build/gen_filelist.sh
+
+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'" ;; \
+ esac; \
+ done; \
+ RPMARGS="--define \"configure_args $$CONFIGURE_ARGS\""; \
+ if [ -n "@LINUX@" ]; then \
+ RPMARGS="$$RPMARGS --define \"kdir @LINUX@\""; \
if [ -n "@LINUX_OBJ@" -a "@LINUX_OBJ@" != "@LINUX@" ]; then \
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" \
RPMARGS="$$RPMARGS --define \"_mandir %{_prefix}/share/man\""; \
RPMARGS="$$RPMARGS --define \"_sysconfdir %{cross_path}/etc\""; \
RPMARGS="$$RPMARGS --define \"make_args @CROSS_VARS@\""; \
- if [ -s @LINUX@/../../.ver.build ]; then \
- MPSS_VERSION=$$(sed -ne 's/DRIVERS_\(.*\)-.*/\1/p' @LINUX@/../../.ver.build); \
- if [ -n "$$MPSS_VERSION" ]; then \
- RPMARGS="$$RPMARGS --define \"cross_requires intel-mic-gpl = 2.1.$$MPSS_VERSION\""; \
- fi; \
+ if [ "@CC_TARGET_ARCH@" = "k1om-mpss-linux" ]; then \
+ RPMARGS="$$RPMARGS --define \"cross_requires mpss-bootimage\""; \
+ else \
+ RPMARGS="$$RPMARGS --define \"cross_requires intel-mic-gpl\""; \
fi; \
fi; \
- CONFIGURE_ARGS=$$(echo $$(eval echo $$CONFIGURE_ARGS) | \
- sed -re 's/--with-release=[^ ][^ ]*//'); \
- RPMARGS="$$RPMARGS --define \"configure_args $$CONFIGURE_ARGS\""; \
if [[ "X$(BUILD_TESTS)" = Xfalse ]]; then \
RPMARGS="$$RPMARGS --without lustre_tests"; \
fi; \
if [[ "X$(BUILD_SERVER)" = Xfalse ]]; then \
RPMARGS="$$RPMARGS --without servers"; \
- if [ -n "@CROSS_PATH@" ]; then \
+ if [ -n "$$CROSS_SUFFIX" ]; then \
RPMARGS="$$RPMARGS --define \"lustre_name lustre-client$$CROSS_SUFFIX\""; \
fi; \
fi; \
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; \
- eval rpmbuild $$RPMARGS -ta $(distdir).tar.gz
-
-rpms:
- @$(MAKEEACHSUBDIR)
- $(MAKE) $(AM_MAKEFLAGS) rpms-real
-
-srpm:
- @$(MAKEEACHSUBDIR)
- $(MAKE) $(AM_MAKEFLAGS) srpm-real
+ if [[ "X$(BUILD_LUSTREIOKIT)" = Xfalse ]]; then \
+ RPMARGS="$$RPMARGS --without lustre_iokit"; \
+ fi; \
+ eval rpmbuild $$RPMARGS -ts $(distdir).tar.gz
# 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
EXTRA_DIST += debian/*
endif
-module-symvers-ldiskfs:
-if LDISKFS_ENABLED
- @if [ -f @LDISKFS_DIR@/@SYMVERFILE@ ]; then \
- cat @LDISKFS_DIR@/@SYMVERFILE@ >>@SYMVERFILE@; \
- elif [ -f @LDISKFS_DIR@/ldiskfs/@SYMVERFILE@ ]; then \
- cat @LDISKFS_DIR@/ldiskfs/@SYMVERFILE@ >>@SYMVERFILE@; \
- else \
- echo -e "\n" \
- "*** Missing ldiskfs symbols. Ensure you have built ldiskfs:\n"\
- "*** - @LDISKFS_OBJ@/ldiskfs/@SYMVERFILE@\n"; \
- exit 1; \
- fi
-endif # LDISKFS_ENABLED
-
module-symvers-zfs:
if ZFS_ENABLED
@if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \
fi
endif # ZFS_ENABLED
-module-symvers: module-symvers-ldiskfs module-symvers-zfs
+module-symvers: module-symvers-zfs
CSTK=/tmp/checkstack
CSTKO=/tmp/checkstack.orig
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 \
echo -e "I have no idea how to create a META file in $(distdir).\nPlease file a bug at http://bugzilla.lustre.org/"; \
exit 1; \
fi
-if LDISKFS_ENABLED
- if [ -f $(distdir)/META -a -d $(distdir)/ldiskfs ]; then \
- cp $(distdir)/META $(distdir)/ldiskfs/META; \
- fi
-endif
git://git.whamcloud.com / fs / lustre-release.git / blobdiff