Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MDEV-34721: Make debian/autobake-debs.sh change compat level when needed #3512

Open
wants to merge 1 commit into
base: 10.11
Choose a base branch
from

Conversation

illuusio
Copy link
Contributor

  • The Jira issue number for this PR is: MDEV-34721

Description

Debian Deb Compat level version 12 brings more Systemd confort to Debian package installation handling.
Althought it's not working correctly on certain Debian and Ubuntu version which MariaDB supports.

Commit add change to compat level to version 12 when it's should be working correctly.

Currently these distros that are changed:

  • Debian Bullseye (11)
  • Debian Bookwork (12)
  • Debian Trixie (13)
  • Debian Sid
  • Ubuntu Lunar (23.04)
  • Ubuntu Mantic (23.10)
  • Ubuntu Noble (24.04)
  • Ubuntu Oracular (24.10)

Release Notes

Bit tricky one as this changes compat level but should not be seen to user anyhow

How can this PR be tested?

Manually on docker one can pull repo and run AUTOBAKE_PREP_CONTROL_RULES_ONLY=1 debian/autobuild-debs.sh and see with git diff if changes have been made or not.
One can also download debs from this Salsa-CI build to test with https://salsa.debian.org/illuusio/mariadb-server/-/commit/5efd075a00b80d916cf25f92b0bc433ef9cb4d46

and see if that build is all green.

Basing the PR against the correct MariaDB version

  • This is a bug fix, and the PR is based against the earliest maintained branch in which the bug can be reproduced.

PR quality check

  • I checked the CODING_STANDARDS.md file and my PR conforms to this where appropriate.
  • For any trivial modifications to the PR, I am ok with the reviewer making the changes themselves.

Debian Deb Compat level version 12 brings more Systemd confort
to Debian package installation handling.
Althought it's not working correctly on certain Debian and
Ubuntu version which MariaDB supports.

Commit add change to compat level to version 12 when
it's should be working correctly.

Currently these distros that are changed:
  * Debian Bullseye (11)
  * Debian Bookwork (12)
  * Debian Trixie (13)
  * Debian Sid
  * Ubuntu Lunar (23.04)
  * Ubuntu Mantic (23.10)
  * Ubuntu Noble (24.04)
  * Ubuntu Oracular (24.10)
@illuusio illuusio force-pushed the 10.11-MDEV-34721-update-compat-level branch from 0fc9516 to 72b67be Compare October 7, 2024 06:44
@@ -111,9 +119,10 @@ in
"buster")
disable_libfmt
replace_uring_with_aio
;&
;;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probably safer to remove "buster" (EOL) as all the previous following cases are now removed because of ;;.

"bullseye")
add_lsb_base_depends
change_compat_level 12
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The general pattern here is the config has the most recent version, and that early versions push this back.

So:

  1. remove change_compat_level 12 from existing locations.
  2. add change_compat_level 11 to jammy branch

@@ -134,12 +145,13 @@ in
;&
"jammy"|"kinetic")
add_lsb_base_depends
;&
;;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is changing the behaviour of the fall throughs.

Recommend:

  1. leave this as ;&. Remove kinetic as its EOL. Add change_compat 11.

https://mariadb.com/kb/en/mariadb-platform-deprecation-policy/

@@ -192,6 +192,11 @@ override_dh_installinit-arch:
override_dh_gencontrol:
dh_gencontrol -- -Tdebian/substvars

# When running compat level 12 or higher this is needed
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

uncomment this.

Change the debian/compat to contain 12.

echo "${1}" > debian/compat
sed -e 's/ --fail-missing//' \
-e 's/#override_dh_missing/override_dh_missing/' \
-e 's/#\tdh_missing/\tdh_missing/' -i debian/rules
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To make this a backwards moving to compat 11, keep the echo and replace with a simpler sed to remove the paragraph of compat level 12 for when change_compat_level 11 is specified.

sed -e '/compat level 12/,/^$/d' -i debian/rules

removes the paragraph.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants