public inbox for passt-dev@passt.top
 help / color / mirror / code / Atom feed
From: David Gibson <david@gibson.dropbear.id.au>
To: Stefano Brivio <sbrivio@redhat.com>
Cc: passt-dev@passt.top, David Gibson <david@gibson.dropbear.id.au>
Subject: [PATCH] Remove incorrect special handling of /usr/libexec
Date: Mon, 26 Aug 2024 16:39:01 +1000	[thread overview]
Message-ID: <20240826063901.590640-1-david@gibson.dropbear.id.au> (raw)

The statement in the comment about /usr/libexec being only for running on
other hosts simply isn't true, neither in practice nor according to the
FHS spec[0].  Furthermore this logic didn't even handle it correctly, since
it would only handle binaries _directly_ in /usr/libexec, not those in
(explicitly FHS permitted) subdirectories under /usr/libexec.

[0] https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch04s07.html

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 mbuto | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/mbuto b/mbuto
index a2a8147..5e8ea9c 100755
--- a/mbuto
+++ b/mbuto
@@ -752,14 +752,6 @@ prog_add() {
 	unset IFS
 	[ -z "${__bin}" ] && err "Can't source ${1}"
 
-	# Binaries in /usr/libexec are meant to run on other hosts only, so they
-	# can't reside in /usr/libexec on the target image. Move to /usr/bin.
-	if [ "$("${DIRNAME}" "${__bin}")" = "/usr/libexec" ]; then
-		__bindir="${wd}/usr/bin"
-	else
-		__bindir="${wd}$("${DIRNAME}" "${__bin}")"
-	fi
-
 	"${MKDIR}" -p "${__bindir}"
 	"${CP}" --preserve=all "${__bin}" "${__bindir}"
 
-- 
@@ -752,14 +752,6 @@ prog_add() {
 	unset IFS
 	[ -z "${__bin}" ] && err "Can't source ${1}"
 
-	# Binaries in /usr/libexec are meant to run on other hosts only, so they
-	# can't reside in /usr/libexec on the target image. Move to /usr/bin.
-	if [ "$("${DIRNAME}" "${__bin}")" = "/usr/libexec" ]; then
-		__bindir="${wd}/usr/bin"
-	else
-		__bindir="${wd}$("${DIRNAME}" "${__bin}")"
-	fi
-
 	"${MKDIR}" -p "${__bindir}"
 	"${CP}" --preserve=all "${__bin}" "${__bindir}"
 
-- 
2.46.0


             reply	other threads:[~2024-08-26  6:39 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-26  6:39 David Gibson [this message]
2024-08-26  7:55 ` [PATCH] Remove incorrect special handling of /usr/libexec Stefano Brivio
2024-08-26  8:20   ` David Gibson
2024-08-26  8:37     ` Stefano Brivio
2024-08-26  8:47       ` David Gibson
2024-08-26  8:57         ` Stefano Brivio
2024-08-26  9:43           ` David Gibson

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=20240826063901.590640-1-david@gibson.dropbear.id.au \
    --to=david@gibson.dropbear.id.au \
    --cc=passt-dev@passt.top \
    --cc=sbrivio@redhat.com \
    /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.
Code repositories for project(s) associated with this public inbox

	https://passt.top/passt

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 IMAP folder(s).