Commit 157a838b authored by Daniel Black's avatar Daniel Black

MDEV-28153: Debian autobake- use absolute dependencies rather than a buildtime detection

While moving to a prescribed dependencies in MDEV-28011, an error was made
in the merge. The Ubuntu and Debian supported architectures of rocksdb-tools
are different and need to be treated as such.

This actually had no effect as our support of mariadb-plugin-rocksdb was never
different to the distro support of rocksdb-tools. Some notes where added
to this affect.

There is also nothing to do for Debian sid, and never should be.

The differentiation and grouping of distro codenames is for convenience in
merging upwards as more dependencies change across distro versions.

The fixing of versions rather than relying on apt-cache to be correct prevents
unstable changes between releases, and potentially uninstallable packages like
happened in MDEV-28014.

Correct comment about zstd to MDEV-16525
parent b101f19d
...@@ -16,6 +16,7 @@ set -e ...@@ -16,6 +16,7 @@ set -e
# Buildbot, running the test suite from installed .debs on a clean VM. # Buildbot, running the test suite from installed .debs on a clean VM.
export DEB_BUILD_OPTIONS="nocheck $DEB_BUILD_OPTIONS" export DEB_BUILD_OPTIONS="nocheck $DEB_BUILD_OPTIONS"
source ./VERSION
# General CI optimizations to keep build output smaller # General CI optimizations to keep build output smaller
if [[ $GITLAB_CI ]] if [[ $GITLAB_CI ]]
then then
...@@ -50,29 +51,50 @@ remove_rocksdb_tools() ...@@ -50,29 +51,50 @@ remove_rocksdb_tools()
fi fi
} }
architecture=$(dpkg-architecture -q DEB_BUILD_ARCH)
CODENAME="$(lsb_release -sc)" CODENAME="$(lsb_release -sc)"
case "${CODENAME}" in case "${CODENAME}" in
stretch) stretch)
# MDEV-28022 libzstd-dev-1.1.3 minimum version # MDEV-16525 libzstd-dev-1.1.3 minimum version
sed -i -e '/libzstd-dev/d' \ sed -e '/libzstd-dev/d' \
-e 's/libcurl4/libcurl3/g' -i debian/control -e 's/libcurl4/libcurl3/g' -i debian/control
remove_rocksdb_tools remove_rocksdb_tools
;&
buster)
;&
bullseye|bookworm)
# mariadb-plugin-rocksdb in control is 4 arches covered by the distro rocksdb-tools
# so no removal is necessary.
;&
sid)
# should always be empty here.
# need to match here to avoid the default Error however
;; ;;
# UBUNTU
bionic) bionic)
remove_rocksdb_tools remove_rocksdb_tools
;&
focal)
;&
impish|jammy)
# mariadb-plugin-rocksdb s390x not supported by us (yet)
# ubuntu doesn't support mips64el yet, so keep this just
# in case something changes.
if [[ ! "$architecture" =~ amd64|arm64|ppc64el|s390x ]]
then
remove_rocksdb_tools
fi
;; ;;
*)
echo "Error - unknown release codename $CODENAME" >&2
exit 1
esac esac
if [[ ! "$(dpkg-architecture -q DEB_BUILD_ARCH)" =~ amd64|arm64|ppc64el|s390x ]]
then
remove_rocksdb_tools
fi
# Adjust changelog, add new version # Adjust changelog, add new version
echo "Incrementing changelog and starting build scripts" echo "Incrementing changelog and starting build scripts"
# Find major.minor version # Find major.minor version
source ./VERSION
UPSTREAM="${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}${MYSQL_VERSION_EXTRA}" UPSTREAM="${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}${MYSQL_VERSION_EXTRA}"
PATCHLEVEL="+maria" PATCHLEVEL="+maria"
LOGSTRING="MariaDB build" LOGSTRING="MariaDB build"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment