PKG-374 Make Percona Toolkit rpm spec file architecture independent

percona · Jan 15, 2025 · b603ef3 · b603ef3
1 parent 04f8f55
commit b603ef3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/config/rpm/percona-toolkit.spec b/config/rpm/percona-toolkit.spec
@@ -11,7 +11,6 @@ Vendor:    Percona
 URL:       http://www.percona.com/software/percona-toolkit/
 Source:    percona-toolkit-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildArch: @@ARCHITECTURE@@
 
 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)

diff --git a/config/scripts/pt_builder.sh b/config/scripts/pt_builder.sh
@@ -333,11 +333,6 @@ build_srpm(){
     cd ${WORKDIR}/rpmbuild/SPECS
     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
-    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}
     rm -rf bin/govendor
@@ -398,7 +393,7 @@ build_rpm(){
     ARCH=$(echo $(uname -m) | sed -e 's:i686:i386:g')
     echo "RHEL=${RHEL}" >> 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=$?
     if [ $return_code != 0 ]; then