From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: passt.top; dkim=pass (2048-bit key; secure) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.a=rsa-sha256 header.s=202408 header.b=X3j9prvg; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id 256275A004C for ; Mon, 26 Aug 2024 08:39:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202408; t=1724654343; bh=RdhLOuzExiFOA7x0bP8Fvmgy7sLFtkUdzCIQX1OEiv8=; h=From:To:Cc:Subject:Date:From; b=X3j9prvgz2zby1ggrWjI98Lw4KvmlnetUTQD2jaslT5WiqcBxh3+smpvK/PXNBu6D A5V5LAbk+LWdcw7+zMJcdNyIQhGrAzNymxy5P79EerKyHdImiCrZrsfq09pxV0d/7X k3LYpjpEdiqGnDZpL1h0sU+WYG5F3/es/8b4E0TCXlontBJ7JTBeYVc/xfQNU9tZNt voLE3XdUcUpEPfx+VQndUYJItaJuhvmn1S/8NbM+Z0tlXuq7k1+F/QXepn4remwxmi Q+34NpiFJTQCAJl8sDpsv/huWPna0+KD7j5i5WtdW+QJE4wIWfJrs/7qnXIi1xNWbU 1RAbhXWshpBMw== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4Wsgxg6rktz4x5J; Mon, 26 Aug 2024 16:39:03 +1000 (AEST) From: David Gibson To: Stefano Brivio Subject: [PATCH] Remove incorrect special handling of /usr/libexec Date: Mon, 26 Aug 2024 16:39:01 +1000 Message-ID: <20240826063901.590640-1-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: PSTBMRFVNIIFGK2O2V45ST6OQD7MD5LF X-Message-ID-Hash: PSTBMRFVNIIFGK2O2V45ST6OQD7MD5LF X-MailFrom: dgibson@gandalf.ozlabs.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: passt-dev@passt.top, David Gibson X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: 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 --- 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}" -- 2.46.0