Date: Tuesday, February 15, 2022 @ 22:57:38 Author: dvzrv Revision: 1133401
archrelease: copy trunk to community-x86_64 Added: trace-cmd/repos/community-x86_64/PKGBUILD (from rev 1133400, trace-cmd/trunk/PKGBUILD) trace-cmd/repos/community-x86_64/trace-cmd-2.9-make_install.patch (from rev 1133400, trace-cmd/trunk/trace-cmd-2.9-make_install.patch) trace-cmd/repos/community-x86_64/trace-cmd-2.9.3-docs_makefile.patch (from rev 1133400, trace-cmd/trunk/trace-cmd-2.9.3-docs_makefile.patch) trace-cmd/repos/community-x86_64/trace-cmd-2.9.3-python3.patch (from rev 1133400, trace-cmd/trunk/trace-cmd-2.9.3-python3.patch) trace-cmd/repos/community-x86_64/trace-cmd-2.9.5-full_relro.patch (from rev 1133400, trace-cmd/trunk/trace-cmd-2.9.5-full_relro.patch) Deleted: trace-cmd/repos/community-x86_64/PKGBUILD trace-cmd/repos/community-x86_64/trace-cmd-2.9-make_install.patch trace-cmd/repos/community-x86_64/trace-cmd-2.9.3-docs_makefile.patch trace-cmd/repos/community-x86_64/trace-cmd-2.9.3-python3.patch trace-cmd/repos/community-x86_64/trace-cmd-2.9.5-full_relro.patch -------------------------------------+ PKGBUILD | 112 ++++++++++++++++------------------ trace-cmd-2.9-make_install.patch | 24 +++---- trace-cmd-2.9.3-docs_makefile.patch | 84 ++++++++++++------------- trace-cmd-2.9.3-python3.patch | 18 ++--- trace-cmd-2.9.5-full_relro.patch | 24 +++---- 5 files changed, 129 insertions(+), 133 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2022-02-15 22:56:35 UTC (rev 1133400) +++ PKGBUILD 2022-02-15 22:57:38 UTC (rev 1133401) @@ -1,58 +0,0 @@ -# Maintainer: David Runge <dv...@archlinux.org> - -pkgname=trace-cmd -pkgver=2.9.6 -pkgrel=2 -pkgdesc="Interact with Ftrace Linux kernel internal tracer" -arch=('x86_64') -url="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git" -license=('GPL2' 'LGPL2.1') -depends=('glibc') -makedepends=('asciidoc' 'audit' 'bash-completion' 'libtraceevent' 'libtracefs' 'python' 'swig' 'xmlto') -optdepends=('python: for Python plugins') -provides=('libtracecmd.so') -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" - "${pkgname}-2.9.3-python3.patch" - "${pkgname}-2.9.3-docs_makefile.patch" - "${pkgname}-2.9.5-full_relro.patch") -sha512sums=('46b4411333bf79d92380b98e8c55bb54abaf62057e0dc97eafe71f49229b91e93456cda3dd99768b0db83681ebfe4f4c319b174dc8bbcd3f498c9b8bb5ca8bd0' - 'c9321b2b885d88557a057d7064690274799ab1d67a8babb78b1c54c4d81546fdea7313286cfd5fb9efbbcf87cf8394dcb17202ac88434a351aa652e7109e1db6' - 'a1834b382cbee920697d08c7eb7292c4a5ea606e4f32459a60e0b236ad057536c987f3e162c9c99affa46396248e98c8f4ecd21031141f0221dbadf0bd33737d' - '1d43fc0fec3b386a741467966bcecdcacdfbe36e21c63d644ec281ff9577332e2d6cff95cef22bab85d2209017eb39d36def35f24b86e54720d6913a44fc3cbd' - '56f2c7e0e3e277770670af58dee7fce3910342cd792a2d8c3da311bad5dfb75b72f1456b1124c2f0ee74a84601434ed9dd6cce98464acfebd17551490f0d3061') -b2sums=('a340aa32e0fc9951e7395e5f51e42e5276a70a108b94b008b41110d5189caee0a87fea00f5a4f92f88a2c7ffcf2d9be22f5320c4ea6941c7a448a31de8195f14' - '8a644be295417b1fd5fb807285a7176ef0ceb737352bbb4c7a88441f9b955a90befe974d890a58f2b8fb6de8a68a1b3c5d207f057c4b08db79caf6e97fa66f50' - 'dac368fc62d99eba6d36f2c7d81475c28211dfe5d1d59ca5e468daff31d36710637943dc822fb266784feb5355ca0bfb525819bb96095c8e0c0fa91f32558877' - '86104406eb8694a96cd6ed34f2dcdf06039d4342ebacbb492759945b7b156d41806986fc96e421557a7a224f18a5786ec999c5c07f2a9ffff051351911cc8095' - '5d2a4b6f0f1b7f085dbcfcc53b96ef30e9e3d6b676e23c79776a73685ae813d5c92fae2e9b0fd1cf203947c1a06391f518ef462be780e07b5cce2c89c41b46d5') - -prepare() { - mv -v "${pkgname}-v${pkgver}" "${pkgname}-${pkgver}" - cd "${pkgname}-${pkgver}" - patch -Np1 -i "../${pkgname}-2.9-make_install.patch" - patch -Np1 -i "../${pkgname}-2.9.3-docs_makefile.patch" - patch -Np1 -i "../${pkgname}-2.9.3-python3.patch" - patch -Np1 -i "../${pkgname}-2.9.5-full_relro.patch" -} - -build() { - cd "$pkgname-$pkgver" - export PYTHON_VERS=python3 - make prefix='/usr' libdir_relative='lib' all libs - make -C Documentation -} - -package() { - depends+=('libaudit.so' 'libtraceevent.so' 'libtracefs.so') - - cd "${pkgname}-${pkgver}" - make prefix="/usr" \ - libdir_relative=lib \ - DESTDIR="${pkgdir}/" \ - BASH_COMPLETE_DIR="$(pkgconf --variable=completionsdir bash-completion)" \ - install_cmd install_libs - make prefix="/usr" DESTDIR="${pkgdir}/" install -C Documentation - install -vDm 644 tracecmd/${pkgname}.bash \ - "${pkgdir}/usr/share/bash/bash-completion/completions/${pkgname}" -} Copied: trace-cmd/repos/community-x86_64/PKGBUILD (from rev 1133400, trace-cmd/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2022-02-15 22:57:38 UTC (rev 1133401) @@ -0,0 +1,54 @@ +# Maintainer: David Runge <dv...@archlinux.org> + +pkgname=trace-cmd +pkgver=2.9.7 +pkgrel=1 +pkgdesc="Interact with Ftrace Linux kernel internal tracer" +arch=(x86_64) +url="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git" +license=(GPL2 LGPL2.1) +depends=(glibc) +makedepends=(asciidoc audit bash-completion libtraceevent libtracefs python swig xmlto) +optdepends=('python: for Python plugins') +provides=(libtracecmd.so) +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" + "${pkgname}-2.9.3-python3.patch" + "${pkgname}-2.9.3-docs_makefile.patch" + "${pkgname}-2.9.5-full_relro.patch") +sha512sums=('f678ea380c0fe7e4ea9ed43d9024e418376fdf435043937e680d65a3728b9eefda2e6dcff0e02846267485317f764e7f7123812f5d5df5b63761a169f57520b9' + 'c9321b2b885d88557a057d7064690274799ab1d67a8babb78b1c54c4d81546fdea7313286cfd5fb9efbbcf87cf8394dcb17202ac88434a351aa652e7109e1db6' + 'a1834b382cbee920697d08c7eb7292c4a5ea606e4f32459a60e0b236ad057536c987f3e162c9c99affa46396248e98c8f4ecd21031141f0221dbadf0bd33737d' + '1d43fc0fec3b386a741467966bcecdcacdfbe36e21c63d644ec281ff9577332e2d6cff95cef22bab85d2209017eb39d36def35f24b86e54720d6913a44fc3cbd' + '56f2c7e0e3e277770670af58dee7fce3910342cd792a2d8c3da311bad5dfb75b72f1456b1124c2f0ee74a84601434ed9dd6cce98464acfebd17551490f0d3061') +b2sums=('b0dc72c0194172ce048df7870f82b75af7c0072e9606e844572e6e894eb0abc62958488bd447cc6ff6070c0327b03adfd8325d0cf39bd098fabebf63b6b084f1' + '8a644be295417b1fd5fb807285a7176ef0ceb737352bbb4c7a88441f9b955a90befe974d890a58f2b8fb6de8a68a1b3c5d207f057c4b08db79caf6e97fa66f50' + 'dac368fc62d99eba6d36f2c7d81475c28211dfe5d1d59ca5e468daff31d36710637943dc822fb266784feb5355ca0bfb525819bb96095c8e0c0fa91f32558877' + '86104406eb8694a96cd6ed34f2dcdf06039d4342ebacbb492759945b7b156d41806986fc96e421557a7a224f18a5786ec999c5c07f2a9ffff051351911cc8095' + '5d2a4b6f0f1b7f085dbcfcc53b96ef30e9e3d6b676e23c79776a73685ae813d5c92fae2e9b0fd1cf203947c1a06391f518ef462be780e07b5cce2c89c41b46d5') + +prepare() { + cd $pkgname-v$pkgver + patch -Np1 -i ../$pkgname-2.9-make_install.patch + patch -Np1 -i ../$pkgname-2.9.3-docs_makefile.patch + patch -Np1 -i ../$pkgname-2.9.3-python3.patch + patch -Np1 -i ../$pkgname-2.9.5-full_relro.patch +} + +build() { + export PYTHON_VERS=python3 + make prefix=/usr libdir_relative=lib all libs -C $pkgname-v$pkgver + make -C $pkgname-v$pkgver/Documentation +} + +package() { + depends+=(libaudit.so libtraceevent.so libtracefs.so) + + make prefix=/usr \ + libdir_relative=lib \ + DESTDIR="$pkgdir" \ + BASH_COMPLETE_DIR="$(pkgconf --variable=completionsdir bash-completion)" \ + install_cmd install_libs -C $pkgname-v$pkgver + make prefix=/usr DESTDIR="$pkgdir" install -C $pkgname-v$pkgver/Documentation + install -vDm 644 $pkgname-v$pkgver/tracecmd/$pkgname.bash "$pkgdir/usr/share/bash/bash-completion/completions/$pkgname" +} Deleted: trace-cmd-2.9-make_install.patch =================================================================== --- trace-cmd-2.9-make_install.patch 2022-02-15 22:56:35 UTC (rev 1133400) +++ trace-cmd-2.9-make_install.patch 2022-02-15 22:57:38 UTC (rev 1133401) @@ -1,12 +0,0 @@ -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 Copied: trace-cmd/repos/community-x86_64/trace-cmd-2.9-make_install.patch (from rev 1133400, trace-cmd/trunk/trace-cmd-2.9-make_install.patch) =================================================================== --- trace-cmd-2.9-make_install.patch (rev 0) +++ trace-cmd-2.9-make_install.patch 2022-02-15 22:57:38 UTC (rev 1133401) @@ -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 Deleted: trace-cmd-2.9.3-docs_makefile.patch =================================================================== --- trace-cmd-2.9.3-docs_makefile.patch 2022-02-15 22:56:35 UTC (rev 1133400) +++ trace-cmd-2.9.3-docs_makefile.patch 2022-02-15 22:57:38 UTC (rev 1133401) @@ -1,42 +0,0 @@ -diff -ruN a/Documentation/libtracecmd/Makefile b/Documentation/libtracecmd/Makefile ---- a/Documentation/libtracecmd/Makefile 2021-05-14 16:20:12.000000000 +0200 -+++ b/Documentation/libtracecmd/Makefile 2021-05-14 21:32:15.921462439 +0200 -@@ -1,7 +1,7 @@ - # SPDX-License-Identifier: GPL-2.0 - - # Include the utils --include $(src)/scripts/utils.mk -+include ../../scripts/utils.mk - - # This Makefile and manpage XSL files were taken from libtracefs - # and modified for libtracecmd -@@ -134,7 +134,7 @@ - endif - - install-%.3: $(OUTPUT)%.3 -- $(Q)$(call do_install_docs,$<,$(man3dir),644); -+ $(Q)$(call do_install_docs,$<,$(DESTDIR)$(man3dir),644); - - do-install-man: man $(addprefix install-,$(wildcard $(OUTPUT)*.3)) - -@@ -142,7 +142,7 @@ - $(Q)$(MAKE) -C . do-install-man - - install-%.txt: $(OUTPUT)%.html -- $(Q)$(call do_install_docs,$<,$(htmldir),644); -+ $(Q)$(call do_install_docs,$<,$(DESTDIR)$(htmldir),644); - - do-install-html: html $(addprefix install-,$(wildcard *.txt)) - -diff -ruN a/Documentation/trace-cmd/Makefile b/Documentation/trace-cmd/Makefile ---- a/Documentation/trace-cmd/Makefile 2021-05-14 16:20:12.000000000 +0200 -+++ b/Documentation/trace-cmd/Makefile 2021-05-14 21:26:53.224092234 +0200 -@@ -1,7 +1,7 @@ - # SPDX-License-Identifier: GPL-2.0 - - # Include the utils --include $(src)/scripts/utils.mk -+include ../../scripts/utils.mk - - bdir:=$(doc_dir)/trace-cmd - Copied: trace-cmd/repos/community-x86_64/trace-cmd-2.9.3-docs_makefile.patch (from rev 1133400, trace-cmd/trunk/trace-cmd-2.9.3-docs_makefile.patch) =================================================================== --- trace-cmd-2.9.3-docs_makefile.patch (rev 0) +++ trace-cmd-2.9.3-docs_makefile.patch 2022-02-15 22:57:38 UTC (rev 1133401) @@ -0,0 +1,42 @@ +diff -ruN a/Documentation/libtracecmd/Makefile b/Documentation/libtracecmd/Makefile +--- a/Documentation/libtracecmd/Makefile 2021-05-14 16:20:12.000000000 +0200 ++++ b/Documentation/libtracecmd/Makefile 2021-05-14 21:32:15.921462439 +0200 +@@ -1,7 +1,7 @@ + # SPDX-License-Identifier: GPL-2.0 + + # Include the utils +-include $(src)/scripts/utils.mk ++include ../../scripts/utils.mk + + # This Makefile and manpage XSL files were taken from libtracefs + # and modified for libtracecmd +@@ -134,7 +134,7 @@ + endif + + install-%.3: $(OUTPUT)%.3 +- $(Q)$(call do_install_docs,$<,$(man3dir),644); ++ $(Q)$(call do_install_docs,$<,$(DESTDIR)$(man3dir),644); + + do-install-man: man $(addprefix install-,$(wildcard $(OUTPUT)*.3)) + +@@ -142,7 +142,7 @@ + $(Q)$(MAKE) -C . do-install-man + + install-%.txt: $(OUTPUT)%.html +- $(Q)$(call do_install_docs,$<,$(htmldir),644); ++ $(Q)$(call do_install_docs,$<,$(DESTDIR)$(htmldir),644); + + do-install-html: html $(addprefix install-,$(wildcard *.txt)) + +diff -ruN a/Documentation/trace-cmd/Makefile b/Documentation/trace-cmd/Makefile +--- a/Documentation/trace-cmd/Makefile 2021-05-14 16:20:12.000000000 +0200 ++++ b/Documentation/trace-cmd/Makefile 2021-05-14 21:26:53.224092234 +0200 +@@ -1,7 +1,7 @@ + # SPDX-License-Identifier: GPL-2.0 + + # Include the utils +-include $(src)/scripts/utils.mk ++include ../../scripts/utils.mk + + bdir:=$(doc_dir)/trace-cmd + Deleted: trace-cmd-2.9.3-python3.patch =================================================================== --- trace-cmd-2.9.3-python3.patch 2022-02-15 22:56:35 UTC (rev 1133400) +++ trace-cmd-2.9.3-python3.patch 2022-02-15 22:57:38 UTC (rev 1133401) @@ -1,9 +0,0 @@ -diff -ruN a/python/event-viewer.py b/python/event-viewer.py ---- a/python/event-viewer.py 2021-05-14 16:20:12.000000000 +0200 -+++ b/python/event-viewer.py 2021-05-14 21:43:38.019590304 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python2 -+#!/usr/bin/env python3 - - import getopt - from gobject import * Copied: trace-cmd/repos/community-x86_64/trace-cmd-2.9.3-python3.patch (from rev 1133400, trace-cmd/trunk/trace-cmd-2.9.3-python3.patch) =================================================================== --- trace-cmd-2.9.3-python3.patch (rev 0) +++ trace-cmd-2.9.3-python3.patch 2022-02-15 22:57:38 UTC (rev 1133401) @@ -0,0 +1,9 @@ +diff -ruN a/python/event-viewer.py b/python/event-viewer.py +--- a/python/event-viewer.py 2021-05-14 16:20:12.000000000 +0200 ++++ b/python/event-viewer.py 2021-05-14 21:43:38.019590304 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python2 ++#!/usr/bin/env python3 + + import getopt + from gobject import * Deleted: trace-cmd-2.9.5-full_relro.patch =================================================================== --- trace-cmd-2.9.5-full_relro.patch 2022-02-15 22:56:35 UTC (rev 1133400) +++ trace-cmd-2.9.5-full_relro.patch 2022-02-15 22:57:38 UTC (rev 1133401) @@ -1,12 +0,0 @@ -diff -ruN a/scripts/utils.mk b/scripts/utils.mk ---- a/scripts/utils.mk 2021-07-27 00:58:04.000000000 +0200 -+++ b/scripts/utils.mk 2021-07-29 19:34:44.741532160 +0200 -@@ -72,7 +72,7 @@ - - do_compile_shared_library = \ - ($(print_shared_lib_compile) \ -- $(CC) --shared $^ '-Wl,-soname,$(@F),-rpath=$$ORIGIN' -o $@ $(LIBS)) -+ $(CC) --shared $^ '-Wl,-soname,$(@F),-rpath=$$ORIGIN' -o $@ $(LDFLAGS) $(LIBS)) - - do_compile_plugin_obj = \ - ($(print_plugin_obj_compile) \ Copied: trace-cmd/repos/community-x86_64/trace-cmd-2.9.5-full_relro.patch (from rev 1133400, trace-cmd/trunk/trace-cmd-2.9.5-full_relro.patch) =================================================================== --- trace-cmd-2.9.5-full_relro.patch (rev 0) +++ trace-cmd-2.9.5-full_relro.patch 2022-02-15 22:57:38 UTC (rev 1133401) @@ -0,0 +1,12 @@ +diff -ruN a/scripts/utils.mk b/scripts/utils.mk +--- a/scripts/utils.mk 2021-07-27 00:58:04.000000000 +0200 ++++ b/scripts/utils.mk 2021-07-29 19:34:44.741532160 +0200 +@@ -72,7 +72,7 @@ + + do_compile_shared_library = \ + ($(print_shared_lib_compile) \ +- $(CC) --shared $^ '-Wl,-soname,$(@F),-rpath=$$ORIGIN' -o $@ $(LIBS)) ++ $(CC) --shared $^ '-Wl,-soname,$(@F),-rpath=$$ORIGIN' -o $@ $(LDFLAGS) $(LIBS)) + + do_compile_plugin_obj = \ + ($(print_plugin_obj_compile) \