Commit cebd8612 authored by Roland Fehrenbacher's avatar Roland Fehrenbacher

Update patches for new upstream 10.7.0.0.133

parent 925795c8
......@@ -3,11 +3,11 @@ Date: Mon, 29 Jan 2018 13:07:00 +0000
Subject: Add support for debian + qlustar
---
MakeTools/funcs-ext.sh | 12 ++++++++++++
1 file changed, 12 insertions(+)
MakeTools/funcs-ext.sh | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/MakeTools/funcs-ext.sh b/MakeTools/funcs-ext.sh
index 0d9f1d5..a21553b 100755
index 56a85fd..76a59a3 100755
--- a/MakeTools/funcs-ext.sh
+++ b/MakeTools/funcs-ext.sh
@@ -709,6 +709,10 @@ function os_vendor()
......@@ -21,10 +21,17 @@ index 0d9f1d5..a21553b 100755
else
filelist=($('ls' /etc/*-release | egrep -v lsb | egrep -v os))
rval=""
@@ -756,6 +760,14 @@ function os_vendor_version()
@@ -754,11 +758,19 @@ function os_vendor_version()
# - use VERSION_ID - it has a common format among distros
# - mimic old way and drop $minor if eq 0 (see redhat handling below)
# - drop '.'(dot)
if [ $1 = "Ubuntu" ]; then
rval=$(echo $VERSION_ID | sed -e 's/\.[0]//' -e 's/\.//')
- if [ $1 = "ubuntu" ]; then
- rval=ES$(echo $VERSION_ID | sed -e 's/\.//')
- else
- rval=ES$(echo $VERSION_ID | sed -e 's/\.[0]//' -e 's/\.//')
- fi
+ if [ $1 = "ubuntu" ]; then
+ rval=ES$(echo $VERSION_ID | sed -e 's/\.//')
+ elif [ $1 = "debian" ]; then
+ if [ -z "$VERSION_ID" ]; then
+ rval=9999 # sid
......@@ -33,6 +40,9 @@ index 0d9f1d5..a21553b 100755
+ fi
+ elif [ $1 = "qlustar" ]; then
+ rval=$(cat /etc/qlustar-version | sed -e 's/\.[0]//' -e 's/\.//')
else
rval=ES$(echo $VERSION_ID | sed -e 's/\.[0]//' -e 's/\.//')
fi
+ else
+ rval=ES$(echo $VERSION_ID | sed -e 's/\.[0]//' -e 's/\.//')
+ fi
echo $rval
return
fi
......@@ -3,14 +3,14 @@ Date: Tue, 30 Jan 2018 10:36:06 +0000
Subject: Add correct version links for libraries
---
OpenIb_Host/ff_install.sh | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
OpenIb_Host/ff_install.sh | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/OpenIb_Host/ff_install.sh b/OpenIb_Host/ff_install.sh
index a567d4b..e00f90b 100755
index ae86a89..a9956bf 100755
--- a/OpenIb_Host/ff_install.sh
+++ b/OpenIb_Host/ff_install.sh
@@ -45,6 +45,8 @@ ln -s ./opasmaquery ${DESTDIR}/usr/sbin/opapmaquery
@@ -50,6 +50,8 @@ ln -s ./opasmaquery ${DESTDIR}/usr/sbin/opapmaquery
cd ../opasadb
cp -t ${DESTDIR}/usr/bin $opasadb_bin
cp -t ${DESTDIR}/usr/include/infiniband $opasadb_header
......@@ -19,7 +19,7 @@ index a567d4b..e00f90b 100755
cd ../opamgt
cp -t ${DESTDIR}/usr/include/opamgt $opamgt_headers
@@ -52,6 +54,7 @@ cp -t ${DESTDIR}/usr/include/opamgt/iba $opamgt_iba_headers
@@ -57,6 +59,7 @@ cp -t ${DESTDIR}/usr/include/opamgt/iba $opamgt_iba_headers
cp -t ${DESTDIR}/usr/include/opamgt/iba/public $opamgt_iba_public_headers
cp -t ${DESTDIR}/usr/src/opamgt $opamgt_examples
......@@ -27,21 +27,23 @@ index a567d4b..e00f90b 100755
OPAMGT_VERNO_MAJOR=$(cat version | cut -d . -f 1)
cd ../bin
@@ -101,11 +104,18 @@ cp -t ${DESTDIR}/etc/opa opamon.conf opamon.si.conf
@@ -107,11 +110,18 @@ cp -t ${DESTDIR}/etc/opa opamon.conf opamon.si.conf
#Libraries installing
#cd ../builtlibs.OPENIB_FF.release
cd $(cat $BUILDDIR/LIB_PATH)
-cp -t ${DESTDIR}/usr/lib libopasadb.so.*
-cp -t ${DESTDIR}/${DSAP_LIBDIR} libopasadb.so.*
-cp -t ${DESTDIR}/${DSAP_LIBDIR}/ibacm libdsap.so.*
-cp -t ${DESTDIR}/usr/lib libopamgt.so.*
-ln -s libopamgt.so.${OPAMGT_VERNO_MAJOR} ${DESTDIR}/usr/lib/libopamgt.so
-
+mkdir -p ${DESTDIR}/${LIBDIR}
+cp -t ${DESTDIR}/${LIBDIR} libopasadb.so.*
+ln -s libopasadb.so.${OPASADB_VERNO} \
+ ${DESTDIR}/${LIBDIR}/libopasadb.so.${OPASADB_VERNO_MAJOR}
+ln -s libopasadb.so.${OPASADB_VERNO_MAJOR} ${DESTDIR}/${LIBDIR}/libopasadb.so
+
cp -t ${DESTDIR}/usr/lib/ibacm libdsap.so.*
-cp -t ${DESTDIR}/usr/lib libopamgt.so.*
-ln -s libopamgt.so.${OPAMGT_VERNO_MAJOR} ${DESTDIR}/usr/lib/libopamgt.so
+cp -t ${DESTDIR}/usr/lib/ibacm libdsap.so.*
+
+cp -t ${DESTDIR}/${LIBDIR} libopamgt.so.*
+ln -s libopamgt.so.${OPAMGT_VERNO} \
+ ${DESTDIR}/${LIBDIR}/libopamgt.so.${OPAMGT_VERNO_MAJOR}
......
......@@ -3,41 +3,11 @@ Date: Sat, 10 Feb 2018 14:54:47 +0100
Subject: Adjust absolute paths for some executables
---
CommonInstall/util_driver.pl | 4 ++--
CommonInstall/util_init.pl | 2 +-
IbaTools/nodeverify/nodeverify.sh | 8 ++++----
IbaTools/opahfirev/opahfirev.sh | 2 +-
OpenIb_Host/LINUX/opacapture.sh | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/CommonInstall/util_driver.pl b/CommonInstall/util_driver.pl
index 9ae14ae..9b4a54a 100755
--- a/CommonInstall/util_driver.pl
+++ b/CommonInstall/util_driver.pl
@@ -337,8 +337,8 @@ sub start_driver($$$$)
# provide a verbose message during install
sub check_pcie_link
{
- my $setpci = '/sbin/setpci';
- my $lspci = '/sbin/lspci';
+ my $setpci = '/usr/bin/setpci';
+ my $lspci = '/usr/bin/lspci';
if (open (PCI, "$lspci -d 15b3: -n|")) {
while(<PCI>) {
my $devinfo = $_;
diff --git a/CommonInstall/util_init.pl b/CommonInstall/util_init.pl
index 19791ad..ca5a632 100755
--- a/CommonInstall/util_init.pl
+++ b/CommonInstall/util_init.pl
@@ -95,7 +95,7 @@ my $DBG_FREE="release";
# Command paths
-my $LSPCI = "/sbin/lspci";
+my $LSPCI = "/usr/bin/lspci";
my $RPM="/bin/rpm";
# a few key commands to verify exist
diff --git a/IbaTools/nodeverify/nodeverify.sh b/IbaTools/nodeverify/nodeverify.sh
index d522cf9..1c1ce89 100755
--- a/IbaTools/nodeverify/nodeverify.sh
......@@ -72,7 +42,7 @@ index d522cf9..1c1ce89 100755
[ ! -x "${lspci}" ] && fail "Can't find lspci"
[ ! -x "${setpci}" ] && fail "Can't find setpci"
diff --git a/IbaTools/opahfirev/opahfirev.sh b/IbaTools/opahfirev/opahfirev.sh
index 47dd24e..0c9bbf8 100755
index 77a1304..34c9d57 100755
--- a/IbaTools/opahfirev/opahfirev.sh
+++ b/IbaTools/opahfirev/opahfirev.sh
@@ -70,7 +70,7 @@ fi
......@@ -85,7 +55,7 @@ index 47dd24e..0c9bbf8 100755
if [ -z "$hfis" ]
then
diff --git a/OpenIb_Host/LINUX/opacapture.sh b/OpenIb_Host/LINUX/opacapture.sh
index ef364b7..80fe591 100755
index 0c30cb9..e44465f 100755
--- a/OpenIb_Host/LINUX/opacapture.sh
+++ b/OpenIb_Host/LINUX/opacapture.sh
@@ -150,7 +150,7 @@ fi
......
From: Roland Fehrenbacher <rf@q-leap.de>
Date: Thu, 15 Feb 2018 12:46:56 +0000
Subject: Allow to override build date to enable reproducible builds
Subject: Allow one to override build date to enable reproducible builds
Patch originally from
https://github.com/intel/opa-ff/pull/10/commits/2ae76192815212d7a3f821d6a3dddc3d0bb9eae4
......
0001-Add-support-for-debian-qlustar.patch
0002-Add-correct-version-links-for-libraries.patch
0003-Adjust-absolute-paths-for-some-executables.patch
0004-Allow-to-override-build-date-to-enable-reproducible-.patch
0004-Allow-one-to-override-build-date-to-enable-reproduci.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment