Commit graph

94 commits

Author SHA1 Message Date
Otto Kekäläinen
c0f5addecb Deb: Remove versioning of MariaDB Backup and depend on client
There is no need for MariaDB Backup to be versioned. Other packages are
very unlikely to need to depend on a certain generation of this package.

Also for MariaDB Backup to run, it does not need the server, but client,
and from client only core parts.
2018-04-07 15:36:18 +03: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
c720a1f8b8 Deb: Build RocksDB only on 64-bit and small endian architectures
RocksDB configure step checks that platform is 64-bit and little endian,
so limit the .deb packages to be built only on those platforms.

List of official Debian platforms at
https://www.debian.org/ports/index.en.html
2018-04-04 22:43:45 +03:00
Otto Kekäläinen
e88e967a3d Deb: Exclude libnuma-dev as build-dep on armhf where is does not exist 2018-04-04 22:43:45 +03:00
Sergei Golubchik
b1818dccf7 Merge branch '10.2' into 10.3 2018-03-28 17:31:57 +02:00
Vicențiu Ciorbaru
98eb9518db Merge remote-tracking branch 'origin/10.1' into 10.2 2018-03-16 14:12:00 +02:00
Vicențiu Ciorbaru
8152c52e1a Merge remote-tracking branch '10.0' into 10.1 2018-03-15 03:45:28 +02:00
Vicențiu Ciorbaru
3d5dff6cae Merge branch '5.5' into 10.0 2018-03-14 12:10:31 +02: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
Otto Kekäläinen
1d522353c8 Deb: wrap-and-sort -a the lib* packages in debian/control
This way all the libraries are listed in a logical order and it will later
be easier to compare the control file contents to downstream versions.
2018-01-16 13:48:00 +02:00
Otto Kekäläinen
3862d8bc89 Deb: wrap-and-sort -a 2018-01-16 13:48:00 +02:00
Otto Kekäläinen
a41192def8 Deb: Fix spelling etc Lintian complaints 2018-01-16 13:48:00 +02:00
Otto Kekäläinen
be59851ad9 Deb: Match official Debian package libmariadb-dev-compat
Using this package any source that expects MySQL Client libraries should
build without changes. Sources that expect MariaDB Connector C should
build using only libmariadb-dev.

Current MariaDB Connector/C does not build quite identically in
this source tree compared to how it build in Debian official.
The remaining differences are tracked in MDEV-14921.
2018-01-16 13:48:00 +02:00
Otto Kekäläinen
65db816c32 Deb: Split libmysqlclient19/20 compat links into a separate package
We already ship libmysqlclient18 that replaces any existing package
with the same name and install symlinks that point to out libmariadb.so.

Instead of creating more packages, we add just one more that does the
same and provides both libmysqlclient19 and -20 replacements symlinks.

This is a clean solution, because systems that only use (and are built
against) libmariadb will not need them and if somebody has done a mistake
in the linker parameters, they will spot it and can easily update the
filename to libmariadb.
2018-01-16 13:48:00 +02:00
Otto Kekäläinen
503fcfb80f Deb: Re-remove unnecessary version suffixes from package names
There is no point in having version suffixes in plugin packages. They
will via their control file anyway depend on the correct server or client
version. Having version suffices has no benefit and it just complicates
upgrades when a new major version name package needs to replace all
possible previous version.

This issue was overlooked when merging commit
844a575946 from 10.2 into 10.3, so it
needs to be manually fixed now.
2018-01-16 13:48:00 +02:00
Otto Kekäläinen
094938255d Deb: sync architecture restrictions from packaging in Debian official 2018-01-16 13:48:00 +02:00
Marko Mäkelä
145ae15a33 Merge bb-10.2-ext into 10.3 2018-01-04 09:22:59 +02:00
Sergei Golubchik
76056559ac MDEV-9869 INSTALL SONAME 'ha_connect'
fix 011497bd60

in RPM and DEB: storage engine packages must require the server
package of exactly correct version.
2017-12-25 12:00:52 +01:00
Marko Mäkelä
e3d44f5d62 Merge bb-10.2-ext into 10.3 2017-09-21 08:12:19 +03:00
Sergei Golubchik
f3b6c49f8f MDEV-13589 libmariadbclient18 is broken when using mariadb repo instead of debian's
followup for b5ead3a658

