Skip to content
Snippets Groups Projects
Commit 2cab13d0 authored by Otto Kekäläinen's avatar Otto Kekäläinen
Browse files

Update Breaks/Replaces and READMEs

Extend list of repositories to check across and update Breaks/Replaces
to fix following errors:

  [ERROR] Missing Breaks/Replaces found
  [ERROR] mariadb-client-10.6 conflicts with mysql-server-5.5 files:
  {'/usr/share/man/man1/mysqlbinlog.1.gz',
  '/usr/share/man/man1/mysql_secure_installation.1.gz',
  '/usr/bin/resolve_stack_dump', '/usr/bin/msql2mysql',
  '/usr/share/man/man1/msql2mysql.1.gz',
  '/usr/share/man/man1/mysql_tzinfo_to_sql.1.gz',
  '/usr/share/man/man1/mysqlhotcopy.1.gz',
  '/usr/share/man/man1/perror.1.gz',
  '/usr/share/man/man1/mysql_convert_table_format.1.gz',
  '/usr/share/man/man1/replace.1.gz',
  '/usr/share/man/man1/mysql_setpermission.1.gz',
  '/usr/share/man/man1/resolve_stack_dump.1.gz', '/usr/bin/perror',
  '/usr/bin/replace'}

  [ERROR] Missing Breaks/Replaces found
  [ERROR] mariadb-client-core-10.6 conflicts with mysql-server-core-5.5
  files: {'/usr/bin/my_print_defaults',
  '/usr/share/man/man1/my_print_defaults.1.gz'}

