diff --git a/config/rpm/percona-toolkit.spec b/config/rpm/percona-toolkit.spec index 433fd19b..ac2a4bba 100644 --- a/config/rpm/percona-toolkit.spec +++ b/config/rpm/percona-toolkit.spec @@ -14,7 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl(ExtUtils::MakeMaker) make Requires: perl(DBI) >= 1.13, perl(DBD::mysql) >= 1.0, perl(Time::HiRes), perl(IO::Socket::SSL), perl(Digest::MD5), perl(Term::ReadKey) -%if 0%{?rhel} > 9 +%if 0%{?rhel} > 9 || 0%{?amzn} >= 2023 Requires: perl(English) %endif AutoReq: no diff --git a/config/scripts/pt_builder.sh b/config/scripts/pt_builder.sh index bf7406a6..f5cd2f85 100644 --- a/config/scripts/pt_builder.sh +++ b/config/scripts/pt_builder.sh @@ -151,6 +151,11 @@ get_system(){ ARCH=$(echo $(uname -m) | sed -e 's:i686:i386:g') OS_NAME="el$RHEL" OS="rpm" + elif [ -f /etc/amazon-linux-release ]; then + RHEL=$(rpm --eval %amzn) + ARCH=$(echo $(uname -m) | sed -e 's:i686:i386:g') + OS_NAME="amzn$RHEL" + OS="rpm" else ARCH=$(uname -m) OS_NAME="$(lsb_release -sc)" @@ -231,8 +236,8 @@ install_deps() { # mv -f percona-dev.repo /etc/yum.repos.d/ yum clean all yum -y install curl epel-release - RHEL=$(rpm --eval %rhel) - yum -y install wget tar findutils coreutils rpm-build perl-ExtUtils-MakeMaker make perl-DBD-MySQL + yum -y install coreutils + yum -y install wget tar findutils rpm-build perl-ExtUtils-MakeMaker make perl-DBD-MySQL install_go else apt-get -y update @@ -372,11 +377,9 @@ build_rpm(){ mkdir -vp rpmbuild/{SOURCES,SPECS,BUILD,SRPMS,RPMS} cp $SRC_RPM rpmbuild/SRPMS/ cd $WORKDIR - RHEL=$(rpm --eval %rhel) - ARCH=$(echo $(uname -m) | sed -e 's:i686:i386:g') echo "RHEL=${RHEL}" >> percona-toolkit.properties echo "ARCH=${ARCH}" >> percona-toolkit.properties - rpmbuild --define "version $VERSION" --define "VERSION $VERSION" --define "dist .el${RHEL}" --define "release $RPM_RELEASE.el${RHEL}" --define "_topdir ${WORKDIR}/rpmbuild" --rebuild rpmbuild/SRPMS/${SRC_RPM} + rpmbuild --define "version $VERSION" --define "VERSION $VERSION" --define "dist .${OS_NAME}" --define "release $RPM_RELEASE.${OS_NAME}" --define "_topdir ${WORKDIR}/rpmbuild" --rebuild rpmbuild/SRPMS/${SRC_RPM} return_code=$? if [ $return_code != 0 ]; then