From d7e06d4e7f6111349411972f1ed67841ffe4259e Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Thu, 6 Apr 2017 12:56:09 +0300 Subject: [PATCH 01/19] Fix dependency names in documented build requirements for RedHat/CentOS. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 11498fd..58a887d 100644 --- a/README.md +++ b/README.md @@ -52,9 +52,9 @@ build and use sysbench 0.5 natively for Windows. ### RedHat/CentOS ``` shell - yum -y install make automake libtool pkg-config libaio-devel vim-common + yum -y install make automake libtool pkgconfig libaio-devel vim-common # For MySQL support - yum -y install mysql-devel + yum -y install mariadb-devel # For PostgreSQL support yum -y install postgresql-devel ``` From ae6f5e34dedad5da0c4215caa2ee500bf32c41f1 Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Fri, 7 Apr 2017 13:38:27 +0300 Subject: [PATCH 02/19] Fix clean target in debian/rules. --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 982789e..af2cecd 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f -clean: - make clean +%: + dh $@ override_dh_auto_configure: dh_testdir From 3a808d870c668353c815126730404127f2afeee1 Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Fri, 7 Apr 2017 13:40:55 +0300 Subject: [PATCH 03/19] Add RPM spec based on downstream Fedora packages. --- rpm/sysbench.spec | 155 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 155 insertions(+) create mode 100644 rpm/sysbench.spec diff --git a/rpm/sysbench.spec b/rpm/sysbench.spec new file mode 100644 index 0000000..94d8429 --- /dev/null +++ b/rpm/sysbench.spec @@ -0,0 +1,155 @@ +Summary: Scriptable database and system performance benchmark +Name: sysbench +# Version will be replaced by packpack +Version: x.y.z +Release: 1%{?dist} +License: GPLv2+ +Group: Applications/System +Source0: https://github.com/akopytov/%{name}/archive/%{version}/%{name}-%{version}.tar.gz +URL: https://github.com/akopytov/sysbench/ + +BuildRequires: mariadb-devel +BuildRequires: postgresql-devel +BuildRequires: make +BuildRequires: automake +BuildRequires: libtool +BuildRequires: pkgconfig +BuildRequires: libaio-devel +BuildRequires: vim-common +# Tests +BuildRequires: /usr/bin/cram + +ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 + + +%description +sysbench is a modular, cross-platform and multi-threaded benchmark +tool for evaluating OS parameters that are important for a system +running a database under intensive load. + +The idea of this benchmark suite is to quickly get an impression about +system performance without setting up complex database benchmarks or +even without installing a database at all. Current features allow to +test the following system parameters: +- file I/O performance +- scheduler performance +- memory allocation and transfer speed +- POSIX threads implementation performance +- database server performance (OLTP benchmark) + +Primarily written for MySQL server benchmarking, sysbench will be +further extended to support multiple database backends, distributed +benchmarks and third-party plug-in modules. + + +%prep +%setup -q + +%build +export CFLAGS="%{optflags}" +autoreconf -vif +%configure --with-mysql \ + --with-pgsql \ + +%make_build + +%install +%make_install +rm -f %{buildroot}%{_docdir}/sysbench/manual.html + +%check +make test + +%files +%doc ChangeLog COPYING README.md +%license COPYING +%{_bindir}/* +%{_datadir}/%{name} + + +%changelog +* Thu Apr 6 2017 Alexey Kopytov - 1.0.5-1 +- Reuse downstream Fedora spec with modifications (prefer bundled libraries) + +* Mon Mar 13 2017 Xavier Bachelot 1.0.4-2 +- Don't build aarch64 on el7. + +* Mon Mar 13 2017 Xavier Bachelot 1.0.4-1 +- Fix build for i686. +- Drop bundled cram. + +* Wed Mar 08 2017 Xavier Bachelot 1.0.3-1 +- Update to 1.0.3 (RHBZ#1424670). +- Restrict arches to the same ones as luajit. +- Add --with-gcc-arch=native to configure for %%{arm} and aarch64. +- Ignore test suite results for aarch64, it segfaults in koji. + +* Sat Feb 25 2017 Xavier Bachelot 1.0.2-2 +- Run test suite. + +* Sat Feb 25 2017 Xavier Bachelot 1.0.2-1 +- Update to 1.0.2 (RHBZ#1424670). + +* Sun Feb 12 2017 Honza Horak - 1.0.0-1 +- Update to the first proper release 1.0.0 + +* Sat Feb 11 2017 Fedora Release Engineering - 0.4.12-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering - 0.4.12-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 0.4.12-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu Sep 04 2014 Xavier Bachelot 0.4.12-12 +- Modernize specfile. + +* Mon Aug 18 2014 Fedora Release Engineering - 0.4.12-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 0.4.12-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 04 2013 Fedora Release Engineering - 0.4.12-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Feb 15 2013 Fedora Release Engineering - 0.4.12-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sat Jul 21 2012 Fedora Release Engineering - 0.4.12-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 0.4.12-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Sep 06 2011 Xavier Bachelot 0.4.12-5 +- Add BR: libaio-devel (rhbz#735882). + +* Wed Mar 23 2011 Dan Horák - 0.4.12-4 +- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient) + +* Wed Feb 09 2011 Fedora Release Engineering - 0.4.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Dec 24 2010 Xavier Bachelot 0.4.12-2 +- Rebuild against new mysql. + +* Wed Jul 07 2010 Xavier Bachelot 0.4.12-1 +- Update to 0.4.12. + +* Fri Aug 21 2009 Tomas Mraz - 0.4.10-5 +- rebuilt with new openssl + +* Sun Jul 26 2009 Fedora Release Engineering - 0.4.10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Mar 18 2009 Xavier Bachelot 0.4.10-3 +- License is GPLv2+, not GPLv2. + +* Sat Mar 14 2009 Xavier Bachelot 0.4.10-2 +- Make postgres support optional, the version in rhel4 is too old. +- Drop TODO and manual.html from %%doc, they are empty. + +* Thu Mar 05 2009 Xavier Bachelot 0.4.10-1 +- Adapt original spec file taken from PLD. From ffafb488608d76bf3974c2bf4966f1134cb95bf6 Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Fri, 7 Apr 2017 16:24:42 +0300 Subject: [PATCH 04/19] Add packpack / PackageCloud support to .travis.yml. --- .travis.yml | 164 ++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 132 insertions(+), 32 deletions(-) diff --git a/.travis.yml b/.travis.yml index a030577..6ff684a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,11 @@ # # Travis CI configuration -dist: trusty sudo: required +services: + - docker + language: c os: @@ -15,8 +17,75 @@ compiler: - gcc - clang +env: + matrix: + - TARGET=distcheck + - TARGET=test + - TARGET=coverage + - OS=el DIST=6 + - OS=el DIST=7 + - OS=fedora DIST=24 + - OS=fedora DIST=25 + - OS=ubuntu DIST=precise + - OS=ubuntu DIST=trusty + - OS=ubuntu DIST=xenial + - OS=ubuntu DIST=yakkety + - OS=debian DIST=wheezy + - OS=debian DIST=jessie + - OS=debian DIST=stretch + matrix: exclude: + - env: OS=el DIST=6 + compiler: clang + - env: OS=el DIST=7 + compiler: clang + - env: OS=fedora DIST=24 + compiler: clang + - env: OS=fedora DIST=25 + compiler: clang + - env: OS=ubuntu DIST=precise + compiler: clang + - env: OS=ubuntu DIST=trusty + compiler: clang + - env: OS=ubuntu DIST=xenial + compiler: clang + - env: OS=ubuntu DIST=yakkety + compiler: clang + - env: OS=debian DIST=wheezy + compiler: clang + - env: OS=debian DIST=jessie + compiler: clang + - env: OS=debian DIST=stretch + compiler: clang + - env: TARGET=source + compiler: clang + - env: TARGET=coverage + compiler: clang + - env: OS=el DIST=6 + os: osx + - env: OS=el DIST=7 + os: osx + - env: OS=fedora DIST=24 + os: osx + - env: OS=fedora DIST=25 + os: osx + - env: OS=ubuntu DIST=precise + os: osx + - env: OS=ubuntu DIST=trusty + os: osx + - env: OS=ubuntu DIST=xenial + os: osx + - env: OS=ubuntu DIST=yakkety + os: osx + - env: OS=debian DIST=wheezy + os: osx + - env: OS=debian DIST=jessie + os: osx + - env: OS=debian DIST=stretch + os: osx + - env: TARGET=coverage + os: osx - os: osx compiler: gcc @@ -34,35 +103,33 @@ services: before_install: - > - case "${TRAVIS_OS_NAME:-linux}" in - osx) - # Workaround for https://github.com/Homebrew/legacy-homebrew/issues/43874 - # brew uninstall libtool - # brew update --quiet - # brew install libtool mysql - brew install mysql + if [ "x$TARGET" = "xtest" ] then + case "${TRAVIS_OS_NAME:-linux}" in + osx) + brew install mysql - # OS X requires servers to be started explicitly - brew services start mysql + # OS X requires servers to be started explicitly + brew services start mysql - # Avoid PostgreSQL upgrade woes, just reinstall the database - brew uninstall --ignore-dependencies postgresql - rm -rf /usr/local/var/postgres - brew install postgresql + # Avoid PostgreSQL upgrade woes, just reinstall the database + brew uninstall --ignore-dependencies postgresql + rm -rf /usr/local/var/postgres + brew install postgresql - echo "Starting PostgreSQL" - pg_ctl -wD /usr/local/var/postgres start - echo "Creating user postgres" - createuser -s postgres - ;; - linux) - export ASAN_OPTIONS="detect_leaks=0" - if [ "${CC}" = "clang" ] - then - CC=clang-3.6 - fi - ;; - esac + echo "Starting PostgreSQL" + pg_ctl -wD /usr/local/var/postgres start + echo "Creating user postgres" + createuser -s postgres + ;; + linux) + export ASAN_OPTIONS="detect_leaks=0" + if [ "${CC}" = "clang" ] + then + CC=clang-3.6 + fi + ;; + esac + fi install: - pip install --user urllib3[secure] cpp-coveralls @@ -79,13 +146,46 @@ before_script: - psql -U postgres -c 'CREATE DATABASE sbtest' script: - - ./autogen.sh && ./configure --enable-coverage --enable-asan --enable-msan --with-mysql --with-pgsql - - make - - make distcheck - - SBTEST_MYSQL_ARGS="--mysql-user=root" SBTEST_PGSQL_ARGS="--pgsql-user=postgres" make test + - > + if [ -n "$TARGET" ] then + case "$TARGET" in + test) + ./autogen.sh && ./configure --with-mysql --with-pgsql + make -j2 + SBTEST_MYSQL_ARGS="--mysql-user=root" SBTEST_PGSQL_ARGS="--pgsql-user=postgres" make test + ;; + distcheck) + ./autogen.sh && ./configure --without-mysql + make distcheck + ;; + coverage) + ./autogen.sh && ./configure --enable-coverage --enable-asan --enable-msan --with-mysql --with-pgsql + make -j2 + SBTEST_MYSQL_ARGS="--mysql-user=root" SBTEST_PGSQL_ARGS="--pgsql-user=postgres" make test + ;; + esac + else + git clone https://github.com/packpack/packpack.git packpack + packpack/packpack + fi + +deploy: + # Deploy packages to PackageCloud + - provider: packagecloud + username: "${PACKAGECLOUD_USER}" + repository: "${PACKAGECLOUD_REPO}" + token: "${PACKAGECLOUD_TOKEN}" + dist: "${OS}/${DIST}" + package_glob: build/*.{rpm,deb,dsc} + skip_cleanup: true + on: + condition: -n "${OS}" && -n "${DIST}" && -n "${PACKAGECLOUD_TOKEN}" after_success: - - coveralls --exclude third_party/ --gcov-options '\-lp' + - > + if [ "x$TARGET" = "xcoverage" ] then + coveralls --exclude third_party/ --gcov-options '\-lp' + fi # Local variables: # mode: yaml From bf5f9746eab6a34a0a7c14e59df2793606a7de50 Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Fri, 7 Apr 2017 16:28:21 +0300 Subject: [PATCH 05/19] Add "dist: trusty" back to .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 6ff684a..c25ce11 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ # # Travis CI configuration +dist: trusty sudo: required services: From fd83bd16234e7c8f89f256c4d0cf6f7b4c181cb9 Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Fri, 7 Apr 2017 16:32:31 +0300 Subject: [PATCH 06/19] Update .travis.yml to do distcheck and coverage targets only on Linux/GCC. --- .travis.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index c25ce11..cac25db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,10 +59,6 @@ matrix: compiler: clang - env: OS=debian DIST=stretch compiler: clang - - env: TARGET=source - compiler: clang - - env: TARGET=coverage - compiler: clang - env: OS=el DIST=6 os: osx - env: OS=el DIST=7 @@ -85,8 +81,14 @@ matrix: os: osx - env: OS=debian DIST=stretch os: osx + - env: TARGET=distcheck + compiler: clang + - env: TARGET=distcheck + os: osx - env: TARGET=coverage os: osx + - env: TARGET=coverage + compiler: clang - os: osx compiler: gcc From da7996b4c5f9b5e54553f8fa458c3a2d70f78c27 Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Fri, 7 Apr 2017 16:40:52 +0300 Subject: [PATCH 07/19] Fix syntax errors in .travis.yml. --- .travis.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index cac25db..7a2bbe8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -106,7 +106,8 @@ services: before_install: - > - if [ "x$TARGET" = "xtest" ] then + if [ "x$TARGET" = "xtest" ] + then case "${TRAVIS_OS_NAME:-linux}" in osx) brew install mysql @@ -150,7 +151,8 @@ before_script: script: - > - if [ -n "$TARGET" ] then + if [ -n "$TARGET" ] + then case "$TARGET" in test) ./autogen.sh && ./configure --with-mysql --with-pgsql @@ -186,7 +188,8 @@ deploy: after_success: - > - if [ "x$TARGET" = "xcoverage" ] then + if [ "x$TARGET" = "xcoverage" ] + then coveralls --exclude third_party/ --gcov-options '\-lp' fi From b4b2003eb14065daf59c9b41e2f079f95ae43026 Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Fri, 7 Apr 2017 16:51:25 +0300 Subject: [PATCH 08/19] Merge services in .travis.yml. --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7a2bbe8..40d8a0f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,8 @@ sudo: required services: - docker + - mysql + - postgresql language: c @@ -100,10 +102,6 @@ addons: - libaio-dev - clang-3.6 -services: - - mysql - - postgresql - before_install: - > if [ "x$TARGET" = "xtest" ] From c164223df9ce94c3943488f111bb1eb33586ab19 Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Fri, 7 Apr 2017 17:13:41 +0300 Subject: [PATCH 09/19] Yet another attempt to fix .travis.yml. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 40d8a0f..463238a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -104,7 +104,7 @@ addons: before_install: - > - if [ "x$TARGET" = "xtest" ] + if [ "x$TARGET" = "xtest" ]; then case "${TRAVIS_OS_NAME:-linux}" in osx) From d38f8174fda6e8af3bb5898e4d932bc3363e0f13 Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Fri, 7 Apr 2017 17:30:27 +0300 Subject: [PATCH 10/19] More syntax fixes in .travis.yml. --- .travis.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 463238a..7e60451 100644 --- a/.travis.yml +++ b/.travis.yml @@ -104,8 +104,7 @@ addons: before_install: - > - if [ "x$TARGET" = "xtest" ]; - then + if [ "x$TARGET" = "xtest" ]; then case "${TRAVIS_OS_NAME:-linux}" in osx) brew install mysql @@ -125,8 +124,7 @@ before_install: ;; linux) export ASAN_OPTIONS="detect_leaks=0" - if [ "${CC}" = "clang" ] - then + if [ "${CC}" = "clang" ]; then CC=clang-3.6 fi ;; @@ -149,8 +147,7 @@ before_script: script: - > - if [ -n "$TARGET" ] - then + if [ -n "$TARGET" ]; then case "$TARGET" in test) ./autogen.sh && ./configure --with-mysql --with-pgsql @@ -186,8 +183,7 @@ deploy: after_success: - > - if [ "x$TARGET" = "xcoverage" ] - then + if [ "x$TARGET" = "xcoverage" ]; then coveralls --exclude third_party/ --gcov-options '\-lp' fi From 437fd63dde3ec6d52c9e279706365e3d467d7a13 Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Fri, 7 Apr 2017 18:43:43 +0300 Subject: [PATCH 11/19] Fix 'make distcheck' in .travis.yml. --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7e60451..40c417f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -151,11 +151,12 @@ script: case "$TARGET" in test) ./autogen.sh && ./configure --with-mysql --with-pgsql - make -j2 + make SBTEST_MYSQL_ARGS="--mysql-user=root" SBTEST_PGSQL_ARGS="--pgsql-user=postgres" make test ;; distcheck) ./autogen.sh && ./configure --without-mysql + make make distcheck ;; coverage) From 9bd7947f15102f5ab76a18c7a00d6f2a9fc90590 Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Fri, 7 Apr 2017 19:06:39 +0300 Subject: [PATCH 12/19] Use mysql-devel instead of mariadb-devel on Enterprise Linux 6. --- rpm/sysbench.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rpm/sysbench.spec b/rpm/sysbench.spec index 94d8429..f7f7d15 100644 --- a/rpm/sysbench.spec +++ b/rpm/sysbench.spec @@ -8,7 +8,11 @@ Group: Applications/System Source0: https://github.com/akopytov/%{name}/archive/%{version}/%{name}-%{version}.tar.gz URL: https://github.com/akopytov/sysbench/ +%if %{?el6} +BuildRequires: mysql-devel +%else BuildRequires: mariadb-devel +%endif BuildRequires: postgresql-devel BuildRequires: make BuildRequires: automake From 38daa7d9879d814d7ae52c3a1adef95d06c66267 Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Fri, 7 Apr 2017 19:07:02 +0300 Subject: [PATCH 13/19] Update .travis.yml to release to PackageCloud from all branches. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 40c417f..c592682 100644 --- a/.travis.yml +++ b/.travis.yml @@ -180,6 +180,7 @@ deploy: package_glob: build/*.{rpm,deb,dsc} skip_cleanup: true on: + all_branches: true condition: -n "${OS}" && -n "${DIST}" && -n "${PACKAGECLOUD_TOKEN}" after_success: From 736a6f5a7194a94cc1d70e97c61a0f44e78e1d2d Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Fri, 7 Apr 2017 19:52:32 +0300 Subject: [PATCH 14/19] Fix sysbench.spec for non-EL6 systems. --- rpm/sysbench.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/sysbench.spec b/rpm/sysbench.spec index f7f7d15..dfbbb19 100644 --- a/rpm/sysbench.spec +++ b/rpm/sysbench.spec @@ -8,7 +8,7 @@ Group: Applications/System Source0: https://github.com/akopytov/%{name}/archive/%{version}/%{name}-%{version}.tar.gz URL: https://github.com/akopytov/sysbench/ -%if %{?el6} +%if 0%{?el6} BuildRequires: mysql-devel %else BuildRequires: mariadb-devel From ffab5bd52a0d2be3d5d4cca84c7410bf32397c9c Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Fri, 7 Apr 2017 20:16:54 +0300 Subject: [PATCH 15/19] Use bundled cram on RPM-based distros due to cram not being available on EL6. --- rpm/sysbench.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpm/sysbench.spec b/rpm/sysbench.spec index dfbbb19..5c9e4a4 100644 --- a/rpm/sysbench.spec +++ b/rpm/sysbench.spec @@ -20,8 +20,8 @@ BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: libaio-devel BuildRequires: vim-common -# Tests -BuildRequires: /usr/bin/cram +# Use bundled cram for tests +BuildRequires: python ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 From 1a16fb87ca5c72163322ccab9650814dd9e7f4fe Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Fri, 7 Apr 2017 20:42:56 +0300 Subject: [PATCH 16/19] Use my packpack fork as a temporary workaround Fedora 24 build failures. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c592682..8eea087 100644 --- a/.travis.yml +++ b/.travis.yml @@ -166,7 +166,7 @@ script: ;; esac else - git clone https://github.com/packpack/packpack.git packpack + git clone https://github.com/akopytov/packpack.git packpack packpack/packpack fi From e5d5a6791708d7f68fe6ead1707768f2092414f3 Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Sat, 8 Apr 2017 10:22:22 +0300 Subject: [PATCH 17/19] Workaround for %make_build not being available on EL6. --- rpm/sysbench.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rpm/sysbench.spec b/rpm/sysbench.spec index 5c9e4a4..4b60f10 100644 --- a/rpm/sysbench.spec +++ b/rpm/sysbench.spec @@ -55,7 +55,11 @@ autoreconf -vif %configure --with-mysql \ --with-pgsql \ +%if 0%{?el6} +make -j2 +%else %make_build +%endif %install %make_install From 2d8764e2b34cd61832fd75dd7e33546d0ea0b8e8 Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Sat, 8 Apr 2017 11:03:19 +0300 Subject: [PATCH 18/19] More EL6-specific compatibility fixes in RPM spec. --- rpm/sysbench.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rpm/sysbench.spec b/rpm/sysbench.spec index 4b60f10..75c286d 100644 --- a/rpm/sysbench.spec +++ b/rpm/sysbench.spec @@ -70,7 +70,10 @@ make test %files %doc ChangeLog COPYING README.md +%if 0%{?el6} +%else %license COPYING +%endif %{_bindir}/* %{_datadir}/%{name} From d0bb5e14b40cc1258ce5ac1052cdacaa7871fff1 Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Sat, 8 Apr 2017 11:03:58 +0300 Subject: [PATCH 19/19] Remove Debian Stretch from build matrix. --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8eea087..38cb10f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,8 +35,7 @@ env: - OS=ubuntu DIST=yakkety - OS=debian DIST=wheezy - OS=debian DIST=jessie - - OS=debian DIST=stretch - + matrix: exclude: - env: OS=el DIST=6