From: Duncaen <Duncaen@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] xbps-src: re-run post-install hooks if -f flag is used
Date: Mon, 03 Feb 2025 22:53:49 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-54206@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 625 bytes --]
There is a new pull request by Duncaen against master on the void-packages repository
https://github.com/Duncaen/void-packages xbsp-src-post-install-hooks
https://github.com/void-linux/void-packages/pull/54206
xbps-src: re-run post-install hooks if -f flag is used
[ci skip]
This fixed the issue where the post-install hooks are not rerun even though `-f` was specified. Resulting in some weird error about lib64 not being allowed, since xbps-src creates the symlink in the destdir and removes it again in the post-install hook.
A patch file from https://github.com/void-linux/void-packages/pull/54206.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xbsp-src-post-install-hooks-54206.patch --]
[-- Type: text/x-diff, Size: 1047 bytes --]
From 8bf8e104f93592d0a4a22f852b865e9f246d350d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 3 Feb 2025 22:45:10 +0100
Subject: [PATCH] xbps-src: re-run post-install hooks if -f flag is used
---
common/xbps-src/libexec/xbps-src-doinstall.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/xbps-src/libexec/xbps-src-doinstall.sh b/common/xbps-src/libexec/xbps-src-doinstall.sh
index fb5d35d1a59aec..690cf8ae0e70e0 100755
--- a/common/xbps-src/libexec/xbps-src-doinstall.sh
+++ b/common/xbps-src/libexec/xbps-src-doinstall.sh
@@ -44,7 +44,7 @@ fi
XBPS_SUBPKG_INSTALL_DONE="${XBPS_STATEDIR}/${PKGNAME}_${XBPS_CROSS_BUILD}_subpkg_install_done"
# If it's a subpkg execute the pkg_install() function.
-if [ ! -f $XBPS_SUBPKG_INSTALL_DONE ]; then
+if [ ! -f $XBPS_SUBPKG_INSTALL_DONE -o -n "$XBPS_BUILD_FORCEMODE" ]; then
if [ "$sourcepkg" != "$PKGNAME" ]; then
# Source all subpkg environment setup snippets.
for f in ${XBPS_COMMONDIR}/environment/setup-subpkg/*.sh; do
next reply other threads:[~2025-02-03 21:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-03 21:53 Duncaen [this message]
2025-02-06 15:25 ` [PR PATCH] [Updated] " Duncaen
2025-02-06 15:26 ` [PR PATCH] [Merged]: " Duncaen
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-54206@inbox.vuxu.org \
--to=duncaen@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).