Commit graph

94 commits

Author SHA1 Message Date
Otto Kekäläinen
80abfa0eda Don't force to use all processors in autobake-deb.sh
The dpkg-buildpackage has by default sensible values for --jobs and
--try-jobs, and it also inherits whatever 'parallel' is set in
DEB_BUILD_OPTIONS. Overriding it here should not be needed and removing
it is better, since it allows build systems to control the level or
parallel builds via DEB_BUILD_OPTIONS if they want, which they often do
(e.g. to avoid CPU congestion or overheating laptops).
2020-04-04 20:42:00 +03:00
Otto Kekäläinen
1589cf1cb3 Deb: Remove TokuDB from Debian packages while keeping it easy to revert
Related:
- https://jira.mariadb.org/browse/MDEV-19780
- https://jira.mariadb.org/browse/MDEV-21944
2020-04-04 20:42:00 +03:00
Otto Kekäläinen
400d7709ce Deb: Clean away deprecated autobake modifications
The current debian/control file and other packaging of 10.5 targets the
latest Debian unstable. In autobake-deb.sh there are automatic build
adaptations for older Debian/Ubuntu releases.

Some adaptations were for Debian versions prior to Jessie and Ubuntu
versions prior to Trusty. Those distro releases are no longer supported
anyway, so these should be cleaned away now in the 10.5 release cycle.

Summary:
- Debian Jessie has libcrack2 release 2.9.2-1, no need to have adaptations
  for any older environments
- Debian Jessie has libpcre3-dev release 2:8.35-3.3, no need to consider
  older versions
- Systemd has been available since Debian Jessie, no need to consider
  that a Debian/Ubuntu environment would not have it available
  adaptations for environments for anything older
2020-04-04 20:42:00 +03:00
Daniel Black
2e0a40bdf0 Deb: libcurl4 in bionic+/buster+
Otherwise fall back to libcurl3
2020-03-26 17:02:38 +02:00
Sergei Golubchik
fbfd4fafd4 autobake-deb.sh: include symlinks in the final listing 2020-03-24 02:39:32 +01:00
Otto Kekäläinen
0f8d6e3bd8 MDEV-21942: Correctly use newer libpcre2 version (regression in b6b6980)
If libpcre2 (10.x) is not defined and only the older libpcre3 (8.x)
would be available, the build would attempt to download it from the
Internet, violating many build environment restrictions.

Commit b6b6980686 attempted to fix
MDEV-21942 but was incomplete, and after in CI systems started
failing since the .travis.yml update was missing.
2020-03-18 22:49:55 +02:00
Oleksandr Byelkin
fad47df995 Merge branch '10.4' into 10.5 2020-03-11 17:52:49 +01:00
Oleksandr Byelkin
b8c0e49670 Merge commit '10.3' into 10.4 2020-03-11 13:27:10 +01:00
Otto Kekäläinen
f2832a010a MDEV-14918: Use sst_dump from package rocksdb-tools, don't build it
Since this tool is already shipped in the system, don't provide it from
MariaDB from 10.5 series onwards. It will potentially just create an
installation failure due to conflict if users install rocksdb-tools.

Package rocksdb-tools in Debian since Buster (10):
https://packages.debian.org/search?suite=buster&arch=any&mode=path&searchon=contents&keywords=sst_dump

Package rocksdb-tools in Ubuntu since Disco (19.04):
https://packages.ubuntu.com/search?suite=disco&arch=any&mode=exactfilename&searchon=contents&keywords=sst_dump

This change is adopted from Debian the change has been since Dec 18, 2018.
d50e2eaf1f
2020-03-05 09:11:49 +02:00
Otto Kekäläinen
1f0e72f874 Deb: Remove unnecessary manual libzstd1 dependency from RocksDB plugin
The Debian build tools add all run-time dependencies automatically. For the
mariadb-rocksdb-plugin the "${misc:Depends}, ${shlibs:Depends}" will become
(based on the build dependencies at build time):

  Depends: mariadb-server-10.4 (= 1:10.4.12-1), rocksdb-tools,
  libc6 (>= 2.29), liblz4-1 (>= 0.0~r130), libsnappy1v5 (>= 1.1.8),
  libstdc++6 (>= 7), libzstd1 (>= 1.3.3), zlib1g (>= 1:1.1.4)

