From e73b11762b9159e86b705e13b457ad019f145e53 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Dec 2020 22:45:21 +0100 Subject: [PATCH] maridb: split mytop into it's own package this is done to ensure, that there is no cyclic dep betwenn mariadb and perl-DBD-mysql --- srcpkgs/mariadb/template | 8 +------- srcpkgs/mytop | 1 - srcpkgs/mytop/template | 17 +++++++++++++++++ 3 files changed, 18 insertions(+), 8 deletions(-) delete mode 120000 srcpkgs/mytop create mode 100644 srcpkgs/mytop/template diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template index 865627d2183..60c37cf5ef2 100644 --- a/srcpkgs/mariadb/template +++ b/srcpkgs/mariadb/template @@ -78,6 +78,7 @@ post_install() { # Remove unneeded stuff. rm -rf ${DESTDIR}/usr/{sql-bench,mysql-test,data} rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1 + rm -f ${DESTDIR}/usr/bin/mytop # Configuration file. install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf @@ -133,13 +134,6 @@ mariadb-client_package() { done } } -mytop_package() { - depends="${sourcepkg}>=${version}_${revision} perl-Term-ReadKey perl-DBD-mysql" - short_desc="Top-like query monitor for MariaDB" - pkg_install() { - vmove usr/bin/mytop - } -} libmysqlclient_package() { build_style=meta diff --git a/srcpkgs/mytop b/srcpkgs/mytop deleted file mode 120000 index 45f92cdb790..00000000000 --- a/srcpkgs/mytop +++ /dev/null @@ -1 +0,0 @@ -mariadb \ No newline at end of file diff --git a/srcpkgs/mytop/template b/srcpkgs/mytop/template new file mode 100644 index 00000000000..ee3cb21aeff --- /dev/null +++ b/srcpkgs/mytop/template @@ -0,0 +1,17 @@ +# Template file for 'mytop' +pkgname=mytop +version=10.1.47 +revision=3 +create_wrksrc=yes +depends="mariadb perl-Term-ReadKey perl-DBD-mysql" +short_desc="Top-like query monitor for MariaDB" +maintainer="John " +license="GPL-2.0-or-later" +homepage="https://mariadb.org/" +distfiles="https://raw.githubusercontent.com/MariaDB/server/mariadb-${version}/scripts/mytop.sh" +checksum=69c200bd7a03a454f2e314eb94396686e78d59aa8d089d8a0defef9287ec8950 +skip_extraction="mytop.sh" + +do_install() { + vbin ${XBPS_SRCDISTDIR}/${pkgname}-${version}/mytop.sh mytop +}