Hello community, here is the log from the commit of package opa-ff for openSUSE:Factory checked in at 2017-08-29 11:45:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opa-ff (Old) and /work/SRC/openSUSE:Factory/.opa-ff.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "opa-ff" Tue Aug 29 11:45:18 2017 rev:2 rq:519124 version:10.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/opa-ff/opa-ff.changes 2017-08-12 20:25:01.246372812 +0200 +++ /work/SRC/openSUSE:Factory/.opa-ff.new/opa-ff.changes 2017-08-29 11:46:18.665458847 +0200 @@ -1,0 +2,11 @@ +Mon Aug 28 12:01:45 UTC 2017 - nmoreychaisemartin@suse.com + +- Updates patches to latest sources: + * opa-ff_fix_suse_build_issue.patch replaced by + opa-ff-suse-build-fixes.patch + * 0001-Add-shebang-for-exp-files.patch replaced by + opa-ff-add-shebang-for-exp-files.patch +- Add opa-ff-sigset-was-removed.patch to build with the latest glibc + which does not expose <bits/sigset.h> anymore + +------------------------------------------------------------------- Old: ---- 0001-Add-shebang-for-exp-files.patch opa-ff_fix_suse_build_issue.patch New: ---- opa-ff-add-shebang-for-exp-files.patch opa-ff-sigset-was-removed.patch opa-ff-suse-build-fixes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opa-ff.spec ++++++ --- /var/tmp/diff_new_pack.8ZVmsD/_old 2017-08-29 11:46:21.449066476 +0200 +++ /var/tmp/diff_new_pack.8ZVmsD/_new 2017-08-29 11:46:21.497059711 +0200 @@ -1,7 +1,7 @@ # # spec file for package opa-ff # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,17 +27,18 @@ Url: http://www.intel.com/ Source: opa-ff-%{version}.tar.gz Source1: opa-ff.rpmlintrc -Patch1: opa-ff_fix_suse_build_issue.patch -Patch2: 0001-Add-shebang-for-exp-files.patch +Patch1: opa-ff-add-shebang-for-exp-files.patch +Patch2: opa-ff-suse-build-fixes.patch +Patch3: opa-ff-sigset-was-removed.patch BuildRequires: gcc-c++ +BuildRequires: infiniband-diags-devel BuildRequires: libexpat-devel -BuildRequires: rdma-core-devel -BuildRequires: librdmacm1 BuildRequires: libopenssl-devel +BuildRequires: librdmacm1 BuildRequires: ncurses-devel +BuildRequires: rdma-core-devel BuildRequires: tcl-devel BuildRequires: zlib-devel -BuildRequires: infiniband-diags-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build #Currently ONLY builds on x86_64 @@ -77,8 +78,8 @@ %package -n opa-address-resolution-devel Summary: Development files for the Address Resolution manager Group: Development/Libraries/C and C++ -Requires: opa-basic-tools Requires: opa-address-resolution = %{version} +Requires: opa-basic-tools %description -n opa-address-resolution-devel This package contains the include files and libraries @@ -88,6 +89,7 @@ %setup -q -n opa-ff-%{version} %patch1 %patch2 +%patch3 %build export RPM_OPT_FLAGS @@ -134,7 +136,6 @@ %define release_string IntelOPA-Tools-FF.$BUILD_TARGET_OS_ID.$MODULEVERSION - #rm -rf $RPM_BUILD_ROOT mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_sbindir} @@ -208,7 +209,6 @@ cp -t %{buildroot}%{_libdir}/ibacm libdsap.so.* ln -s libdsap.so.* %{buildroot}%{_libdir}/ibacm/libdsap.so - ln -s /etc/opa/sysconfig/allhosts %{buildroot}/etc/sysconfig/opa/allhosts ln -s /etc/opa/sysconfig/chassis %{buildroot}/etc/sysconfig/opa/chassis ln -s /etc/opa/sysconfig/esm_chassis %{buildroot}//etc/sysconfig/opa/esm_chassis @@ -288,7 +288,6 @@ #cd /opt/opa/src/mpi_apps >/dev/null 2>&1 #make -k clean >/dev/null 2>&1 || : # suppress all errors and return codes from the make clean. - %post -n opa-address-resolution -p /sbin/ldconfig %postun -n opa-address-resolution -p /sbin/ldconfig ++++++ opa-ff-add-shebang-for-exp-files.patch ++++++ diff --git IbaTools/FastFabric/chassis_configure.exp IbaTools/FastFabric/chassis_configure.exp index f18397f..38fb6d9 100644 --- IbaTools/FastFabric/chassis_configure.exp +++ IbaTools/FastFabric/chassis_configure.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git IbaTools/FastFabric/chassis_fmconfig.exp IbaTools/FastFabric/chassis_fmconfig.exp index 986d799..ed26fe5 100755 --- IbaTools/FastFabric/chassis_fmconfig.exp +++ IbaTools/FastFabric/chassis_fmconfig.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git IbaTools/FastFabric/chassis_fmcontrol.exp IbaTools/FastFabric/chassis_fmcontrol.exp index ea3d546..5c67c2f 100755 --- IbaTools/FastFabric/chassis_fmcontrol.exp +++ IbaTools/FastFabric/chassis_fmcontrol.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git IbaTools/FastFabric/chassis_fmgetconfig.exp IbaTools/FastFabric/chassis_fmgetconfig.exp index dff298e..75b8abc 100755 --- IbaTools/FastFabric/chassis_fmgetconfig.exp +++ IbaTools/FastFabric/chassis_fmgetconfig.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp index 99c38c1..cf63eac 100755 --- IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp +++ IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git IbaTools/FastFabric/chassis_fmsecurityfiles.exp IbaTools/FastFabric/chassis_fmsecurityfiles.exp index b45aff1..a650423 100755 --- IbaTools/FastFabric/chassis_fmsecurityfiles.exp +++ IbaTools/FastFabric/chassis_fmsecurityfiles.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git IbaTools/FastFabric/chassis_getconfig.exp IbaTools/FastFabric/chassis_getconfig.exp index 7454afc..f4415f1 100644 --- IbaTools/FastFabric/chassis_getconfig.exp +++ IbaTools/FastFabric/chassis_getconfig.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git IbaTools/FastFabric/chassis_reboot.exp IbaTools/FastFabric/chassis_reboot.exp index f59330f..c2ca75f 100755 --- IbaTools/FastFabric/chassis_reboot.exp +++ IbaTools/FastFabric/chassis_reboot.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git IbaTools/FastFabric/chassis_upgrade.exp IbaTools/FastFabric/chassis_upgrade.exp index c255e01..b2a798a 100755 --- IbaTools/FastFabric/chassis_upgrade.exp +++ IbaTools/FastFabric/chassis_upgrade.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git IbaTools/FastFabric/configipoib.exp IbaTools/FastFabric/configipoib.exp index 7918866..e1207d4 100755 --- IbaTools/FastFabric/configipoib.exp +++ IbaTools/FastFabric/configipoib.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git IbaTools/FastFabric/ff_function.exp IbaTools/FastFabric/ff_function.exp index 3590661..c151b90 100755 --- IbaTools/FastFabric/ff_function.exp +++ IbaTools/FastFabric/ff_function.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git IbaTools/FastFabric/ipoibping.exp IbaTools/FastFabric/ipoibping.exp index 17b0486..5520c4b 100755 --- IbaTools/FastFabric/ipoibping.exp +++ IbaTools/FastFabric/ipoibping.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git IbaTools/FastFabric/load.exp IbaTools/FastFabric/load.exp index 91991e0..894ede3 100755 --- IbaTools/FastFabric/load.exp +++ IbaTools/FastFabric/load.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git IbaTools/FastFabric/mpiperf.exp IbaTools/FastFabric/mpiperf.exp index 630dc66..5e1cb17 100755 --- IbaTools/FastFabric/mpiperf.exp +++ IbaTools/FastFabric/mpiperf.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git IbaTools/FastFabric/mpiperfdeviation.exp IbaTools/FastFabric/mpiperfdeviation.exp index a7fc679..ebdf07e 100755 --- IbaTools/FastFabric/mpiperfdeviation.exp +++ IbaTools/FastFabric/mpiperfdeviation.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git IbaTools/FastFabric/reboot.exp IbaTools/FastFabric/reboot.exp index f27b50a..03d98ce 100755 --- IbaTools/FastFabric/reboot.exp +++ IbaTools/FastFabric/reboot.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git IbaTools/FastFabric/sacache.exp IbaTools/FastFabric/sacache.exp index 40a0340..20ef370 100755 --- IbaTools/FastFabric/sacache.exp +++ IbaTools/FastFabric/sacache.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git IbaTools/FastFabric/switch_capture.exp IbaTools/FastFabric/switch_capture.exp index ed149a3..85e20f6 100755 --- IbaTools/FastFabric/switch_capture.exp +++ IbaTools/FastFabric/switch_capture.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git IbaTools/FastFabric/switch_configure.exp IbaTools/FastFabric/switch_configure.exp index 3516482..5098119 100644 --- IbaTools/FastFabric/switch_configure.exp +++ IbaTools/FastFabric/switch_configure.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git IbaTools/FastFabric/switch_dump.exp IbaTools/FastFabric/switch_dump.exp index b567f26..4ab77db 100755 --- IbaTools/FastFabric/switch_dump.exp +++ IbaTools/FastFabric/switch_dump.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git IbaTools/FastFabric/switch_fwverify.exp IbaTools/FastFabric/switch_fwverify.exp index 6be1ea9..587c07a 100755 --- IbaTools/FastFabric/switch_fwverify.exp +++ IbaTools/FastFabric/switch_fwverify.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # diff --git IbaTools/FastFabric/switch_getconfig.exp IbaTools/FastFabric/switch_getconfig.exp index a1cbaae..e79b250 100755 --- IbaTools/FastFabric/switch_getconfig.exp +++ IbaTools/FastFabric/switch_getconfig.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # diff --git IbaTools/FastFabric/switch_hwvpd.exp IbaTools/FastFabric/switch_hwvpd.exp index 24fa8a5..85eafb4 100755 --- IbaTools/FastFabric/switch_hwvpd.exp +++ IbaTools/FastFabric/switch_hwvpd.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # diff --git IbaTools/FastFabric/switch_info.exp IbaTools/FastFabric/switch_info.exp index 73ef67a..22eb450 100755 --- IbaTools/FastFabric/switch_info.exp +++ IbaTools/FastFabric/switch_info.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # diff --git IbaTools/FastFabric/switch_ping.exp IbaTools/FastFabric/switch_ping.exp index 04f060e..d4ed0bf 100755 --- IbaTools/FastFabric/switch_ping.exp +++ IbaTools/FastFabric/switch_ping.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # diff --git IbaTools/FastFabric/switch_reboot.exp IbaTools/FastFabric/switch_reboot.exp index 81f4e3e..d6338be 100755 --- IbaTools/FastFabric/switch_reboot.exp +++ IbaTools/FastFabric/switch_reboot.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git IbaTools/FastFabric/switch_upgrade.exp IbaTools/FastFabric/switch_upgrade.exp index 81bd9b4..45f576c 100755 --- IbaTools/FastFabric/switch_upgrade.exp +++ IbaTools/FastFabric/switch_upgrade.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git IbaTools/FastFabric/upgrade.exp IbaTools/FastFabric/upgrade.exp index aecccbb..8f8bc93 100755 --- IbaTools/FastFabric/upgrade.exp +++ IbaTools/FastFabric/upgrade.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git TestTools/basic.exp TestTools/basic.exp index 4ffe1f5..2d473b5 100755 --- TestTools/basic.exp +++ TestTools/basic.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git TestTools/chassis.exp TestTools/chassis.exp index 9af2e9a..60b79a8 100755 --- TestTools/chassis.exp +++ TestTools/chassis.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git TestTools/common_funcs.exp TestTools/common_funcs.exp index 68d55d8..39bce9a 100644 --- TestTools/common_funcs.exp +++ TestTools/common_funcs.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git TestTools/defs.exp TestTools/defs.exp index 8e1a8e6..eed572f 100644 --- TestTools/defs.exp +++ TestTools/defs.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git TestTools/extmng.exp TestTools/extmng.exp index 2f2d25e..e571529 100755 --- TestTools/extmng.exp +++ TestTools/extmng.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git TestTools/ib.exp TestTools/ib.exp index 06c4a6e..45b6309 100755 --- TestTools/ib.exp +++ TestTools/ib.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git TestTools/ibtools.exp TestTools/ibtools.exp index 36b945c..1b88094 100644 --- TestTools/ibtools.exp +++ TestTools/ibtools.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git TestTools/install.exp TestTools/install.exp index 7736765..e7cc0d4 100755 --- TestTools/install.exp +++ TestTools/install.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git TestTools/mpi.exp TestTools/mpi.exp index 3c5a649..d16354a 100755 --- TestTools/mpi.exp +++ TestTools/mpi.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git TestTools/network.exp TestTools/network.exp index a859022..0f02d36 100755 --- TestTools/network.exp +++ TestTools/network.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git TestTools/opa_to_xml.exp TestTools/opa_to_xml.exp index e5e8ab8..5a110c4 100644 --- TestTools/opa_to_xml.exp +++ TestTools/opa_to_xml.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git TestTools/proc_mgr.exp TestTools/proc_mgr.exp index abcb65d..be47d2f 100755 --- TestTools/proc_mgr.exp +++ TestTools/proc_mgr.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git TestTools/sm_control.exp TestTools/sm_control.exp index 7f08ccb..4809f4c 100755 --- TestTools/sm_control.exp +++ TestTools/sm_control.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git TestTools/switch_methods.exp TestTools/switch_methods.exp index 9f13773..6f0d730 100644 --- TestTools/switch_methods.exp +++ TestTools/switch_methods.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git TestTools/target.exp TestTools/target.exp index 9460a67..2c300f9 100755 --- TestTools/target.exp +++ TestTools/target.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git TestTools/tools.exp TestTools/tools.exp index 850e789..92c94c2 100755 --- TestTools/tools.exp +++ TestTools/tools.exp @@ -1,3 +1,4 @@ +#!/usr/bin/env expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation ++++++ opa-ff-sigset-was-removed.patch ++++++ diff --git Esm/ib/src/ibaccess/vs_thr.c Esm/ib/src/ibaccess/vs_thr.c index 82f30ca..e9281f4 100755 --- Esm/ib/src/ibaccess/vs_thr.c +++ Esm/ib/src/ibaccess/vs_thr.c @@ -51,11 +51,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SFW 03/10/02 Initial functions all passing testcases. * MGR 04/19/02 Changed pthread_kill call to pthread_cancel. ***********************************************************************/ -//#if defined(LINT) +#if defined(LINT) #include <pthread.h> #define __signed__ signed #include <bits/sigset.h> -//#endif +#endif #include <stdio.h> #include <sys/types.h> #include <unistd.h> ++++++ opa-ff-suse-build-fixes.patch ++++++ diff --git Makerules/Defs.Flags Makerules/Defs.Flags index 8caba53..91764ca 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) $(CPROJ) $(CMOD) $(CLOCAL) $(COPT) $(CDEBUG) $(CINCSRCH) -CCFLAGS = $(CCMACH) $(CCSYS) $(CCENV) $(CCPROJ) $(CCMOD) $(CCLOCAL) $(CCOPT) $(CCDEBUG) $(CINCSRCH) +CFLAGS = $(CMACH) $(CSYS) $(CENV) $(CPROJ) $(CMOD) $(CLOCAL) $(COPT) $(CDEBUG) $(CINCSRCH) $(RPM_OPT_FLAGS) +CCFLAGS = $(CCMACH) $(CCSYS) $(CCENV) $(CCPROJ) $(CCMOD) $(CCLOCAL) $(CCOPT) $(CCDEBUG) $(CINCSRCH) $(RPM_OPT_FLAGS) LDFLAGS = $(LDMACH) $(LDSYS) $(LDENV) $(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 a373262..3a6687d 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/ff_build.sh OpenIb_Host/ff_build.sh index b6a17a0..028a234 100755 --- OpenIb_Host/ff_build.sh +++ OpenIb_Host/ff_build.sh @@ -65,7 +65,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 RELEASE_STRING=IntelOPA-Tools-FF.$BUILD_TARGET_OS_ID.$MODULEVERSION @@ -76,6 +82,7 @@ shift set -x { echo "Environment:" + export BUILD_TARGET_OS_VERSION="4.4" env echo "----------------------------------------------------------------------------" echo