diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-27 10:59:31 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-27 10:59:31 +0300 |
| commit | 87bd79b1e7b15cd323e4b4ed8abe139895bf5b6f (patch) | |
| tree | 2e626434665ec6bb569feb8a850908dda7b6aa70 /debian | |
| parent | d96436c99905ed30494c6a52841ca17a558f44c6 (diff) | |
| parent | ea847cbeaf76817aab8817f849e80e8ce8b2b43c (diff) | |
| download | mariadb-git-87bd79b1e7b15cd323e4b4ed8abe139895bf5b6f.tar.gz | |
Merge 10.5 into 10.6
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 b1e7a8453ef..e0aecc9d8a8 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -69,8 +69,15 @@ disable_pmem() 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' \ @@ -127,7 +134,7 @@ case "${CODENAME}" in fi ;; *) - echo "Error - unknown release codename $CODENAME" >&2 + echo "Error - unknown release codename $LSBNAME" >&2 exit 1 esac @@ -144,9 +151,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} ... " |