From: Leon Romanovsky <leonro@xxxxxxxxxxxx>
Run over all major distributions to ensure that rdma-core
is packaged properly. As part of this change, we are moving
debian check from manual run to be part of packaging and
check release mode only.
Signed-off-by: Leon Romanovsky <leonro@xxxxxxxxxxxx>
---
buildlib/package-build-test | 11 +++++++++--
buildlib/travis-build | 14 --------------
2 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/buildlib/package-build-test b/buildlib/package-build-test
index 46a1cf6f..1ae80b4c 100755
--- a/buildlib/package-build-test
+++ b/buildlib/package-build-test
@@ -11,11 +11,18 @@ if [ -e "/.dockerenv" ] || (grep -q docker /proc/self/cgroup &>/dev/null); then
exit 0
fi
-for OS in centos7 tumbleweed
+for OS in centos7 tumbleweed fedora ubuntu debian-experimental
do
echo
echo "Checking package build for ${OS} ...."
echo
buildlib/cbuild build-images ${OS}
- buildlib/cbuild pkg --use-prebuilt-pandoc --with static ${OS}
+ CMDLINE=" --use-prebuilt-pandoc"
+ if [ r"${OS}" != r"ubuntu" ]; then
+ CMDLINE=${CMDLINE}" --with static"
+ if [ r"${OS}" != r"centos7" ]; then
+ CMDLINE=${CMDLINE}" --with pyverbs"
+ fi
+ fi
+ buildlib/cbuild pkg ${CMDLINE} ${OS}
done
diff --git a/buildlib/travis-build b/buildlib/travis-build
index 7e0f2fba..c241eb06 100755
--- a/buildlib/travis-build
+++ b/buildlib/travis-build
@@ -45,17 +45,3 @@ rm CMakeCache.txt
CC=clang-7 CFLAGS=-Werror cmake -GNinja .. -DIOCTL_MODE=both
ninja
cp ../util/udma_barrier.h.old ../util/udma_barrier.h
-
-# Finally run through gcc-7 64 bit through the debian packaging This gives a
-# good clue if patches are changing packaging related things, the RPM stuff
-# will have to be audited by hand.
-
-# When running cmake through debian/rules it is hard to set -Werror,
-# instead force it on by changing the CMakeLists.txt
-cd ..
-echo 'set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")' >> buildlib/RDMA_EnableCStd.cmake
-sed -i -e 's/-DCMAKE_BUILD_TYPE=Release//g' debian/rules
-sed -i -e 's/ninja \(.*\)-v/ninja \1/g' debian/rules
-
-CC=gcc-7 debian/rules build
-fakeroot debian/rules binary
--
2.19.1
