@@ -383,13 +383,19 @@ enable_zenfs() {
383383
384384get_system (){
385385 if [ -f /etc/redhat-release ]; then
386- GLIBC_VER_TMP=" $( rpm glibc -qa --qf %{VERSION}) "
387- RHEL=$( rpm --eval %rhel)
388- ARCH=$( echo $( uname -m) | sed -e ' s:i686:i386:g' )
389- OS_NAME=" el$RHEL "
390- OS=" rpm"
386+ export GLIBC_VER_TMP=" $( rpm glibc -qa --qf %{VERSION}) "
387+ export RHEL=$( rpm --eval %rhel)
388+ export ARCH=$( echo $( uname -m) | sed -e ' s:i686:i386:g' )
389+ export OS_NAME=" el$RHEL "
390+ export OS=" rpm"
391+ elif [ -f /etc/amazon-linux-release ]; then
392+ export GLIBC_VER_TMP=" $( rpm glibc -qa --qf %{VERSION}) "
393+ export RHEL=$( rpm --eval %amzn)
394+ export ARCH=$( echo $( uname -m) | sed -e ' s:i686:i386:g' )
395+ export OS_NAME=" amzn$RHEL "
396+ export OS=" rpm"
391397 else
392- GLIBC_VER_TMP=" $( dpkg-query -W -f=' ${Version}' libc6 | awk -F' -' ' {print $1}' ) "
398+ GLIBC_VER_TMP=" $( dpkg-query -W -f=' ${Version}' libc6 | awk -F' -' ' {print $1}' ) "
393399 ARCH=$( uname -m)
394400 OS_NAME=" $( lsb_release -sc) "
395401 OS=" deb"
@@ -430,8 +436,6 @@ install_deps() {
430436 CURPLACE=$( pwd)
431437
432438 if [ " x$OS " = " xrpm" ]; then
433- RHEL=$( rpm --eval %rhel)
434- ARCH=$( echo $( uname -m) | sed -e ' s:i686:i386:g' )
435439 if [ " x${RHEL} " = " x8" -o " x${RHEL} " = " x7" ]; then
436440 switch_to_vault_repo
437441 fi
@@ -443,12 +447,16 @@ install_deps() {
443447 # percona-release enable tools experimental
444448 else
445449 yum -y install yum-utils
446- yum-config-manager --enable ol" ${RHEL} " _codeready_builder
450+ if [ " x${RHEL} " != " x2023" ]; then
451+ yum-config-manager --enable ol" ${RHEL} " _codeready_builder
452+ fi
447453 fi
448454 else
449- if [ " x${RHEL} " = " x9" -o " x${RHEL} " = " x8" -o " x${RHEL} " = " x10" ]; then
455+ if [ " x${RHEL} " = " x9" -o " x${RHEL} " = " x8" -o " x${RHEL} " = " x2023 " -o " x ${RHEL} " = " x10" ]; then
450456 yum -y install yum-utils
451- yum-config-manager --enable ol" ${RHEL} " _codeready_builder
457+ if [ " x${RHEL} " != " x2023" ]; then
458+ yum-config-manager --enable ol" ${RHEL} " _codeready_builder
459+ fi
452460 fi
453461 fi
454462 yum -y update
@@ -461,9 +469,12 @@ install_deps() {
461469 switch_to_vault_repo
462470 fi
463471 yum -y install git numactl-devel rpm-build gcc-c++ gperf ncurses-devel perl readline-devel openssl-devel jemalloc zstd
464- yum -y install time zlib-devel libaio-devel bison cmake3 cmake pam-devel libeatmydata jemalloc-devel pkg-config
472+ yum -y install time zlib-devel libaio-devel bison cmake3 cmake pam-devel jemalloc-devel pkg-config
465473 yum -y install perl-Time-HiRes libcurl-devel openldap-devel unzip wget libcurl-devel patchelf systemd-devel
466474 yum -y install perl-Env perl-Data-Dumper perl-JSON perl-Digest perl-Digest-MD5 perl-Digest-Perl-MD5 || true
475+ if [ " x${RHEL} " != " x2023" ]; then
476+ yum -y install libeatmydata
477+ fi
467478 if [ " ${RHEL} " -lt 8 ]; then
468479 until yum -y install centos-release-scl; do
469480 echo " waiting"
@@ -534,10 +545,16 @@ install_deps() {
534545 popd
535546 fi
536547 else
537- yum -y install MySQL-python
538- yum -y install libtirpc-devel
539- yum -y install gflags-devel
540- yum -y install libatomic
548+ if [ " x$RHEL " != " x2023" ]; then
549+ yum -y install MySQL-python
550+ yum -y install libtirpc-devel
551+ yum -y install gflags-devel
552+ yum -y install libatomic
553+ else
554+ yum -y install libtirpc-devel libatomic annobin-annocheck annobin-plugin-gcc
555+ yum -y install pip mariadb105-devel python3-devel
556+ pip install mysqlclient
557+ fi
541558 fi
542559 else
543560 until apt-get update; do
@@ -566,7 +583,7 @@ install_deps() {
566583 apt-get -y install libmecab-dev libncurses5-dev libreadline-dev libpam-dev zlib1g-dev libcurl4-openssl-dev
567584 apt-get -y install libldap2-dev libnuma-dev libjemalloc-dev libc6-dbg valgrind libjson-perl libsasl2-dev patchelf
568585 apt-get -y install libatomic1
569- if [ x" ${DIST} " = xfocal -o x" ${DIST} " = xhirsute -o x" ${DIST} " = xbullseye -o x" ${DIST} " = xjammy -o x" ${DIST} " = xbookworm -o x" ${DIST} " = xnoble ]; then
586+ if [ x" ${DIST} " = xfocal -o x" ${DIST} " = xhirsute -o x" ${DIST} " = xbullseye -o x" ${DIST} " = xjammy -o x" ${DIST} " = xbookworm -o x" ${DIST} " = xnoble -o x " ${DIST} " = xtrixie ]; then
570587 apt-get -y install python3-mysqldb
571588 else
572589 apt-get -y install python-mysqldb
@@ -588,21 +605,21 @@ install_deps() {
588605 else
589606 apt-get -y install gcc g++
590607 fi
591- if [ x" ${DIST} " = xfocal -o x" ${DIST} " = xbionic -o x" ${DIST} " = xdisco -o x" ${DIST} " = xbuster -o x" ${DIST} " = xhirsute -o x" ${DIST} " = xbullseye -o x" ${DIST} " = xjammy -o x" ${DIST} " = xbookworm -o x" ${DIST} " = xnoble ]; then
608+ if [ x" ${DIST} " = xfocal -o x" ${DIST} " = xbionic -o x" ${DIST} " = xdisco -o x" ${DIST} " = xbuster -o x" ${DIST} " = xhirsute -o x" ${DIST} " = xbullseye -o x" ${DIST} " = xjammy -o x" ${DIST} " = xbookworm -o x" ${DIST} " = xnoble -o x " ${DIST} " = xtrixie ]; then
592609 apt-get -y install libeatmydata1
593610 fi
594- if [ x" ${DIST} " = xfocal -o x" ${DIST} " = xbionic -o x" ${DIST} " = xstretch -o x" ${DIST} " = xdisco -o x" ${DIST} " = xbuster -o x" ${DIST} " = xhirsute -o x" ${DIST} " = xbullseye -o x" ${DIST} " = xjammy -o x" ${DIST} " = xbookworm -o x" ${DIST} " = xnoble ]; then
611+ if [ x" ${DIST} " = xfocal -o x" ${DIST} " = xbionic -o x" ${DIST} " = xstretch -o x" ${DIST} " = xdisco -o x" ${DIST} " = xbuster -o x" ${DIST} " = xhirsute -o x" ${DIST} " = xbullseye -o x" ${DIST} " = xjammy -o x" ${DIST} " = xbookworm -o x" ${DIST} " = xnoble -o x " ${DIST} " = xtrixie ]; then
595612 apt-get -y install libzstd-dev
596613 else
597614 apt-get -y install libzstd1-dev
598615 fi
599616 if [ x${DIST} = xhirsute ]; then
600617 apt-get -y install libzbd-dev clang-12 pkg-config make libgflags-dev nvme-cli util-linux fio zbd-utils
601618 fi
602- if [[ ${DIST} == ' focal' ]] || [[ ${DIST} == ' hirsute' ]] || [[ ${DIST} == ' bullseye' ]] || [[ ${DIST} == ' jammy' ]] || [[ ${DIST} == ' bookworm' ]] || [[ ${DIST} == ' noble' ]]; then
619+ if [[ ${DIST} == ' focal' ]] || [[ ${DIST} == ' hirsute' ]] || [[ ${DIST} == ' bullseye' ]] || [[ ${DIST} == ' jammy' ]] || [[ ${DIST} == ' bookworm' ]] || [[ ${DIST} == ' noble' ]] || [[ ${DIST} == ' trixie ' ]] ; then
603620 apt-get -y install libgflags-dev
604621 fi
605- if [ x${DIST} = xnoble ]; then
622+ if [ x${DIST} = xnoble -o x " ${DIST} " = xtrixie ]; then
606623 apt-get -y install libtirpc-dev gsasl-common
607624 fi
608625 apt-get install -y libsasl2-dev libsasl2-modules-gssapi-mit libkrb5-dev
@@ -812,8 +829,6 @@ build_rpm(){
812829 mkdir -vp rpmbuild/{SOURCES,SPECS,BUILD,SRPMS,RPMS}
813830 cp $SRC_RPM rpmbuild/SRPMS/
814831
815- RHEL=$( rpm --eval %rhel)
816- ARCH=$( echo $( uname -m) | sed -e ' s:i686:i386:g' )
817832 #
818833 echo " RHEL=${RHEL} " >> percona-server-8.0.properties
819834 echo " ARCH=${ARCH} " >> percona-server-8.0.properties
@@ -845,22 +860,22 @@ build_rpm(){
845860 fi
846861 if [ ${ARCH} = x86_64 ]; then
847862 if [[ ${WITH_ZENFS} == " 1" ]]; then
848- rpmbuild --define " _topdir ${WORKDIR} /rpmbuild" --define " dist .el ${RHEL }" --define " with_mecab ${MECAB_INSTALL_DIR} /usr" --define " with_zenfs 1" --rebuild rpmbuild/SRPMS/${SRCRPM}
863+ rpmbuild --define " _topdir ${WORKDIR} /rpmbuild" --define " dist .${OS_NAME }" --define " with_mecab ${MECAB_INSTALL_DIR} /usr" --define " with_zenfs 1" --rebuild rpmbuild/SRPMS/${SRCRPM}
849864 else
850865 if [[ ${RHEL} = 8 ]]; then
851866 rpmbuild --define " _topdir ${WORKDIR} /rpmbuild" --define " dist .el${RHEL} " --define " with_mecab ${MECAB_INSTALL_DIR} /usr" --define ' _dwz_max_die_limit 0' --rebuild rpmbuild/SRPMS/${SRCRPM}
852867 else
853- rpmbuild --define " _topdir ${WORKDIR} /rpmbuild" --define " dist .el ${RHEL }" --define " with_mecab ${MECAB_INSTALL_DIR} /usr" --rebuild rpmbuild/SRPMS/${SRCRPM}
868+ rpmbuild --define " _topdir ${WORKDIR} /rpmbuild" --define " dist .${OS_NAME }" --define " with_mecab ${MECAB_INSTALL_DIR} /usr" --rebuild rpmbuild/SRPMS/${SRCRPM}
854869 fi
855870 fi
856871 else
857872 if [[ ${WITH_ZENFS} == " 1" ]]; then
858- rpmbuild --define " _topdir ${WORKDIR} /rpmbuild" --define " dist .el ${RHEL }" --define " with_tokudb 0" --define " with_mecab ${MECAB_INSTALL_DIR} /usr" --define " with_zenfs 1" --rebuild rpmbuild/SRPMS/${SRCRPM}
873+ rpmbuild --define " _topdir ${WORKDIR} /rpmbuild" --define " dist .${OS_NAME }" --define " with_tokudb 0" --define " with_mecab ${MECAB_INSTALL_DIR} /usr" --define " with_zenfs 1" --rebuild rpmbuild/SRPMS/${SRCRPM}
859874 else
860875 if [[ ${RHEL} = 8 ]]; then
861876 rpmbuild --define " _topdir ${WORKDIR} /rpmbuild" --define " dist .el${RHEL} " --define " with_tokudb 0" --define " with_mecab ${MECAB_INSTALL_DIR} /usr" --define ' _dwz_max_die_limit 0' --rebuild rpmbuild/SRPMS/${SRCRPM}
862877 else
863- rpmbuild --define " _topdir ${WORKDIR} /rpmbuild" --define " dist .el ${RHEL }" --define " with_tokudb 0" --define " with_mecab ${MECAB_INSTALL_DIR} /usr" --rebuild rpmbuild/SRPMS/${SRCRPM}
878+ rpmbuild --define " _topdir ${WORKDIR} /rpmbuild" --define " dist .${OS_NAME }" --define " with_tokudb 0" --define " with_mecab ${MECAB_INSTALL_DIR} /usr" --rebuild rpmbuild/SRPMS/${SRCRPM}
864879 fi
865880 fi
866881 fi
@@ -987,7 +1002,7 @@ build_deb(){
9871002 rm -f call-home.sh
9881003 cd ../
9891004
990- if [ ${DEBIAN_VERSION} != trusty -a ${DEBIAN_VERSION} != xenial -a ${DEBIAN_VERSION} != jessie -a ${DEBIAN_VERSION} != stretch -a ${DEBIAN_VERSION} != artful -a ${DEBIAN_VERSION} != bionic -a ${DEBIAN_VERSION} != focal -a " ${DEBIAN_VERSION} " != disco -a " ${DEBIAN_VERSION} " != buster -a " ${DEBIAN_VERSION} " != hirsute -a " ${DEBIAN_VERSION} " != bullseye -a " ${DEBIAN_VERSION} " != jammy -a " ${DEBIAN_VERSION} " != bookworm -a " ${DEBIAN_VERSION} " != noble ]; then
1005+ if [ ${DEBIAN_VERSION} != trusty -a ${DEBIAN_VERSION} != xenial -a ${DEBIAN_VERSION} != jessie -a ${DEBIAN_VERSION} != stretch -a ${DEBIAN_VERSION} != artful -a ${DEBIAN_VERSION} != bionic -a ${DEBIAN_VERSION} != focal -a " ${DEBIAN_VERSION} " != disco -a " ${DEBIAN_VERSION} " != buster -a " ${DEBIAN_VERSION} " != hirsute -a " ${DEBIAN_VERSION} " != bullseye -a " ${DEBIAN_VERSION} " != jammy -a " ${DEBIAN_VERSION} " != bookworm -a " ${DEBIAN_VERSION} " != noble -a " ${DEBIAN_VERSION} " != trixie ]; then
9911006 gcc47=$( which gcc-4.7 2> /dev/null || true)
9921007 if [ -x " ${gcc47} " ]; then
9931008 export CC=gcc-4.7
0 commit comments