There is no need to manually add run-time build dependencies. Only external
dependencies need to be defined, for example rocksdb-tools could come in
question for mariadb-plugin-rocksdb, and it will be eventually added when
downstream official Debian packaging is merged upstream in a later commit.
2020-02-13 20:47:23 +02:00
Sergei Golubchik
85bef794f7 MDEV-19780 Remove the TokuDB storage engine
disable tokudb, because it's being deprecated by the vendor
2019-08-24 16:19:49 +02:00
Monty
2faa7dcd5c Updated debian packages to 10.5 2019-05-23 01:20:17 +03:00
Marko Mäkelä
2a791c53ad Merge 10.3 into 10.4 2019-03-06 09:00:52 +02:00
Marko Mäkelä
a2fc36989e Merge 10.2 into 10.3 2019-03-04 17:01:00 +02:00
Sergei Golubchik
20043cf650 remove aws kms plugin from debian builds too 2019-03-01 12:40:43 -05:00
Sergei Golubchik
000c6cfc61 debian: more robust control file hacking
when deleting a package, delete up to the next empty line,
instead of relying on a package description being of
some fixed number of lines long
2019-03-01 12:40:43 -05:00
Oleksandr Byelkin
93ac7ae70f Merge branch '10.3' into 10.4 2019-02-21 14:40:52 +01:00
Oleksandr Byelkin
c8f9b3f915 remove aws-key management plugin 2019-02-20 08:44:08 +01:00
Sergei Golubchik
9b76e2843b Merge branch '10.3' into 10.4 2019-01-26 01:13:41 +01:00
Sergei Golubchik
3b1b665fcb Merge branch '10.2' into 10.3 2019-01-25 20:35:40 +01:00
Sergei Golubchik
d4515d1305 Deb: don't edit control file from inside rules file
It's too late. Might work or not (and on buster it doesn't).
2019-01-25 19:57:37 +01:00
Marko Mäkelä
734510a44d Merge 10.3 into 10.4 2019-01-06 17:43:02 +02:00
Sergei Golubchik
812bb1303c (still) Packaging is broken for debian-based systems
fix the AWS SDK build eligibility checks.

followup for 779151db80
2018-12-24 11:06:19 +01:00
Teodor Mircea Ionita
779151db80 autobake-deb: fixes for AWS SDK build eligibility checks.
Add check for git command and test for internet connectivity
using bash /dev/tcp interface, instead of wget and curl which might
not be available, thus reducing dependencies for this script.
2018-12-21 13:44:14 +01:00
Marko Mäkelä
c761b43451 Merge 10.3 into 10.4 2018-11-08 10:19:55 +02:00
Sergei Golubchik
4990b0e1ee MDEV-17496 aws plugin is no longer built for debian/ubuntu
ping is not a reliable way to detect github's availability
2018-11-06 13:36:50 +01:00
Otto Kekäläinen
cb6e888384 Deb: Fix brittle line numbers with simple paragraph detection
After this there will be no need to maintain line numbers, as the
extent of the sed deletion will automatically be until next empty line.
2018-08-05 01:15:43 -05:00
Otto Kekäläinen
aa6c1a6d19 Deb: Mass replace 10.3 with 10.4 inside files 2018-08-05 00:45:55 -05:00
Otto Kekäläinen
3173d73b71 Deb: Update the control file for 10.4 package names
- Update package names that had -10.3 to -10.4
- Update conflicts/breaks/replaces of to include now also 10.3,
  just like 10.3 had the same relationship to 10.2
- Remove some old  (<< ${source:Version}) not needed anymore as we
  are not moving files around inside the 10.4 releases (at least yet).
- Ensure all plugins depend on server or client binaries from the same
  release so that they for sure are binary API compatible.
2018-08-05 00:45:55 -05:00
Rasmus Johansson
41acca8bfa Added -j option to dpkg-buildpackage to speed up build 2018-08-02 11:28:59 +00:00
Rasmus Johansson
a89a6e4f77 Added -j option to dpkg-buildpackage to speed up build 2018-08-02 11:27:22 +00:00
Marko Mäkelä
c3289d27ee Merge mariadb-10.3.8 into 10.3 2018-07-03 10:22:43 +03:00
Sergei Golubchik
f3ac221ffd Fix deb build failure on Xenial: disable -fPIE
Correct 898a8c3c0c to work when newer debhelper-10.2 is installed from
xenial-backports (or jessie-backports).

Use gcc version instead of debproxy version, this is likely a gcc
issue (as disabling LTO and gcc's linker plugin fixes it).
2018-07-01 16:10:59 +02:00
Sergei Golubchik
36e59752e7 Merge branch '10.2' into 10.3 2018-06-30 16:39:20 +02:00
Otto Kekäläinen
5ef4870bb3 Travis-CI: Ensure AWS key management plugin is not built nor packaged
Building this plugin which requires run-time access to network, uses a lot
of disk space and is slow was already partially disabled. This way we
also ensure that on cmake level it never runs even if it out of some
autodetection reason at times thought it could run.

This fixes the error message:
  fatal: unable to access 'https://github.com/awslabs/aws-sdk-cpp.git/':
  Problem with the SSL CA cert (path? access rights?)
2018-06-30 00:34:07 +03:00
Otto Kekäläinen
d6b26a8924 Travis-CI: Don't build nor package the embedded server to save disk space
Fixes errors on Travis like:
  cp: error writing debian/libmariadbd19//usr/lib/x86_64-linux-gnu/
  libmariadbd.so.19: No space left on device
2018-06-29 17:31:20 +03:00
Otto Kekäläinen
dbdaafb014 autobake-deb: Stop packaging plugins that are not built
This complements commit ecb0e0ade4 that
disabled a bunch of plugins from being built on Travis-CI (due to time
and disk space saving reasons).

When the plugins are not built, the packaging phase will fail due to
missing files. This change omits the files from packaging to the process
can complete successfully.
2018-06-29 17:28:43 +03:00
Teodor Mircea Ionita
ecb0e0ade4 autobake-deb: disable storage engines using -DPLUGIN 2018-06-29 13:57:36 +03:00
Teodor Mircea Ionita
1d5220ae23 MDEV-16213: Exclude more engines from autobake-deb.sh 2018-06-29 13:57:36 +03:00
Sergei Golubchik
a19089ff4e MDEV-16537 aws key management plugin on Ubuntu bionic has impossible dependencies
remove manual libcurl3 dependency.
it'll be automatically added (libcurl3 or libcurl4, whatever was
actually used)
2018-06-24 15:18:36 +02:00
Otto Kekäläinen
738c5c8424 MDEV-12642: Build deb source packages on buildbot, just not on Travis-CI 2018-06-05 16:06:03 +03:00
Otto Kekäläinen
898a8c3c0c Deb: Disable PIE in debian/rules on older Debian/Ubuntu releases
This partially reverts commit dc0a76600b.
2018-06-02 21:32:18 +03:00
Otto Kekäläinen
44e7ec193e Deb: Extend new package descriptions to meet Lintian minimum criteria 2018-05-28 11:32:22 +03:00
Vicențiu Ciorbaru
96cee524fe MDEV-15578: MyRocks: support zstandard compression where the distro allows it
Add libzstd-dev as a build dependency to the server and libzstd1 as a
runtime dependency for rocksdb. libzstd is practially a mandatory
compression library to ensure adequate performance for RocksDB.
2018-05-24 19:55:52 +03:00
Sergei Golubchik
4ec8598c1d Merge branch 'github/10.2' into 10.3 2018-05-22 11:47:09 +02:00
Sergei Golubchik
cb21e117ba MDEV-16187 Ubuntu Bionic MariaDB has epoch version that makes 10.1 and 10.2 installs fail 2018-05-16 23:24:14 +02:00
Otto Kekäläinen
30f692f016 Deb: Make AWS key management plugin a special plugin not in Linux distros
It will only build if there is network access, which is a strict no-go
for Linux distributions. Thus the AWS plugin needs to be a custom built
only special plugin that is not built as part of the normal sources.

This fixes the build error in e.g. Launchpad:

  Performing download step (git clone) for 'aws_sdk_cpp'
  cd "/<<PKGBUILDDIR>>/builddir/plugin/aws_key_management" && /usr/bin/cmake ..
  Cloning into 'aws-sdk-cpp'...
  fatal: unable to access 'https://github.com/awslabs/aws-sdk-cpp.git/':
  Could not resolve host: github.com
2018-04-04 22:43:45 +03:00
Otto Kekäläinen
ec53e031bb Deb: Bump epoch to supercede 1:10.1.29-6 in Debian
A non-MariaDB.org contributor introduced the epoch 1: in Debian.
There is no way to revert it, so we just need to adapt to it to
ensure no 10.3 installation would downgrade to that version in
Debian/Ubuntu, as 1: is considered higher than any version before.
2018-04-04 22:43:45 +03:00
Marko Mäkelä
b006d2ead4 Merge bb-10.2-ext into 10.3 2018-02-15 10:22:03 +02:00
Vicentiu Ciorbaru
adbf6caad6 debian/control Include myrocks_hotbackup into mariadb-plugin-rocksdb 2018-02-07 13:08:19 +00:00