76 lines
3.6 KiB
Diff
76 lines
3.6 KiB
Diff
|
commit 4d2c1fa08842cf8d60cc3dc1dde30ecff585103c
|
||
|
|
Author: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
|
||
|
|
Date: Thu Jun 8 11:11:01 2017 +0200
|
||
|
|
|
||
|
|
eth-ff suse build fixes
|
||
|
|
|
||
|
|
Signed-off-by: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
|
||
|
|
|
||
|
|
diff --git Makerules/Defs.Flags Makerules/Defs.Flags
|
||
|
|
index e84324356f0a..9e34eafb8bad 100755
|
||
|
|
--- Makerules/Defs.Flags
|
||
|
|
+++ Makerules/Defs.Flags
|
||
|
|
@@ -53,8 +53,8 @@ CCDEPENDFLAGS = $(CCFLAGS) $(DEPENDENV) $(DEPENDPROJ) $(DEPENDMOD) $(DEPENDLOCA
|
||
|
|
|
||
|
|
CINCLUDE_DIRS = $(LOCAL_INCLUDE_DIRS) $(MOD_INCLUDE_DIRS) $(PROJ_INCLUDE_DIRS) $(SYS_INCLUDE_DIRS)
|
||
|
|
ifndef KERNELRELEASE
|
||
|
|
-CFLAGS = $(CMACH) $(CSYS) $(CENV) $(CENVFS) $(CPROJ) $(CMOD) $(CLOCAL) $(COPT) $(CDEBUG) $(CINCSRCH)
|
||
|
|
-CCFLAGS = $(CCMACH) $(CCSYS) $(CCENV) $(CCENVFS) $(CCPROJ) $(CCMOD) $(CCLOCAL) $(CCOPT) $(CCDEBUG) $(CINCSRCH)
|
||
|
|
+CFLAGS = $(CMACH) $(CSYS) $(CENV) $(CENVFS) $(CPROJ) $(CMOD) $(CLOCAL) $(COPT) $(CDEBUG) $(CINCSRCH) $(RPM_OPT_FLAGS)
|
||
|
|
+CCFLAGS = $(CCMACH) $(CCSYS) $(CCENV) $(CCENVFS) $(CCPROJ) $(CCMOD) $(CCLOCAL) $(CCOPT) $(CCDEBUG) $(CINCSRCH) $(RPM_OPT_FLAGS)
|
||
|
|
|
||
|
|
LDFLAGS = $(LDMACH) $(LDSYS) $(LDENV) $(LDENVFS) $(LDPROJ) $(LDMOD) $(LDLOCAL) $(LDLIBSRCH) $(LDSTRIP) $(LDOUTPUT)
|
||
|
|
LD_LIB_DIRS = $(LOCAL_LIB_DIRS) $(MOD_LIB_DIRS) $(PROJ_LIB_DIRS) $(SYS_LIB_DIRS)
|
||
|
|
diff --git Makerules/Target.LINUX.INTEL.X86_64 Makerules/Target.LINUX.INTEL.X86_64
|
||
|
|
index a373262676b5..3a6687d563cc 100755
|
||
|
|
--- Makerules/Target.LINUX.INTEL.X86_64
|
||
|
|
+++ Makerules/Target.LINUX.INTEL.X86_64
|
||
|
|
@@ -132,6 +132,7 @@ endif
|
||
|
|
|
||
|
|
endif
|
||
|
|
CKERNEL+=-include $(TL_DIR)/Makerules/LINUX/$(BUILD_TARGET).$(BUILD_TARGET_OS_VENDOR).$(BUILD_TARGET_OS_VERSION).h
|
||
|
|
+CKERNEL+= $(RPM_OPT_FLAGS)
|
||
|
|
|
||
|
|
# Include directories for kernel
|
||
|
|
KERNELDIR=/lib/modules/$(BUILD_TARGET_OS_VERSION)/build
|
||
|
|
diff --git OpenIb_Host/LINUX/Makefile OpenIb_Host/LINUX/Makefile
|
||
|
|
index e7e8a4e7367b..5d2da73f8697 100644
|
||
|
|
--- OpenIb_Host/LINUX/Makefile
|
||
|
|
+++ OpenIb_Host/LINUX/Makefile
|
||
|
|
@@ -283,7 +283,7 @@ package:
|
||
|
|
rm -rf $(RELEASE_DIR)/IntelEth-Tools-FF.$$ver ; \
|
||
|
|
mkdir -p $(RELEASE_DIR)/IntelEth-Tools-FF.$$ver ; \
|
||
|
|
cp -r $$dir/arch $$dir/distro $$dir/distro_version $$dir/os_id $(RELEASE_DIR)/IntelEth-Tools-FF.$$ver 2>/dev/null; \
|
||
|
|
- cp -r $$dir/INSTALL $$dir/comp.pl $$dir/README $$dir/version $(RELEASE_DIR)/IntelEth-Tools-FF.$$ver ; \
|
||
|
|
+ cp -r $$dir/INSTALL $$dir/comp.pl $$dir/version $(RELEASE_DIR)/IntelEth-Tools-FF.$$ver ; \
|
||
|
|
echo "$(RELEASE_DIR)/IntelEth-Tools-FF.$$ver.tgz" >> $(TL_DIR)/packaged_files; \
|
||
|
|
echo "$(RELEASE_DIR)/IntelEth-Tools-FF.$$ver.tgz" >> $(TL_DIR)/dist_files; \
|
||
|
|
echo "$(RELEASE_DIR)/IntelEth-Tools.$$ver.tgz" >> $(TL_DIR)/packaged_files; \
|
||
|
|
diff --git OpenIb_Host/ff_build.sh OpenIb_Host/ff_build.sh
|
||
|
|
index 4037aeeb0b1d..f98723d69ea6 100755
|
||
|
|
--- OpenIb_Host/ff_build.sh
|
||
|
|
+++ OpenIb_Host/ff_build.sh
|
||
|
|
@@ -57,7 +57,13 @@ export PRODUCT=${PRODUCT:-OPENIB_FF}
|
||
|
|
# for FF the kernel rev is not important. We simply use the kernel rev
|
||
|
|
# of the running kernel. While BUILD_TARGET_OS_VERSION is needed by Makerules
|
||
|
|
# it will have no impact on what is actually built for FF
|
||
|
|
-export BUILD_TARGET_OS_VERSION=${BUILD_TARGET_OS_VERSION:-`uname -r`}
|
||
|
|
+export BUILD_TARGET_OS_VERSION=`uname -r`
|
||
|
|
+export BUILD_PLATFORM_OS_VENDOR="SuSE"
|
||
|
|
+export BUILD_TARGET_OS_VENDOR="SuSE"
|
||
|
|
+export BUILD_PLATFORM_OS_VENDOR_VERSION="OPENSUSE_BUILD_SYSTEM"
|
||
|
|
+export BUILD_TARGET_OS_VENDOR=$BUILD_PLATFORM_OS_VENDOR
|
||
|
|
+export BUILD_TARGET_OS_VENDOR_VERSION=$BUILD_PLATFORM_OS_VENDOR_VERSION
|
||
|
|
+
|
||
|
|
setver $BUILD_TARGET_OS_VENDOR $BUILD_TARGET_OS_VERSION
|
||
|
|
export OPA_FEATURE_SET=opa10
|
||
|
|
|
||
|
|
@@ -72,6 +78,7 @@ shift
|
||
|
|
set -x
|
||
|
|
{
|
||
|
|
echo "Environment:"
|
||
|
|
+ export BUILD_TARGET_OS_VERSION="4.4"
|
||
|
|
env
|
||
|
|
echo "----------------------------------------------------------------------------"
|
||
|
|
echo
|