From 7c2437c97bdf86ef4aebfb6d9a73423c887eebb4 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Mon, 19 Nov 2018 10:28:58 +0100 Subject: [PATCH 01/38] Initial version of the modulemd file --- mariadb.yaml | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 mariadb.yaml diff --git a/mariadb.yaml b/mariadb.yaml new file mode 100644 index 0000000..b955a49 --- /dev/null +++ b/mariadb.yaml @@ -0,0 +1,44 @@ +document: modulemd +version: 2 +data: + summary: 'MariaDB: a very fast and robust SQL database server' + description: >- + MariaDB is a community developed branch of MySQL. MariaDB is a multi-user, multi-threaded + SQL database server. It is a client/server implementation consisting of a server + daemon (mysqld) and many different client programs and libraries. The base package + contains the standard MariaDB/MySQL client programs and generic MySQL files. + license: + module: + - MIT + + + + dependencies: + - buildrequires: + platform: [-f27, -f28] + requires: + platform: [-f27, -f28] + + + + api: + rpms: + - mariadb-server + - mariadb-server-utils + - mariadb + + + + buildopts: + rpms: + macros: | + %runselftest 0 + %ignore_testsuite_result 1 + + + + components: + rpms: + mariadb: + rationale: The main component. + ref: 10.4 From 986fdf0bb6efd484ff74d2ac618af74d2d56f2b4 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Sun, 6 Jan 2019 16:33:20 +0100 Subject: [PATCH 02/38] Update for 10.4.1 --- mariadb.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/mariadb.yaml b/mariadb.yaml index b955a49..7b5d380 100644 --- a/mariadb.yaml +++ b/mariadb.yaml @@ -29,6 +29,19 @@ data: + profiles: + default: + - mariadb + - mariadb-server + - mariadb-server-utils + - mariadb-common + - mariadb-errmsg + - mariadb-config + devel: + - mariadb-devel + + + buildopts: rpms: macros: | From d965e2556c4abd04e492dd0d0c19d99f8b7b0bde Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Sun, 6 Jan 2019 16:35:10 +0100 Subject: [PATCH 03/38] Fix of profiles --- mariadb.yaml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/mariadb.yaml b/mariadb.yaml index 7b5d380..8804fbe 100644 --- a/mariadb.yaml +++ b/mariadb.yaml @@ -31,14 +31,16 @@ data: profiles: default: - - mariadb - - mariadb-server - - mariadb-server-utils - - mariadb-common - - mariadb-errmsg - - mariadb-config + rpms: + - mariadb + - mariadb-server + - mariadb-server-utils + - mariadb-common + - mariadb-errmsg + - mariadb-config devel: - - mariadb-devel + rpms: + - mariadb-devel From dcbeca14c450a298fc7d9968b272c20db774e838 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Sun, 6 Jan 2019 16:37:00 +0100 Subject: [PATCH 04/38] Fix of profiles --- mariadb.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mariadb.yaml b/mariadb.yaml index 8804fbe..8dd9b07 100644 --- a/mariadb.yaml +++ b/mariadb.yaml @@ -31,6 +31,7 @@ data: profiles: default: + description: Server and client. rpms: - mariadb - mariadb-server @@ -39,7 +40,8 @@ data: - mariadb-errmsg - mariadb-config devel: - rpms: + description: Devel package. + rpms: - mariadb-devel From e0fb5fae734d5f80ca0afaeb7304a94532c6abc7 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Tue, 19 Feb 2019 17:16:50 +0100 Subject: [PATCH 05/38] Profiles update --- mariadb.yaml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/mariadb.yaml b/mariadb.yaml index 8dd9b07..c6a3932 100644 --- a/mariadb.yaml +++ b/mariadb.yaml @@ -24,21 +24,24 @@ data: api: rpms: - mariadb-server - - mariadb-server-utils - mariadb profiles: - default: - description: Server and client. + server: + description: Base server. + rpms: + - mariadb-server + client: + description: Client. rpms: - mariadb + galera: + description: Server plus replication engine. + rpms: - mariadb-server - - mariadb-server-utils - - mariadb-common - - mariadb-errmsg - - mariadb-config + - mariadb-server-galera devel: description: Devel package. rpms: From aad7d85065d826dbca4c0af5d51604dc17544bb5 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Wed, 20 Feb 2019 10:01:07 +0100 Subject: [PATCH 06/38] Update for 10.3 stream --- mariadb.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mariadb.yaml b/mariadb.yaml index c6a3932..ce72b8f 100644 --- a/mariadb.yaml +++ b/mariadb.yaml @@ -15,9 +15,9 @@ data: dependencies: - buildrequires: - platform: [-f27, -f28] + platform: [-f27] requires: - platform: [-f27, -f28] + platform: [-f27] @@ -61,4 +61,4 @@ data: rpms: mariadb: rationale: The main component. - ref: 10.4 + ref: f29 From bbd78e1dc09d97f77aa176a7d09ce19ac18150fb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Mar 2019 19:15:48 +0000 Subject: [PATCH 07/38] Branching f30 from rawhide Signed-off-by: Fedora Release Engineering From fa3d06dfaf6f41166d76fe09ef84506ca822d8fd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 4 Mar 2019 18:08:25 +0000 Subject: [PATCH 08/38] Branching f30 from rawhide, second attempt after platform:f31 enablement Signed-off-by: Fedora Release Engineering From 3dab8d17c72bef65e78402915c7a66828d9ebe4b Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Wed, 12 Jun 2019 15:41:55 +0200 Subject: [PATCH 09/38] Start building MariaDB from dedicated stream branch Add Galera package to avoid dependency issues --- mariadb.yaml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/mariadb.yaml b/mariadb.yaml index ce72b8f..ebd93fe 100644 --- a/mariadb.yaml +++ b/mariadb.yaml @@ -15,9 +15,9 @@ data: dependencies: - buildrequires: - platform: [-f27] + platform: [] requires: - platform: [-f27] + platform: [] @@ -42,6 +42,7 @@ data: rpms: - mariadb-server - mariadb-server-galera + - galera devel: description: Devel package. rpms: @@ -61,4 +62,7 @@ data: rpms: mariadb: rationale: The main component. - ref: f29 + ref: 10.3 + galera: + rationale: Galera package for replication. + ref: f30 From cc230af1faccd0650cdcca50bc93899e735435cd Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Wed, 12 Jun 2019 19:05:34 +0200 Subject: [PATCH 10/38] Start building Galera from dedicated stream branch --- mariadb.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mariadb.yaml b/mariadb.yaml index ebd93fe..ecb7b88 100644 --- a/mariadb.yaml +++ b/mariadb.yaml @@ -65,4 +65,4 @@ data: ref: 10.3 galera: rationale: Galera package for replication. - ref: f30 + ref: mariadb-10.3 From 14ee80e873c6df6eafda9d8fd829e0b104b045e6 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Wed, 19 Jun 2019 02:06:34 +0200 Subject: [PATCH 11/38] Update for MariaDB 10.3.16 and Galera 25.3.26 From 6ce428211611a54bea4a8f1d4531d35d248758f9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 12 Aug 2019 15:00:57 +0000 Subject: [PATCH 12/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 35f2d1a3f6b0c49a71a83acf68fad5b17c40b9d7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 13 Aug 2019 19:56:42 +0000 Subject: [PATCH 13/38] Branching f31 from rawhide Signed-off-by: Fedora Release Engineering From 0829ddea08d768b7a5457b96279db10f1d10002c Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Thu, 22 Aug 2019 14:10:56 +0200 Subject: [PATCH 14/38] Update for MariaDB 10.3.17 From 4f796cd41fcb649ffb1c0adfac3754981764ae9a Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Wed, 25 Sep 2019 14:11:58 +0200 Subject: [PATCH 15/38] Rebuild after the client_ed25519.so plugin move to the mariadb-connector-c From 9f1d4f39435f0b316eae615be478e41418af1924 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Sun, 3 Nov 2019 11:46:44 +0100 Subject: [PATCH 16/38] Rebase to MariaDB 10.3.18 From 75f9263619d186de14bdefc2d11222bfeeb741b1 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Sun, 3 Nov 2019 11:51:16 +0100 Subject: [PATCH 17/38] Fixup for the last commit, the rpms/mariadb 10.3 branch data wasn't up-to-date at the time From eb49cd8d22c058b58a38a45ba57541dafa5ba346 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Wed, 27 Nov 2019 15:43:46 +0100 Subject: [PATCH 18/38] Rebuild for MariaDB 10.3.20 & galera 25.3.28 From f0a3efaa7ed4a75002424562736d6f2968c74724 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Fri, 10 Jan 2020 12:07:00 +0100 Subject: [PATCH 19/38] Rebase to 10.3.21 From 200891a6b82fd14c51259de1a27402fe508f7117 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 6 Feb 2020 18:23:52 +0000 Subject: [PATCH 20/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 982d28c2ae87cfc81302490c8aa4892d104540c5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 13 Feb 2020 12:47:46 +0000 Subject: [PATCH 21/38] Branching f32 from rawhide Signed-off-by: Fedora Release Engineering From 7173bd1974d6bc5d2474a7954b7f3f4b6bb3c1b1 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Sat, 15 Feb 2020 11:58:29 +0100 Subject: [PATCH 22/38] Stop building for EPEL-8 --- mariadb.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mariadb.yaml b/mariadb.yaml index ecb7b88..dd07f39 100644 --- a/mariadb.yaml +++ b/mariadb.yaml @@ -15,9 +15,9 @@ data: dependencies: - buildrequires: - platform: [] + platform: [-el8] requires: - platform: [] + platform: [-el8] From d0f863b34f1a7ff30987538b73d1e2d10c99b26e Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Wed, 26 Feb 2020 13:21:32 +0100 Subject: [PATCH 23/38] Rebase to 10.3.22 From 0cbdfa35391152dda12f9540e3b1539fb0fd625d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 7 Aug 2020 21:00:04 +0000 Subject: [PATCH 24/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 5a7c2504d55e6e1597b5cce5ac79549d5109fdde Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 11 Aug 2020 19:45:38 +0000 Subject: [PATCH 25/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 0985c0cfaad2106c33777b36124f45810e78828b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Aug 2020 13:27:02 +0000 Subject: [PATCH 26/38] Branching f33 from rawhide Signed-off-by: Fedora Release Engineering From e231b5513587e9fd8a1ae8a72024138dfbec521f Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Mon, 26 Oct 2020 11:30:40 +0100 Subject: [PATCH 27/38] Rebuild for MariaDB 10.3.25 From 80bcd2dcd9db0ff4b1e2d51bab1ebb5432cb09de Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Thu, 5 Nov 2020 03:00:28 +0100 Subject: [PATCH 28/38] Rebuild for MariaDB 10.3.26 and Galera 25.3.31 From 5784f8c4f02b07994686ddaeb70a71ab683911e3 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Fri, 6 Nov 2020 04:03:40 +0100 Subject: [PATCH 29/38] Disable building for other targets than Fedora --- mariadb.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mariadb.yaml b/mariadb.yaml index dd07f39..9d7cd0d 100644 --- a/mariadb.yaml +++ b/mariadb.yaml @@ -15,9 +15,9 @@ data: dependencies: - buildrequires: - platform: [-el8] + platform: [-el8, -epel8, -eln] requires: - platform: [-el8] + platform: [-el8, -epel8, -eln] From fde87ac42ed75339a8e906d5ad57449bfff57c51 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Fri, 6 Nov 2020 12:54:57 +0100 Subject: [PATCH 30/38] Rebuild after enabled CMake in-source builds From 7b2c13da20ae2bafeffacd1d6b2de5839dab262f Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Wed, 11 Nov 2020 19:20:54 +0100 Subject: [PATCH 31/38] Rebase to 10.3.27 From da8dc0ce22c790165db5a3d224d66d1f2200e003 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Thu, 12 Nov 2020 13:34:16 +0100 Subject: [PATCH 32/38] Rebuild From bd419a50df732e3a34a52a143bc8307ca41bce1b Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Tue, 9 Mar 2021 11:01:27 +0100 Subject: [PATCH 33/38] Rebuild for MariaDB 10.3.28 From b46c1f3dbf74531742982bb6695af6908fe4d1fb Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Tue, 11 May 2021 03:22:14 +0200 Subject: [PATCH 34/38] Rebuild after rebase of MariaDB to 10.3.29 From 2dfd9c9a8b8c9e4b8e512c34b48c9da8ad6de71a Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Fri, 2 Jul 2021 04:03:19 +0200 Subject: [PATCH 35/38] Rebase to 10.3.30 From 5070cc2720e28f05898192e49825153863112359 Mon Sep 17 00:00:00 2001 From: Lukas Javorsky Date: Tue, 24 May 2022 08:32:14 +0000 Subject: [PATCH 36/38] [WIP] Rebase to 10.3.34 TODO after successful build, change the ref branch back to 10.3 --- mariadb.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mariadb.yaml b/mariadb.yaml index 9d7cd0d..111a892 100644 --- a/mariadb.yaml +++ b/mariadb.yaml @@ -62,7 +62,7 @@ data: rpms: mariadb: rationale: The main component. - ref: 10.3 + ref: private-10.3-openssl3 galera: rationale: Galera package for replication. ref: mariadb-10.3 From cb02402c67477f130baae3d881d6e4fab29571cc Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Sat, 16 Jul 2022 11:38:56 +0200 Subject: [PATCH 37/38] Revert "[WIP] Rebase to 10.3.34" This reverts commit 5070cc2720e28f05898192e49825153863112359. -- The cherry-pick of the OpenSSL 3 patch wasn't successful --- mariadb.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mariadb.yaml b/mariadb.yaml index 111a892..9d7cd0d 100644 --- a/mariadb.yaml +++ b/mariadb.yaml @@ -62,7 +62,7 @@ data: rpms: mariadb: rationale: The main component. - ref: private-10.3-openssl3 + ref: 10.3 galera: rationale: Galera package for replication. ref: mariadb-10.3 From 8d044d4183453c0f59360436a64ba244f35e7dde Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Sat, 16 Jul 2022 11:42:30 +0200 Subject: [PATCH 38/38] Rebase to MariaDB 10.3.35 and Galera 25.3.35 Constraining the stream to a Fedora 35, beacuse F<35 reached EOL, and F>35 requires OpenSSL 3 --- mariadb.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mariadb.yaml b/mariadb.yaml index 9d7cd0d..0230f65 100644 --- a/mariadb.yaml +++ b/mariadb.yaml @@ -15,9 +15,9 @@ data: dependencies: - buildrequires: - platform: [-el8, -epel8, -eln] + platform: [f35] requires: - platform: [-el8, -epel8, -eln] + platform: [f35]