Skip to content
Snippets Groups Projects

Draft: Prepare upload to Galera 26.4.20 to Ubuntu 24.04 "Noble"

Open Otto Kekäläinen requested to merge otto/galera:ubuntu/24.04-noble into ubuntu/24.04-noble
galera-4 (26.4.20-0ubuntu0.24.04.1) noble; urgency=medium

  * New upstream release 26.4.20. Includes multiple bug fixes, see
    https://github.com/codership/documentation/blob/master/release-notes/release-notes-galera-26.4.20.txt
    https://github.com/codership/documentation/blob/master/release-notes/release-notes-galera-26.4.19.txt
    https://github.com/codership/documentation/blob/master/release-notes/release-notes-galera-26.4.18.txt
    https://github.com/codership/documentation/blob/master/release-notes/release-notes-galera-26.4.17.txt
  * Drop build issue patch that was merged into upstream release 20.4.18
  * New upstream signing key 3D53839A70BC938B08CDD47F45460A518DA84635,
    verified from 26.4.17 release notes

There are zero bugs in Ubuntu, so no additional fixes are needed in this release: https://launchpad.net/ubuntu/+source/galera-4

This is a pure upstream minor/micro release bugfix import.

Uploads to Debian unstable and stable-proposed have already been done, and no regressions have been reported so far.

Imported with commands:

(on new ubuntu/24.04-noble branch with gbp.conf etc configured)

± git cherry-pick -x fc471c0f
[ubuntu/24.04-noble 922d736b] New upstream signing key 3D53839A70BC938B08CDD47F45460A518DA84635
 Date: Sat Apr 13 17:19:42 2024 -0700
 1 file changed, 52 insertions(+), 30 deletions(-)
 rewrite debian/upstream/signing-key.asc (94%)

± gbp import-ref --upstream-version=26.4.20
gbp:warning: This script is experimental, it might change incompatibly between versions.
gbp:info: Replacing upstream source on 'ubuntu/24.04-noble'
gbp:info: Running Postimport hook
gbp:info: Successfully imported version 26.4.20

± gbp dch  --commit --commit-msg="Update changelog and refresh patches after %(version)s import" \
>       -- debian
gbp:info: Changelog last touched at 'c5929f4df685c2b3252ed5e5d0205d7d43a4a08b'
gbp:info: Continuing from commit 'c5929f4df685c2b3252ed5e5d0205d7d43a4a08b'
gbp:info: Only looking for changes on 'debian'
gbp:info: Changelog committed for version 26.4.20-0ubuntu0.24.04.1

(dropped patch manually and polished changelog manually)

± while quilt push; do quilt refresh; done; quilt pop -a
Applying patch rename-daemon-user.patch
patching file garb/files/garb.service
patching file garb/files/garb.sh

Now at patch rename-daemon-user.patch
Patch rename-daemon-user.patch is unchanged
Applying patch small_gcache_size_for_salsa.patch
patching file galera/tests/defaults_check.cpp

Now at patch small_gcache_size_for_salsa.patch
Patch small_gcache_size_for_salsa.patch is unchanged
File series fully applied, ends at patch small_gcache_size_for_salsa.patch
Removing patch small_gcache_size_for_salsa.patch
Restoring galera/tests/defaults_check.cpp

Removing patch rename-daemon-user.patch
Restoring garb/files/garb.sh
Restoring garb/files/garb.service

No patches applied

± git citool --amend

Git history view: image

See commits for more details. Due to how GitLab works, the Commits tab shows a large amount of upstream commits which can be disregarded. The version control changes are probably easiest to review locally with the command git difftool --dir-diff ubuntu/26.4.16-2build4:

image

Test builds at https://launchpad.net/~mysql-ubuntu/+archive/ubuntu/mariadb/+builds?build_text=&build_state=all passed:

image

Draft

This is a draft, as it uses an experimental ubuntu branch of Salsa CI in @ahmedsiam's account.

Edited by Otto Kekäläinen

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
Please register or sign in to reply
Loading