From 7f0fdc960394d004e38799c859509241d1cc426d Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 1 Sep 2025 11:01:24 +0200 Subject: [PATCH] package/util-linux: adjust paths for merged-bin Signed-off-by: Yann E. MORIN Signed-off-by: Romain Naour --- 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 3098a81a72..d1abdbdc9e 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -75,7 +75,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_BIN),y) +UTIL_LINUX_CONF_OPTS += --sbindir=/usr/bin +else +UTIL_LINUX_CONF_OPTS += --sbindir=/usr/sbin +endif endif ifeq ($(BR2_PACKAGE_SYSTEMD),y)