From b8d2c5077ab60ab7ef410aee9e28491f39de9ea9 Mon Sep 17 00:00:00 2001 From: Vadim Yalovets Date: Tue, 28 May 2024 13:16:29 +0300 Subject: [PATCH 1/3] Add ubuntu noble pxb --- .../xtrabackup/utils/percona-xtrabackup-8.0_builder.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh b/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh index 9d8b862d278..0189e973fd2 100644 --- a/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh +++ b/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh @@ -340,7 +340,7 @@ 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 + if [ "${OS_NAME}" != "bookworm" && "${OS_NAME}" != "noble" ]; then PKGLIST+=" libprocps-dev" else PKGLIST+=" libproc2-dev" @@ -348,7 +348,7 @@ install_deps() { if [ "${OS_NAME}" == "bionic" ]; then PKGLIST+=" gcc-8 g++-8" 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" From 14f2f92cb15bed68115cb6435ad24a26d82cd127 Mon Sep 17 00:00:00 2001 From: Vadim Yalovets Date: Tue, 28 May 2024 13:45:42 +0300 Subject: [PATCH 2/3] Add ubuntu noble pxb --- .../xtrabackup/utils/percona-xtrabackup-8.0_builder.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh b/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh index 0189e973fd2..57c100d0221 100644 --- a/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh +++ b/storage/innobase/xtrabackup/utils/percona-xtrabackup-8.0_builder.sh @@ -340,10 +340,10 @@ 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" && "${OS_NAME}" != "noble" ]; 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" From 5f6ab07e267d8c9e5304e90e535adbe9ff21b648 Mon Sep 17 00:00:00 2001 From: Vadim Yalovets Date: Tue, 28 May 2024 18:30:45 +0300 Subject: [PATCH 3/3] Add ubuntu noble pxb --- storage/innobase/xtrabackup/utils/debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/innobase/xtrabackup/utils/debian/rules b/storage/innobase/xtrabackup/utils/debian/rules index 933c9b4d157..6122cba321a 100755 --- a/storage/innobase/xtrabackup/utils/debian/rules +++ b/storage/innobase/xtrabackup/utils/debian/rules @@ -26,14 +26,14 @@ ifeq "$(DEB_DUMMY)" "" cmake .. -DBUILD_CONFIG=xtrabackup_release -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr \ -DWITH_SSL=system -DINSTALL_MYSQLTESTDIR=/usr/share/percona-xtrabackup-test-80 \ -DINSTALL_MANDIR=/usr/share/man -DWITH_MAN_PAGES=1 -DMINIMAL_RELWITHDEBINFO=OFF \ - -DDOWNLOAD_BOOST=1 -DWITH_BOOST=libboost -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \ + -DDOWNLOAD_BOOST=1 -DWITH_BOOST=libboost -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock -DOPENSSL_ROOT_DIR=/usr/lib/x86_64-linux-gnu \ -DINSTALL_PLUGINDIR=lib/xtrabackup/plugin -DFORCE_INSOURCE_BUILD=1 -DWITH_ZLIB=bundled -DWITH_ZSTD=bundled -DWITH_PROTOBUF=bundled && \ cd .. ( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \ cmake .. -DBUILD_CONFIG=xtrabackup_release -DCMAKE_INSTALL_PREFIX=/usr \ -DWITH_SSL=system -DINSTALL_MYSQLTESTDIR=/usr/share/percona-xtrabackup-test-80 \ -DINSTALL_MANDIR=/usr/share/man -DWITH_MAN_PAGES=1 -DMINIMAL_RELWITHDEBINFO=OFF \ - -DDOWNLOAD_BOOST=1 -DWITH_BOOST=libboost -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \ + -DDOWNLOAD_BOOST=1 -DWITH_BOOST=libboost -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock -DOPENSSL_ROOT_DIR=/usr/lib/x86_64-linux-gnu \ -DINSTALL_PLUGINDIR=lib/xtrabackup/plugin -DFORCE_INSOURCE_BUILD=1 -DWITH_ZLIB=bundled -DWITH_ZSTD=bundled -DWITH_PROTOBUF=bundled else # Dummy binaries that avoid compilation