Merge pull request #1565 from adivinho/trunk

Add noble to 8x-innovation
percona · May 29, 2024 · 561877d · 561877d
2 parents 786e71a + b8a4f19
commit 561877d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/storage/innobase/xtrabackup/utils/build-binary.sh b/storage/innobase/xtrabackup/utils/build-binary.sh
@@ -129,7 +129,7 @@ mkdir "$INSTALLDIR"
     if test "x$exit_value" = "x0"
     then
 
-        LIBLIST="libaio.so libprocps.so libgcrypt.so libcrypto.so libssl.so libreadline.so libtinfo.so libsasl2.so librtmp.so libssl3.so libsmime3.so libnss3.so libnssutil3.so libplds4.so libplc4.so libnspr4.so"
+        LIBLIST="libaio.so libprocps.so libreadline.so libtinfo.so libsasl2.so librtmp.so libssl3.so libsmime3.so libnss3.so libnssutil3.so libplds4.so libplc4.so libnspr4.so"
         DIRLIST="bin lib lib/private lib/plugin"
 
         LIBPATH=""

diff --git a/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh b/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh
@@ -346,18 +346,18 @@ install_deps() {
         PKGLIST+=" cmake debhelper libaio-dev libncurses-dev libtool libz-dev libsasl2-dev vim-common"
         PKGLIST+=" libgcrypt-dev libev-dev lsb-release libudev-dev"
         PKGLIST+=" build-essential rsync libdbd-mysql-perl libnuma1 socat libssl-dev patchelf libicu-dev"
-        if [ "${OS_NAME}" != "bookworm" ]; then
-            PKGLIST+=" libprocps-dev"
-        else
+        if [ "${OS_NAME}" == "bookworm" -o "${OS_NAME}" == "noble" ]; then
             PKGLIST+=" libproc2-dev"
+        else
+            PKGLIST+=" libprocps-dev"
         fi
         if [ "${OS_NAME}" == "bionic" ]; then
             PKGLIST+=" gcc-8 g++-8"
 	fi
         if [ "${OS_NAME}" == "focal" ]; then
             PKGLIST+=" gcc-10 g++-10"
         fi
-        if [ "${OS_NAME}" == "focal" -o "${OS_NAME}" == "bullseye" -o "${OS_NAME}" == "bookworm" -o "${OS_NAME}" == "jammy" ]; then
+        if [ "${OS_NAME}" == "focal" -o "${OS_NAME}" == "bullseye" -o "${OS_NAME}" == "bookworm" -o "${OS_NAME}" == "jammy" -o "${OS_NAME}" == "noble" ]; then
             PKGLIST+=" python3-sphinx python3-docutils"
         else
             PKGLIST+=" python-sphinx python-docutils"