LU-3188 osc: shorten IO calling path

[fs/lustre-release.git] / autoMakefile.am

diff --git a/autoMakefile.am b/autoMakefile.am
index 768deeb..d3ae280 100644 (file)
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -72,7 +72,7 @@ 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
@@ -129,9 +129,7 @@ rpms: @PACKAGE_TARNAME@.spec dist Makefile
                RPMARGS="$$RPMARGS --define \"_mandir %{_prefix}/share/man\""; \
                RPMARGS="$$RPMARGS --define \"_sysconfdir %{cross_path}/etc\""; \
                RPMARGS="$$RPMARGS --define \"make_args @CROSS_VARS@\""; \
-               if [ "@CC_TARGET_ARCH@" = "k1om-mpss-linux" ]; then \
-                       RPMARGS="$$RPMARGS --define \"cross_requires mpss-bootimage\""; \
-               else \
+               if [ "@CC_TARGET_ARCH@" = "x86_64-k1om-linux" ]; then \
                        RPMARGS="$$RPMARGS --define \"cross_requires intel-mic-gpl\""; \
                fi; \
        fi; \