libmariadb3 does not replace 10.1's libmariadbclient18 anymore,
but it still conflicts with it, both install dialog.so
2017-09-20 23:13:50 +02:00
Sergei Golubchik
031a0404e7 bugfix: debian dependencies
mariadb-client-core-10.2, mariadb-client-10.2, and
mariadb-server-core-10.2 should not depend on libmariadb3 - they
do not have any binaries dynamically linked with libmariadb3.so
2017-09-18 10:12:23 +02:00
Sergei Golubchik
b5ead3a658 MDEV-13589 libmariadbclient18 is broken when using mariadb repo instead of debian's
put libmariadbclient18 symlinks into libmariadbclient18.deb package,
not into libmariadb3.deb, because installing/reinstalling
libmariadbclient18.deb must recreate these symlinks.
2017-09-18 10:12:23 +02:00
Sergei Golubchik
b7381526ab Always require OpenSSL 1.0 on Debian
auto-detecting whether it's called libssl-dev or libssl1.0-dev
2017-08-08 09:56:34 +02:00
Alexander Barkov
e67b816451 Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 2017-07-19 19:43:55 +04:00
Sergei Golubchik
a76c05bba0 Require either OpenSSL 1.0 or 1.1 on Debian 2017-07-13 09:14:17 +02:00
Vladislav Vaintroub
51a552ddf2 Fix debian control file syntax. 2017-07-09 06:10:17 +00:00
Vladislav Vaintroub
2312556bba Attempt to fix mariabackup debian packaging in 10.3 2017-07-08 21:57:54 +00:00
Marko Mäkelä
57fea53615 Merge bb-10.2-ext into 10.3 2017-07-07 12:39:43 +03:00
Vladislav Vaintroub
c5a525bda2 mariabackup : debian packaging 2017-07-05 11:05:35 +00:00
Marko Mäkelä
3d615e4b1a Merge branch 'bb-10.2-ext' into 10.3
This excludes MDEV-12472 (InnoDB should accept XtraDB parameters,
warning that they are ignored). In other words, MariaDB 10.3 will not
recognize any XtraDB-specific parameters.
2017-06-02 09:36:04 +03:00
Vicențiu Ciorbaru
844a575946 MDEV-12449: Debian Packaging AWS key management plugin
* Update debian control file to include AWS key management plugin.
* Update dependencies in control file to include uuid.
* Include enable_encryption.preset with the aws-key-management plugin.
2017-05-08 21:42:41 +03:00
Marko Mäkelä
14c6f00a9f Merge 10.1 into 10.2
Also, include fixes by Vladislav Vaintroub to the
aws_key_management plugin. The AWS C++ SDK specifically depends on
OPENSSL_LIBRARIES, not generic SSL_LIBRARIES (such as YaSSL).
2017-05-06 14:36:46 +03:00
Vladislav Vaintroub
1991411f16 MDEV-9566 MariaBackup packaging 2017-04-27 19:12:40 +02:00
Vicențiu Ciorbaru
0ecbaae816 Fix debian install due to mariadb-client-core circular conflict
Aptitude provided the following error message without this fix:
 mariadb-client-core-10.3 :
    Conflicts: mysql-client-5.1 which is a virtual package, provided by:
             - mariadb-client-10.3, but 10.3.0+maria~xenial is to be installed.
    Conflicts: mysql-client-5.5 which is a virtual package, provided by:
             - mariadb-client-10.3, but 10.3.0+maria~xenial is to be installed.
2017-04-06 20:39:17 +03:00
Vicențiu Ciorbaru
32a6621ac9 Fix rocksdb plugin && make mariadb-client-10.3 replace mariadb-client-10.2 2017-04-06 20:39:17 +03:00
Vicențiu Ciorbaru
75b8fe4f18 Update debian packaging to work in 10.3
* Rename all files to use 10.3 in the filename
* Adjust rules to delete extra lines from control file
* Adjust control file to have correct Replaces/Breaks list for each
  package
* Add libcurl3-dev as build dependency for mariadb server in debian
2017-04-05 22:27:16 +03:00
Vicențiu Ciorbaru
21bbe10bb3 Revert "Revert "Make rocksdb build as a deb package too""
This reverts commit 49de95679d.
2017-03-17 17:08:34 +02:00
Vicențiu Ciorbaru
49de95679d Revert "Make rocksdb build as a deb package too"
This reverts commit 38919f68a1.

