Upgrading to 2.9

Drop a lot of customization.
Apply patch to install bash completion manually to system location.
Add .gitignore.

4 files changed, 40 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bb2e5197c920..aa6cf5e8c967 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = trace-cmd
 	pkgdesc = Userspace tooling for the Linux kernel Ftrace internal tracer
-	pkgver = 2.8.3
-	pkgrel = 3
+	pkgver = 2.9
+	pkgrel = 1
 	url = https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git
 	arch = x86_64
 	arch = aarch64
@@ -13,8 +13,12 @@ pkgbase = trace-cmd
 	depends = audit
 	depends = glibc
 	optdepends = python: for Python plugins
-	source = https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v2.8.3.tar.gz
-	sha512sums = 51166c4276abda209a099cc6fe9081ad6d403cbfd9d4a53bc5bb068392327e88fe647e9324a527e68730d73d1a5f7f74126718547f94c652bb12e51c7518a58b
+	source = https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v2.9.tar.gz
+	source = trace-cmd-2.9-make_install.patch
+	sha512sums = a37390e7ad29c9e7a97e5e7792505fe96a3802d6ea103e7c0f362a7b8cc29a102d483ec1a883b632fd9e0e7297f17866ae5eac59c825f08a8068b431a8f819e1
+	sha512sums = c9321b2b885d88557a057d7064690274799ab1d67a8babb78b1c54c4d81546fdea7313286cfd5fb9efbbcf87cf8394dcb17202ac88434a351aa652e7109e1db6
+	b2sums = 56421d7fded59b04466b3da7659df8059671a10c22dfc05610b63ee824288323e8935f18abc8a0e82288d12b1ec683bd54bca5047ca22a74b804dc3139792585
+	b2sums = 8a644be295417b1fd5fb807285a7176ef0ceb737352bbb4c7a88441f9b955a90befe974d890a58f2b8fb6de8a68a1b3c5d207f057c4b08db79caf6e97fa66f50
 
 pkgname = trace-cmd
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..052d2b653a1a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+*.tar.gz
+*.tar.xz
+*.tar.zst
+*.log
+*/*
diff --git a/PKGBUILD b/PKGBUILD
index bd75d80c95b5..dd63cba2d972 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Troy Engel <troyengel+arch@gmail.com>
 
 pkgname=trace-cmd
-pkgver=2.8.3
-pkgrel=3
+pkgver=2.9
+pkgrel=1
 pkgdesc="Userspace tooling for the Linux kernel Ftrace internal tracer"
 arch=('x86_64' 'aarch64')
 url="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git"
@@ -11,11 +11,17 @@ license=('GPL2' 'LGPL2.1')
 depends=('audit' 'glibc')
 makedepends=('python' 'swig' 'asciidoc')
 optdepends=('python: for Python plugins')
-source=("https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v${pkgver}.tar.gz")
-sha512sums=('51166c4276abda209a099cc6fe9081ad6d403cbfd9d4a53bc5bb068392327e88fe647e9324a527e68730d73d1a5f7f74126718547f94c652bb12e51c7518a58b')
+source=("https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v${pkgver}.tar.gz"
+        "${pkgname}-2.9-make_install.patch")
+sha512sums=('a37390e7ad29c9e7a97e5e7792505fe96a3802d6ea103e7c0f362a7b8cc29a102d483ec1a883b632fd9e0e7297f17866ae5eac59c825f08a8068b431a8f819e1'
+            'c9321b2b885d88557a057d7064690274799ab1d67a8babb78b1c54c4d81546fdea7313286cfd5fb9efbbcf87cf8394dcb17202ac88434a351aa652e7109e1db6')
+b2sums=('56421d7fded59b04466b3da7659df8059671a10c22dfc05610b63ee824288323e8935f18abc8a0e82288d12b1ec683bd54bca5047ca22a74b804dc3139792585'
+        '8a644be295417b1fd5fb807285a7176ef0ceb737352bbb4c7a88441f9b955a90befe974d890a58f2b8fb6de8a68a1b3c5d207f057c4b08db79caf6e97fa66f50')
 
 prepare() {
   mv -v "${pkgname}-v${pkgver}" "${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgver}"
+  patch -Np1 -i "../${pkgname}-2.9-make_install.patch"
 }
 
 build() {
@@ -26,14 +32,11 @@ build() {
 
 package() {
   cd "${pkgname}-${pkgver}"
-  make prefix="/usr" DESTDIR="${pkgdir}/" install install_doc
+  make prefix="/usr" \
+       DESTDIR="${pkgdir}/" \
+       install install_doc
+  install -vDm 644 tracecmd/${pkgname}.bash \
+    "${pkgdir}/usr/share/bash/bash-completion/completions/${pkgname}"
   # removing python2 script
   rm -v "${pkgdir}/usr/lib/trace-cmd/python/event-viewer.py"
-  # installing bash completion to correct location and removing /etc
-  install -vDm 644 "${pkgdir}/etc/bash_completion.d/trace-cmd.bash" \
-    "${pkgdir}/usr/share/bash-completion/completions/${pkgname}"
-  rm -rv "${pkgdir}/etc"
-  # remove unrelated documentation
-  rm -vrf "${pkgdir}/usr/share/kernelshark"
-  rm -vf "${pkgdir}/usr/share/man/man1/kernelshark.1"
 }
diff --git a/trace-cmd-2.9-make_install.patch b/trace-cmd-2.9-make_install.patch
new file mode 100644
index 000000000000..97e521efeda2
--- /dev/null
+++ b/trace-cmd-2.9-make_install.patch
@@ -0,0 +1,12 @@
+diff -ruN a/Makefile b/Makefile
+--- a/Makefile	2020-07-17 17:14:20.000000000 +0200
++++ b/Makefile	2020-07-18 10:37:32.898885286 +0200
+@@ -398,7 +398,7 @@
+ install_bash_completion: force
+ 	$(Q)$(call do_install_data,$(src)/tracecmd/trace-cmd.bash,$(BASH_COMPLETE_DIR))
+ 
+-install_cmd: all_cmd install_plugins install_python install_bash_completion
++install_cmd: all_cmd install_plugins install_python
+ 	$(Q)$(call do_install,$(obj)/tracecmd/trace-cmd,$(bindir_SQ))
+ 
+ install: install_cmd