diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-27 10:51:20 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-27 10:51:20 +0300 |
| commit | ea847cbeaf76817aab8817f849e80e8ce8b2b43c (patch) | |
| tree | 597ba0e93bc4fdfac5e5a9ad215351b8d0c0e7be /debian | |
| parent | 03174cabd71e0e72746736a3abf24af3931292d8 (diff) | |
| parent | dd7e9fb38a71064992a12ca58b5366f48b21e0b4 (diff) | |
| download | mariadb-git-ea847cbeaf76817aab8817f849e80e8ce8b2b43c.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'debian')
| -rwxr-xr-x | debian/autobake-deb.sh | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index 50d839439e5..14e9214dde9 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -56,8 +56,15 @@ remove_rocksdb_tools() architecture=$(dpkg-architecture -q DEB_BUILD_ARCH) -CODENAME="$(lsb_release -sc)" -case "${CODENAME}" in +LSBID="$(lsb_release -si | tr '[:upper:]' '[:lower:]')" +LSBVERSION="$(lsb_release -sr | sed -e "s#\.##g")" +LSBNAME="$(lsb_release -sc)" + +if [ -z "${LSBID}" ] +then + LSBID="unknown" +fi +case "${LSBNAME}" in stretch) # MDEV-16525 libzstd-dev-1.1.3 minimum version sed -e '/libzstd-dev/d' \ @@ -90,7 +97,7 @@ case "${CODENAME}" in fi ;; *) - echo "Error - unknown release codename $CODENAME" >&2 + echo "Error - unknown release codename $LSBNAME" >&2 exit 1 esac @@ -107,9 +114,9 @@ UPSTREAM="${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}${ PATCHLEVEL="+maria" LOGSTRING="MariaDB build" EPOCH="1:" -VERSION="${EPOCH}${UPSTREAM}${PATCHLEVEL}~${CODENAME}" +VERSION="${EPOCH}${UPSTREAM}${PATCHLEVEL}~${LSBID:0:3}${LSBVERSION}" -dch -b -D "${CODENAME}" -v "${VERSION}" "Automatic build with ${LOGSTRING}." --controlmaint +dch -b -D ${LSBNAME} -v "${VERSION}" "Automatic build with ${LOGSTRING}." --controlmaint echo "Creating package version ${VERSION} ... " |