Temporary revert to be able to see other failures until builders are
updated.
2017-03-16 09:50:26 +02:00
Vicențiu Ciorbaru
38919f68a1 Make rocksdb build as a deb package too 2017-03-15 23:20:20 +02:00
Otto Kekäläinen
d9c03c4339 Deb: Streamline package listing order to make comparisons downstream easier 2016-11-27 22:25:17 +01:00
Otto Kekäläinen
ca3df8f68d Deb: wrap-and-sort for easier comparison to downstream in future 2016-11-27 22:25:17 +01:00
Otto Kekäläinen
f977709b65 Deb: Make libmariadb3 to provide the libmysqlclient.so.XX links
For backwards compatibility reasons.

E.g. innotop builds against libmysqlclient.so and expects to find
a libmysqlclient.so.18 library and does not use libmariadb.so.3 even
when built from our own sources.

This commit mimics to dcfe6cb834
2016-11-27 22:25:17 +01:00
Otto Kekäläinen
1965f03c80 Deb: Rename libmariadbclient-dev to libmariadb-dev
This change was accidentally omitted from commit 2bcc16c17b
2016-11-27 22:25:17 +01:00
Otto Kekäläinen
b5b68b6bb8 MDEV-10126: replace deprecated iproute dependency with iproute2
Fall back to old iproute on Debian Wheezy and Ubuntu Precise that
don't have iproute2 available.
2016-11-26 22:25:40 +01:00
Otto Kekäläinen
e06e455eea Deb: make server core package breaks/replaces earlier client packages
This is required, as the innochecksum binary has moved package.
Without this change the following error would be emitted:

  Unpacking mariadb-server-core-10.2 (10.2.3+maria~jessie) over (10.2.2+maria-1~jessie) ...
  dpkg: error processing archive /var/cache/apt/archives/mariadb-server-core-10.2_10.2.3+maria~jessie_amd64.deb (--unpack):
    trying to overwrite '/usr/bin/innochecksum', which is also in package mariadb-client-10.2 10.2.2+maria-1~jessie
2016-11-25 08:50:58 +01:00
Otto Kekäläinen
d49cffa124 Deb: provide the libmysqlclient shim packages that exist in Debian/Ubuntu
This way all 3rd party apps configured to build against any MySQL or
MariaDB version will pick up the libmariadb3-dev package instead.
2016-11-20 10:51:39 +02:00
Otto Kekäläinen
2bcc16c17b Deb: rename client library packages to reflect its contents
The new library name libmariadb3 matches the libmariadb.so.3 filename.
Packages that want to build against MariaDB Connector C have as
build-dependency libmariadb-dev and as run-time dependency libmariadb3.

Make the package provide libmariadbclient18 for backwards compatibility,
though compatibility is not always assured. There library did change
to a whole new generation after all, even though ABI compatibility has
been a design goal.

Also do the equivalent change for the -dev package. Packages that
explicitly want to use the MariaDB Connector C should mark it as
their build-depends.

Also provide an empty libmariadbclient18 metapackage to facilitate
upgrades from old MariaDB installs, just like there is an empty
libmysqlclient18 package. Create more of these in the future as needed.
2016-11-20 10:49:12 +02:00
Otto Kekäläinen
54bd67a4ed Deb: provide the default-mysql-* packages that exist in Debian/Ubuntu
Since Debian 9 (Stretch) and Ubuntu 16.10 (Yakkety) the following
packages have existed:
* virtual-mysql-client
* virtual-mysql-client-core
* virtual-mysql-server
* virtual-mysql-server-core
* virtual-libmysqlclient-dev

They are metapackages that in Debian depend on MariaDB and in
Ubuntu currently on MySQL. We need to provide them and point
them to MariaDB so that systems that have the mariadb.org
repositories enabled automatically get everything MariaDB
and not MySQL.

This change makes the packaging provide the four first ones,
and later commits will fix the client library issues.
2016-11-20 10:49:12 +02:00
Otto Kekäläinen
45049864b4 Deb: install libmysqld.so and libmysqld.so.19 in correct packages
The versioned so-file belongs to the run-time package and the unversioned
symlink shall be in the development package.
2016-11-18 22:12:50 +02:00