Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] bpftrace: the man pages does not clash any more
@ 2023-02-28 21:50 robertek
  2023-03-01 21:09 ` [PR PATCH] [Closed]: " leahneukirchen
  0 siblings, 1 reply; 2+ messages in thread
From: robertek @ 2023-02-28 21:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 2990 bytes --]

There is a new pull request by robertek against master on the void-packages repository

https://github.com/robertek/void-packages bpftrace
https://github.com/void-linux/void-packages/pull/42514

bpftrace: the man pages does not clash any more
<!-- Uncomment relevant sections and delete options which are not applicable -->

The man pages for bpftrace does not clash with bcc-tools man pages any more.

Tagging the maintainer @leahneukirchen

#### Testing the changes
- I tested the changes in this PR: **YES**

- Validation of the built package man pages against bcc-tools:

```
❯ xbps-query -f bpftrace | grep man8 | grep -v '\.bt\.'
/usr/share/man/man8/bpftrace.8
❯ xbps-query -f bcc-tools | grep man8 | grep 'bpftrace'
❯ xbps-query -f bpftrace | grep man8 | grep '\.bt\.'
/usr/share/man/man8/bashreadline.bt.8
/usr/share/man/man8/biolatency.bt.8
/usr/share/man/man8/biosnoop.bt.8
/usr/share/man/man8/biostacks.bt.8
/usr/share/man/man8/bitesize.bt.8
/usr/share/man/man8/capable.bt.8
/usr/share/man/man8/cpuwalk.bt.8
/usr/share/man/man8/dcsnoop.bt.8
/usr/share/man/man8/execsnoop.bt.8
/usr/share/man/man8/gethostlatency.bt.8
/usr/share/man/man8/killsnoop.bt.8
/usr/share/man/man8/loads.bt.8
/usr/share/man/man8/mdflush.bt.8
/usr/share/man/man8/naptime.bt.8
/usr/share/man/man8/oomkill.bt.8
/usr/share/man/man8/opensnoop.bt.8
/usr/share/man/man8/pidpersec.bt.8
/usr/share/man/man8/runqlat.bt.8
/usr/share/man/man8/runqlen.bt.8
/usr/share/man/man8/setuids.bt.8
/usr/share/man/man8/ssllatency.bt.8
/usr/share/man/man8/sslsnoop.bt.8
/usr/share/man/man8/statsnoop.bt.8
/usr/share/man/man8/swapin.bt.8
/usr/share/man/man8/syncsnoop.bt.8
/usr/share/man/man8/syscount.bt.8
/usr/share/man/man8/tcpaccept.bt.8
/usr/share/man/man8/tcpconnect.bt.8
/usr/share/man/man8/tcpdrop.bt.8
/usr/share/man/man8/tcplife.bt.8
/usr/share/man/man8/tcpretrans.bt.8
/usr/share/man/man8/tcpsynbl.bt.8
/usr/share/man/man8/threadsnoop.bt.8
/usr/share/man/man8/undump.bt.8
/usr/share/man/man8/vfscount.bt.8
/usr/share/man/man8/vfsstat.bt.8
/usr/share/man/man8/writeback.bt.8
/usr/share/man/man8/xfsdist.bt.8
❯ xbps-query -f bcc-tools | grep man8 | grep '\.bt\.'
❯ 
```
- bcc-tools can be cleanly installed alongside bpftrace

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)


A patch file from https://github.com/void-linux/void-packages/pull/42514.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bpftrace-42514.patch --]
[-- Type: text/x-diff, Size: 1017 bytes --]

From 1491940b0af33d1913f619592d6e9db22f6bcf90 Mon Sep 17 00:00:00 2001
From: Robert David <robert.david.public@gmail.com>
Date: Tue, 28 Feb 2023 22:16:11 +0100
Subject: [PATCH] bpftrace: the man pages does not clash any more

---
 srcpkgs/bpftrace/template | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index 952682662128..574930427ad1 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,7 +1,7 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
 version=0.17.0
-revision=1
+revision=2
 archs="x86_64* aarch64* ppc64*"
 build_style=cmake
 configure_args="-DUSE_SYSTEM_BPF_BCC=ON -DBUILD_TESTING=OFF" # needs root to run
@@ -16,8 +16,3 @@ checksum=ccc853205b081fd7e4270016065ccc04764286644bf8e0eee9bd7f344cad63e5
 nostrip=yes  # needs to read own symbol table
 
 CXXFLAGS="-isystem ${XBPS_CROSS_BASE}/usr/include/bcc/compat"
-
-post_install() {
-	# clashes with bcc-tools
-	rm -rf ${DESTDIR}/usr/share/man
-}

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PR PATCH] [Closed]: bpftrace: the man pages does not clash any more
  2023-02-28 21:50 [PR PATCH] bpftrace: the man pages does not clash any more robertek
@ 2023-03-01 21:09 ` leahneukirchen
  0 siblings, 0 replies; 2+ messages in thread