Also refresh READMEs on testing commands.
parent 8754ea25
1 merge request!22Salsa-CI: Re-enable upgrade tests for Buster to Sid
Pipeline #467675 passed with warnings with stages
in 2 hours, 20 minutes, and 23 seconds
......@@ -346,45 +346,53 @@ repositories one needs to run:
docker run -it -v ${PWD}:/build -w /build debian:sid bash
apt update
apt install --yes python3-junit.xml python3-debian apt-file
curl -O https://salsa.debian.org/salsa-ci-team/pipeline/-/raw/master/images/scripts/check_for_missing_breaks_replaces.py
chmod +x check_for_missing_breaks_replaces.py
apt install --no-install-recommends --yes gpg gpg-agent dirmngr ca-certificates curl debian-archive-keyring
curl -sS https://mariadb.org/mariadb_release_signing_key.asc -o /etc/apt/trusted.gpg.d/mariadb.asc
apt-key adv --recv-keys --keyserver hkps://keyserver.ubuntu.com:443 871920D1991BC93C 3B4FE6ACC0B21F32 CBF8D6FD518E17E1 7638D0442B90D010 8C718D3B5072E1F5 9334A25F8507EFA5 CBCB082A1BB943DB 467B942D3A79BD29
cat > /etc/apt/sources.list <<EOF
deb http://deb.debian.org/debian sid main
gpg --list-keys # Initialize default keyring
gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/mariadb.gpg --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys 871920D1991BC93C 3B4FE6ACC0B21F32 CBF8D6FD518E17E1 7638D0442B90D010 8C718D3B5072E1F5 9334A25F8507EFA5 CBCB082A1BB943DB 467B942D3A79BD29
chmod 644 /etc/apt/trusted.gpg.d/mariadb.gpg
cat > /etc/apt/sources.list.d/mariadb.list <<EOF
deb http://deb.debian.org/debian bullseye main
deb http://deb.debian.org/debian buster main
deb http://deb.debian.org/debian stretch main
deb http://deb.debian.org/debian jessie main
deb [trusted=yes] http://deb.debian.org/debian jessie main
deb http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse
deb http://archive.ubuntu.com/ubuntu/ focal main restricted universe multiverse
deb http://archive.ubuntu.com/ubuntu/ bionic main restricted universe multiverse
deb http://archive.ubuntu.com/ubuntu/ xenial main restricted universe multiverse
deb http://archive.ubuntu.com/ubuntu/ trusty main restricted universe multiverse
deb https://deb.mariadb.org/10.8/debian bullseye main
deb https://deb.mariadb.org/10.7/debian bullseye main
deb https://deb.mariadb.org/10.6/debian buster main
deb https://deb.mariadb.org/10.5/debian buster main
deb https://deb.mariadb.org/10.4/debian buster main
deb https://deb.mariadb.org/10.3/debian buster main
deb https://deb.mariadb.org/10.2/debian buster main
deb https://deb.mariadb.org/10.1/debian stretch main
deb [trusted=yes] https://deb.mariadb.org/10.0/debian jessie main
deb [trusted=yes] https://deb.mariadb.org/5.5/debian wheezy main
deb https://archive.mariadb.org/mariadb-10.11/repo/debian bullseye main
deb https://archive.mariadb.org/mariadb-10.10/repo/debian bullseye main
deb https://archive.mariadb.org/mariadb-10.9/repo/debian bullseye main
deb https://archive.mariadb.org/mariadb-10.8/repo/debian bullseye main
deb https://archive.mariadb.org/mariadb-10.7/repo/debian bullseye main
deb https://archive.mariadb.org/mariadb-10.6/repo/debian buster main
deb https://archive.mariadb.org/mariadb-10.5/repo/debian buster main
deb https://archive.mariadb.org/mariadb-10.4/repo/debian buster main
deb https://archive.mariadb.org/mariadb-10.3/repo/debian buster main
deb https://archive.mariadb.org/mariadb-10.2/repo/debian buster main
deb https://archive.mariadb.org/mariadb-10.1/repo/debian stretch main
deb [trusted=yes] https://archive.mariadb.org/mariadb-10.0/repo/debian jessie main
deb [trusted=yes] https://archive.mariadb.org/mariadb-5.5/repo/debian wheezy main
deb https://repo.mysql.com/apt/ubuntu/ jammy mysql-8.0
deb https://repo.mysql.com/apt/ubuntu/ focal mysql-8.0
deb https://repo.mysql.com/apt/debian/ buster mysql-8.0
deb https://repo.mysql.com/apt/debian/ buster mysql-5.7
deb https://repo.mysql.com/apt/debian/ buster mysql-5.6
deb https://repo.mysql.com/apt/debian/ buster mysql-cluster-8.0
deb https://repo.mysql.com/apt/debian/ buster mysql-tools
deb https://repo.mysql.com/apt/debian/ buster mysql-cluster-7.6
deb https://repo.mysql.com/apt/debian/ buster mysql-cluster-7.5
deb https://repo.mysql.com/apt/debian/ buster mysql-tools
deb https://repo.percona.com/apt/ bullseye main
deb https://repo.percona.com/apt/ buster main
deb https://repo.percona.com/apt/ stretch main
deb https://repo.percona.com/apt/ jessie main
deb https://repo.percona.com/apt/ wheezy main
EOF
apt install --yes python3-junit.xml python3-debian apt-file
apt-file update
curl -O https://salsa.debian.org/salsa-ci-team/pipeline/-/raw/master/images/scripts/check_for_missing_breaks_replaces.py
chmod +x check_for_missing_breaks_replaces.py
./check_for_missing_breaks_replaces.py --changes-file mariadb-*.changes --debug
## Check reverse dependencies
......
......@@ -25,9 +25,9 @@ This can be done by using dgit. The example command below will fetch the latest
mariadb-10.1 package available in Ubuntu 18.04 (Bionic) base archive, security
archive or updates archive (whichever has a newer version):
dgit -d ubuntu clone mariadb-10.1 bionic,-security,-updates
cp -ra mariadb-10.1/* .
rm -rf mariadb-10.1
dgit -d ubuntu clone mariadb-10.6 jammy,-security,-updates
cp -ra mariadb-10.6/* .
rm -rf mariadb-10.6
You can then compare these two directories with a recursive diff or `git diff`.
......@@ -36,8 +36,8 @@ Another option is to manually check on packages.debian.org or packages.ubuntu.co
what is the latest version, and download and extract it on top of the existing
debian/ directory with:
curl -SL http://archive.ubuntu.com/ubuntu/pool/universe/m/mariadb-10.1/\
mariadb-10.1_10.1.44-0ubuntu0.18.04.1.debian.tar.xz -o - | tar xv --xz
curl -SL https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/mariadb-10.6/\
1:10.6.7-2ubuntu1.1/mariadb-10.6_10.6.7-2ubuntu1.1.debian.tar.xz -o - | tar xv --xz
You can simply run `git diff` to see the report on differences.
......@@ -66,9 +66,9 @@ Download new source package:
git checkout 10.6
git pull --tags upstream 10.6
git tag -v mariadb-10.6.5
git tag -v mariadb-10.6.12
git checkout debian/latest
git merge -v mariadb-10.6.5
git merge -v mariadb-10.6.12
Refresh patches:
......@@ -152,21 +152,15 @@ needs to be tested on the Ubuntu release which most closely matches the Debian
release in question. The following matrix maps what package should be tested
where:
- 10.6 for sid on Launchpad impish
- 10.5 for hirsute on Launchpad hirsute
- 10.5 for groovy on Launchpad groovy
- 10.5 for bullseye on Launchpad hirsute
- 10.3 for groovy on Launchpad groovy
- 10.6 for sid on Launchpad lunar
- 10.6 for kinetic on Launchpad kinetic
- 10.6 for jammy on Launchpad jammy
- 10.5 for bullseye on Launchpad hirsute (not available anymore)
- 10.3 for focal on Launchpad focal
- 10.3 for buster on Launchpad disco (not available anymore)
- 10.1 for bionic on Launchpad bionic
- 10.1 for stretch on Launchpad xenial (not available anymore)
NOTE! As long as Launchpad builders are running an older kernel, the MariaDB
10.6 built with liburing will fail to start on them. See
- https://jira.mariadb.org/browse/MDEV-26569
- https://bugs.launchpad.net/launchpad/+bug/1943292
## Uploading security releases to Debian
After you've got permission from the security team, upload with `dput security-master *.changes`.
......@@ -185,14 +179,13 @@ regressions before they spread out to too many users.
Upload priority for 10.6
- debian sid
- ubuntu-22.10 kinetic
- ubuntu-22.04 jammy
Upload priority for 10.5
- debian bullseye
- ubuntu-21.10
- ubuntu-21.04
- debian-11 bullseye
Upload priority for 10.3
- ubuntu-20.10 groovy
- ubuntu-20.04 focal
- debian-10 buster
......@@ -200,9 +193,6 @@ for 10.1 (only in case there are extra releases after official EOL)
- ubuntu-18.04 bionic
- debian-9 stretch
for 10.0 (only in case there are extra releases after official EOL)
- ubuntu-16.04 xenial
## Comparison to other distributions
For tracking security release information, finding solutions for build errors
......
......@@ -203,6 +203,7 @@ Breaks: mariadb-client-10.0,
mysql-client-core-5.6,
mysql-client-core-5.7,
mysql-client-core-8.0,
mysql-server-core-5.5,
mysql-server-core-5.6,
mysql-server-core-5.7,
mysql-server-core-8.0,
......@@ -230,6 +231,7 @@ Replaces: mariadb-client-10.0,
mysql-client-core-5.6,
mysql-client-core-5.7,
mysql-client-core-8.0,
mysql-server-core-5.5,
mysql-server-core-5.6,
mysql-server-core-5.7,
mysql-server-core-8.0,
......@@ -288,6 +290,7 @@ Breaks: mariadb-client-10.0,
mysql-client-5.6,
mysql-client-5.7,
mysql-client-8.0,
mysql-server-5.5,
mysql-server-5.7,
mysql-server-core-8.0,
percona-server-server-5.6,
......@@ -318,6 +321,7 @@ Replaces: mariadb-client-10.0,
mysql-client-5.6,
mysql-client-5.7,
mysql-client-8.0,
mysql-server-5.5,
mysql-server-5.7,
mysql-server-core-8.0,
mytop,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment