percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-02 10:36:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #917 from surbhat1595/PKG374

Browse Source 
PKG-374 Make Percona Toolkit rpm spec file architecture independent

(cherry picked from commit d82723f272)
This commit is contained in:
Sveta Smirnova
2025-01-25 21:40:04 +03:00
committed by Evgeniy Patlan
parent 34a14ec77e
commit f816053065
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rpm/percona-toolkit.spec
View File

@@ -11,7 +11,6 @@ Vendor: Percona
URL: http://www.percona.com/software/percona-toolkit/ URL: http://www.percona.com/software/percona-toolkit/
Source: percona-toolkit-%{version}.tar.gz Source: percona-toolkit-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch: @@ARCHITECTURE@@
BuildRequires: perl(ExtUtils::MakeMaker) make 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) Requires: perl(DBI) >= 1.13, perl(DBD::mysql) >= 1.0, perl(Time::HiRes), perl(IO::Socket::SSL), perl(Digest::MD5), perl(Term::ReadKey)

7
config/scripts/pt_builder.sh
View File

@@ -333,11 +333,6 @@ build_srpm(){
cd ${WORKDIR}/rpmbuild/SPECS cd ${WORKDIR}/rpmbuild/SPECS
echo '%undefine _missing_build_ids_terminate_build' | cat - percona-toolkit.spec > pt.spec && mv pt.spec percona-toolkit.spec echo '%undefine _missing_build_ids_terminate_build' | cat - percona-toolkit.spec > pt.spec && mv pt.spec percona-toolkit.spec
echo '%define debug_package %{nil}' | cat - percona-toolkit.spec > pt.spec && mv pt.spec percona-toolkit.spec echo '%define debug_package %{nil}' | cat - percona-toolkit.spec > pt.spec && mv pt.spec percona-toolkit.spec
if [ x"$ARCH" = "xaarch64" ]; then
sed -i "s/@@ARCHITECTURE@@/aarch64/" percona-toolkit.spec
else
sed -i "s/@@ARCHITECTURE@@/x86_64/" percona-toolkit.spec
fi
cd ${WORKDIR}/${PRODUCT_FULL} cd ${WORKDIR}/${PRODUCT_FULL}
rm -rf bin/govendor rm -rf bin/govendor
@@ -398,7 +393,7 @@ build_rpm(){
ARCH=$(echo $(uname -m) | sed -e 's:i686:i386:g') ARCH=$(echo $(uname -m) | sed -e 's:i686:i386:g')
echo "RHEL=${RHEL}" >> percona-toolkit.properties echo "RHEL=${RHEL}" >> percona-toolkit.properties
echo "ARCH=${ARCH}" >> percona-toolkit.properties echo "ARCH=${ARCH}" >> percona-toolkit.properties
rpmbuild --target=${ARCH} --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 .el${RHEL}" --define "release $RPM_RELEASE.el${RHEL}" --define "_topdir ${WORKDIR}/rpmbuild" --rebuild rpmbuild/SRPMS/${SRC_RPM}
return_code=$? return_code=$?
if [ $return_code != 0 ]; then if [ $return_code != 0 ]; then