Github messages for voidlinux
 help / color / mirror / Atom feed
From: tornaria <tornaria@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] nostrip_files: allow full path
Date: Sat, 08 Jan 2022 02:26:26 +0100	[thread overview]
Message-ID: <20220108012626.RQCetWVuYB7DuNsp1TYaUqVRwAOjx7x5zQ48V3HvYTU@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-34886@inbox.vuxu.org>

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

There is an updated pull request by tornaria against master on the void-packages repository

https://github.com/tornaria/void-packages nostrip_files
https://github.com/void-linux/void-packages/pull/34886

nostrip_files: allow full path
The option `nostrip_files` takes a filename without path, in contrast to
option `nopie_files` which takes only full path.

This is inconvenient in a case where there are two binaries with the
same name and only one must be stripped.

Case in point: maxima contains executables

    /usr/lib/maxima/5.45.1/binary-ecl/maxima
    /usr/lib/maxima/5.45.1/binary-sbcl/maxima

The second one breaks if stripped, but the first one is ok to strip (desirable: 59M -> 13M).

See: https://github.com/void-linux/void-packages/issues/34861#issuecomment-1006197772

This commit makes it so that `nostrip_files` can take either the
filename or the full path.



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

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

From 2c99d14ba40a2a4c9d94869da89f821f7413e7c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 5 Jan 2022 20:59:20 -0300
Subject: [PATCH] nostrip_files: allow full path

The option `nostrip_files` takes a filename without path, in contrast to
option `nopie_files` which takes only full path.

This commit makes it so that `nostrip_files` can take either the
filename or the full path.
---
 Manual.md                                            | 4 ++--
 common/hooks/post-install/06-strip-and-debug-pkgs.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Manual.md b/Manual.md
index 2a7a990d37a1..3e641633ba6a 100644
--- a/Manual.md
+++ b/Manual.md
@@ -644,7 +644,7 @@ Example: `conf_files="/etc/foo.conf /etc/foo2.conf /etc/foo/*.conf"`.
 default all binaries are stripped.
 
 - `nostrip_files` White-space separated list of ELF binaries that won't be stripped of
-debugging symbols.
+debugging symbols. Files can be given by full path or by filename.
 
 - `noshlibprovides` If set, the ELF binaries won't be inspected to collect the provided
 sonames in shared libraries.
@@ -690,7 +690,7 @@ This appends to the generated file rather than replacing it.
   features (PIE, relro, etc). Not necessary for most packages.
 
 - `nopie_files` White-space seperated list of ELF binaries that won't be checked
-for PIE.
+for PIE. Files must be given by full path.
 
 - `reverts` xbps supports a unique feature which allows to downgrade from broken
 packages automatically. In the `reverts` field one can define a list of broken
diff --git a/common/hooks/post-install/06-strip-and-debug-pkgs.sh b/common/hooks/post-install/06-strip-and-debug-pkgs.sh
index 2cec68412c50..191c025e552c 100644
--- a/common/hooks/post-install/06-strip-and-debug-pkgs.sh
+++ b/common/hooks/post-install/06-strip-and-debug-pkgs.sh
@@ -72,7 +72,7 @@ hook() {
 
 		fname=${f##*/}
 		for x in ${nostrip_files}; do
-			if [ "$x" = "$fname" ]; then
+			if [ "$x" = "$fname" -o "$x" = "${f#$PKGDESTDIR}" ]; then
 				found=1
 				break
 			fi

  reply	other threads:[~2022-01-08  1:26 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-06  0:55 [PR PATCH] " tornaria
2022-01-08  1:26 ` tornaria [this message]
2022-01-08  1:28 ` tornaria
2022-01-08  1:29 ` [PR PATCH] [Updated] " tornaria
2022-01-08 16:51 ` [PR PATCH] [Merged]: " Chocimier

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=20220108012626.RQCetWVuYB7DuNsp1TYaUqVRwAOjx7x5zQ48V3HvYTU@z \
    --to=tornaria@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).