From: leahneukirchen @ 2023-03-01 21:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 2836 bytes --]

There's a closed pull request on the void-packages repository

bpftrace: the man pages does not clash any more
https://github.com/void-linux/void-packages/pull/42514

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

The man pages for bpftrace does not clash with bcc-tools man pages any more.

Tagging the maintainer @leahneukirchen

#### Testing the changes
- I tested the changes in this PR: **YES**

- Validation of the built package man pages against bcc-tools:

```
❯ xbps-query -f bpftrace | grep man8 | grep -v '\.bt\.'
/usr/share/man/man8/bpftrace.8
❯ xbps-query -f bcc-tools | grep man8 | grep 'bpftrace'
❯ xbps-query -f bpftrace | grep man8 | grep '\.bt\.'
/usr/share/man/man8/bashreadline.bt.8
/usr/share/man/man8/biolatency.bt.8
/usr/share/man/man8/biosnoop.bt.8
/usr/share/man/man8/biostacks.bt.8
/usr/share/man/man8/bitesize.bt.8
/usr/share/man/man8/capable.bt.8
/usr/share/man/man8/cpuwalk.bt.8
/usr/share/man/man8/dcsnoop.bt.8
/usr/share/man/man8/execsnoop.bt.8
/usr/share/man/man8/gethostlatency.bt.8
/usr/share/man/man8/killsnoop.bt.8
/usr/share/man/man8/loads.bt.8
/usr/share/man/man8/mdflush.bt.8
/usr/share/man/man8/naptime.bt.8
/usr/share/man/man8/oomkill.bt.8
/usr/share/man/man8/opensnoop.bt.8
/usr/share/man/man8/pidpersec.bt.8
/usr/share/man/man8/runqlat.bt.8
/usr/share/man/man8/runqlen.bt.8
/usr/share/man/man8/setuids.bt.8
/usr/share/man/man8/ssllatency.bt.8
/usr/share/man/man8/sslsnoop.bt.8
/usr/share/man/man8/statsnoop.bt.8
/usr/share/man/man8/swapin.bt.8
/usr/share/man/man8/syncsnoop.bt.8
/usr/share/man/man8/syscount.bt.8
/usr/share/man/man8/tcpaccept.bt.8
/usr/share/man/man8/tcpconnect.bt.8
/usr/share/man/man8/tcpdrop.bt.8
/usr/share/man/man8/tcplife.bt.8
/usr/share/man/man8/tcpretrans.bt.8
/usr/share/man/man8/tcpsynbl.bt.8
/usr/share/man/man8/threadsnoop.bt.8
/usr/share/man/man8/undump.bt.8
/usr/share/man/man8/vfscount.bt.8
/usr/share/man/man8/vfsstat.bt.8
/usr/share/man/man8/writeback.bt.8
/usr/share/man/man8/xfsdist.bt.8
❯ xbps-query -f bcc-tools | grep man8 | grep '\.bt\.'
❯ 
```
- bcc-tools can be cleanly installed alongside bpftrace

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2023-03-01 21:09 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-28 21:50 [PR PATCH] bpftrace: the man pages does not clash any more robertek
2023-03-01 21:09 ` [PR PATCH] [Closed]: " leahneukirchen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).