[Buildroot] [PATCH 12/13] package/util-linux: adjust paths for merged-bin
Yann E. MORIN
yann.morin.1998 at free.fr
Wed May 14 16:58:24 UTC 2025
Signed-off-by: Yann E. MORIN <yann.morin.1998 at free.fr>
---
package/util-linux/util-linux.mk | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index ed30c0b107..ba3474b99f 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -74,7 +74,13 @@ endif
# ${usrlib_execdir} (/usr/lib) to ${libdir} (/lib), since both paths are
# the same when merged usr is in use.
ifeq ($(BR2_ROOTFS_MERGED_USR),y)
-UTIL_LINUX_CONF_OPTS += --bindir=/usr/bin --sbindir=/usr/sbin --libdir=/usr/lib
+UTIL_LINUX_CONF_OPTS += --bindir=/usr/bin --libdir=/usr/lib
+# Ditto for /usr/sbin and /usr/bin when merge sbin is in use
+ifeq ($(BR2_ROOTFS_MERGED_SBIN),y)
+UTIL_LINUX_CONF_OPTS += --sbindir=/usr/bin
+else
+UTIL_LINUX_CONF_OPTS += --sbindir=/usr/sbin
+endif
endif
ifeq ($(BR2_PACKAGE_SYSTEMD),y)
--
2.47.0
More information about the buildroot
mailing list