From 916955f7d4ac40fdca7360c47d841e474aae4bde Mon Sep 17 00:00:00 2001 From: Ed Reel Date: Sun, 2 Mar 2025 07:20:22 -0600 Subject: [PATCH] Rename and update percona_toolkit package (#11442) --- lib/fixup.rb | 1 + ...filelist => perl_percona_toolkit.filelist} | 8 +++---- ...ona_toolkit.rb => perl_percona_toolkit.rb} | 21 ++++--------------- tools/packages.yaml | 20 +++++------------- 4 files changed, 14 insertions(+), 36 deletions(-) rename manifest/x86_64/p/{percona_toolkit.filelist => perl_percona_toolkit.filelist} (97%) rename packages/{percona_toolkit.rb => perl_percona_toolkit.rb} (58%) diff --git a/lib/fixup.rb b/lib/fixup.rb index 55b10da95..7018b1651 100644 --- a/lib/fixup.rb +++ b/lib/fixup.rb @@ -149,6 +149,7 @@ pkg_update_arr = [ { pkg_name: 'onepassword', pkg_rename: 'onepassword_cli', pkg_deprecated: nil, comments: 'Rename to distinguish between onepassword_gui.' }, { pkg_name: 'percona_boost', pkg_rename: nil, pkg_deprecated: true, comments: 'Replaced by regular boost.' }, { pkg_name: 'percona_server', pkg_rename: nil, pkg_deprecated: true, comments: 'Replaced by mysql.' }, + { pkg_name: 'percona_toolkit', pkg_rename: 'perl_percona_toolkit', pkg_deprecated: true, comments: 'Renamed to identify perl package.' }, { pkg_name: 'pkgconfig', pkg_rename: 'pkg_config', pkg_deprecated: nil, comments: 'Renamed to better match upstream.' }, { pkg_name: 'postgres', pkg_rename: 'postgresql', pkg_deprecated: nil, comments: 'Renamed to better match upstream.' }, { pkg_name: 'proj4', pkg_rename: 'proj', pkg_deprecated: nil, comments: 'Renamed to better match upstream.' }, diff --git a/manifest/x86_64/p/percona_toolkit.filelist b/manifest/x86_64/p/perl_percona_toolkit.filelist similarity index 97% rename from manifest/x86_64/p/percona_toolkit.filelist rename to manifest/x86_64/p/perl_percona_toolkit.filelist index 9a30f941c..ad59fc59a 100644 --- a/manifest/x86_64/p/percona_toolkit.filelist +++ b/manifest/x86_64/p/perl_percona_toolkit.filelist @@ -18,6 +18,8 @@ /usr/local/bin/pt-online-schema-change /usr/local/bin/pt-pmp /usr/local/bin/pt-query-digest +/usr/local/bin/pt-replica-find +/usr/local/bin/pt-replica-restart /usr/local/bin/pt-show-grants /usr/local/bin/pt-sift /usr/local/bin/pt-slave-delay @@ -31,8 +33,6 @@ /usr/local/bin/pt-upgrade /usr/local/bin/pt-variable-advisor /usr/local/bin/pt-visual-explain -/usr/local/lib64/perl5/5.40.0/core_perl/perllocal.pod -/usr/local/lib64/perl5/5.40.0/site_perl/auto/Percona/Toolkit/.packlist /usr/local/share/man/man1/percona-toolkit.1p.zst /usr/local/share/man/man1/pt-align.1p.zst /usr/local/share/man/man1/pt-archiver.1p.zst @@ -54,6 +54,8 @@ /usr/local/share/man/man1/pt-online-schema-change.1p.zst /usr/local/share/man/man1/pt-pmp.1p.zst /usr/local/share/man/man1/pt-query-digest.1p.zst +/usr/local/share/man/man1/pt-replica-find.1p.zst +/usr/local/share/man/man1/pt-replica-restart.1p.zst /usr/local/share/man/man1/pt-show-grants.1p.zst /usr/local/share/man/man1/pt-sift.1p.zst /usr/local/share/man/man1/pt-slave-delay.1p.zst @@ -117,7 +119,6 @@ /usr/local/share/perl5/site_perl/OobNibbleIterator.pm /usr/local/share/perl5/site_perl/OptionParser.pm /usr/local/share/perl5/site_perl/Outfile.pm -/usr/local/share/perl5/site_perl/Percona/Test.pm /usr/local/share/perl5/site_perl/Percona/Toolkit.pm /usr/local/share/perl5/site_perl/Percona/XtraDB/Cluster.pm /usr/local/share/perl5/site_perl/PerconaTest.pm @@ -144,7 +145,6 @@ /usr/local/share/perl5/site_perl/RowDiff.pm /usr/local/share/perl5/site_perl/Runtime.pm /usr/local/share/perl5/site_perl/SQLParser.pm -/usr/local/share/perl5/site_perl/Safeguards.pm /usr/local/share/perl5/site_perl/Sandbox.pm /usr/local/share/perl5/site_perl/Schema.pm /usr/local/share/perl5/site_perl/SchemaIterator.pm diff --git a/packages/percona_toolkit.rb b/packages/perl_percona_toolkit.rb similarity index 58% rename from packages/percona_toolkit.rb rename to packages/perl_percona_toolkit.rb index bea8889ca..20430c23c 100644 --- a/packages/percona_toolkit.rb +++ b/packages/perl_percona_toolkit.rb @@ -1,9 +1,9 @@ -require 'package' +require 'buildsystems/perl' -class Percona_toolkit < Package +class Perl_percona_toolkit < PERL description 'Percona Toolkit is a collection of advanced command-line tools used by Percona support staff to perform a variety of MySQL and system tasks that are too difficult or complex to perform manually.' homepage 'https://www.percona.com/percona-toolkit' - version '3.6.0' + version '3.7.0' license 'GPL-2' compatibility 'x86_64' source_url 'https://github.com/percona/percona-toolkit.git' @@ -11,23 +11,10 @@ class Percona_toolkit < Package binary_compression 'tar.zst' binary_sha256({ - x86_64: '62753c68c0bfe391c1a49e0e0dfcf924b142bb8afe7693b529aac30e67df2dcf' + x86_64: '1ba48cd228bcf92b835d8902fa2a72267016687e8391878586a0e27b2abc5c4c' }) depends_on 'go' => :build depends_on 'mysql' depends_on 'perl' - - def self.build - system "perl Makefile.PL PREFIX=#{CREW_PREFIX}" - system 'make' - end - - def self.check - system 'make', 'test' - end - - def self.install - system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install' - end end diff --git a/tools/packages.yaml b/tools/packages.yaml index 52f95b55c..78e609feb 100644 --- a/tools/packages.yaml +++ b/tools/packages.yaml @@ -6910,21 +6910,6 @@ url: https://www.piumarta.com/software/peg/ activity: none --- kind: url -name: percona_boost -url: https://sourceforge.net/projects/boost/files/boost/ -activity: medium ---- -kind: url -name: percona_server -url: https://www.percona.com/downloads/Percona-Server-LATEST/ -activity: medium ---- -kind: url -name: percona_toolkit -url: https://www.percona.com/downloads/percona-toolkit/ -activity: medium ---- -kind: url name: perf url: https://www.kernel.org/pub/linux/kernel/v4.x/ activity: medium @@ -7095,6 +7080,11 @@ url: https://cpan.metacpan.org/authors/id/W/WB/WBRASWELL/ activity: none --- kind: url +name: perl_percona_toolkit +url: https://www.percona.com/downloads/percona-toolkit/ +activity: medium +--- +kind: url name: perl_pod_parser url: https://metacpan.org/pod/Pod::Parser activity: none