From: gmbeard <gmbeard@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] atop: Remove ineffective vsed
Date: Sun, 26 Mar 2023 14:39:09 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-43027@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1252 bytes --]
There is a new pull request by gmbeard against master on the void-packages repository
https://github.com/gmbeard/void-packages fix/atop-ineffective-vsed
https://github.com/void-linux/void-packages/pull/43027
atop: Remove ineffective vsed
<!-- Uncomment relevant sections and delete options which are not applicable -->
Addresses part of tracking issue #42441
- [x] atop
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### 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
- I built this PR locally for these architectures:
- i686
- aarch64
A patch file from https://github.com/void-linux/void-packages/pull/43027.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix/atop-ineffective-vsed-43027.patch --]
[-- Type: text/x-diff, Size: 770 bytes --]
From 787578436ca106d73e0b5c62a1f5ac204a53c5fd Mon Sep 17 00:00:00 2001
From: Greg Beard <gmbeard@googlemail.com>
Date: Sun, 26 Mar 2023 13:35:41 +0100
Subject: [PATCH] atop: Remove ineffective vsed
---
srcpkgs/atop/template | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/srcpkgs/atop/template b/srcpkgs/atop/template
index 376f8369d511..55a37a2bb40e 100644
--- a/srcpkgs/atop/template
+++ b/srcpkgs/atop/template
@@ -15,9 +15,7 @@ checksum=ca48d2f17e071deead5e6e9cc9e388bf6a3270d695e61976b3794d4d927b5c4e
make_dirs="/var/log/atop 755 root root"
pre_install() {
- vsed -e '/chown/d' \
- -e 's/04711/0755/' \
- -e 's,sbin,bin,g' \
+ vsed -e 's,sbin,bin,g' \
-e '/$(DEFPATH)/d' -i Makefile
vsed -e 's,bin/sh,bin/bash,' -i atop.daily
}
next reply other threads:[~2023-03-26 12:39 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-26 12:39 gmbeard [this message]
2023-03-26 12:46 ` [PR PATCH] [Closed]: " gmbeard
2023-03-26 12:47 ` gmbeard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-43027@inbox.vuxu.org \
--to=gmbeard@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).