Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] xbps-src: re-run post-install hooks if -f flag is used
@ 2025-02-03 21:53 Duncaen
  2025-02-06 15:25 ` [PR PATCH] [Updated] " Duncaen
  2025-02-06 15:26 ` [PR PATCH] [Merged]: " Duncaen
  0 siblings, 2 replies; 3+ messages in thread
From: Duncaen @ 2025-02-03 21:53 UTC (permalink / raw)
  To: ml

[-- 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

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

* Re: [PR PATCH] [Updated] xbps-src: re-run post-install hooks if -f flag is used
  2025-02-03 21:53 [PR PATCH] xbps-src: re-run post-install hooks if -f flag is used Duncaen
@ 2025-02-06 15:25 ` Duncaen
  2025-02-06 15:26 ` [PR PATCH] [Merged]: " Duncaen
  1 sibling, 0 replies; 3+ messages in thread
From: Duncaen @ 2025-02-06 15:25 UTC (permalink / raw)
  To: ml

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

There is an updated 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 b56de2621b17b9db924a159dbf138dc4315f0c60 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

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

* Re: [PR PATCH] [Merged]: xbps-src: re-run post-install hooks if -f flag is used
  2025-02-03 21:53 [PR PATCH] xbps-src: re-run post-install hooks if -f flag is used Duncaen
  2025-02-06 15:25 ` [PR PATCH] [Updated] " Duncaen
@ 2025-02-06 15:26 ` Duncaen
  1 sibling, 0 replies; 3+ messages in thread
From: Duncaen @ 2025-02-06 15:26 UTC (permalink / raw)
  To: ml

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

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

xbps-src: re-run post-install hooks if -f flag is used
https://github.com/void-linux/void-packages/pull/54206

Description:
[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.

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

end of thread, other threads:[~2025-02-06 15:26 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-02-03 21:53 [PR PATCH] xbps-src: re-run post-install hooks if -f flag is used Duncaen
2025-02-06 15:25 ` [PR PATCH] [Updated] " Duncaen
2025-02-06 15:26 ` [PR PATCH] [Merged]: " Duncaen

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).