From: Carlos Santos Date: Thu, 9 Nov 2017 00:05:33 +0000 (-0200) Subject: util-linux: explicitly use /usr/{bin, sbin, lib}, with merged usr X-Git-Tag: 2018.02-rc1~826^2~102 X-Git-Url: https://rtime.felk.cvut.cz/gitweb/coffee/buildroot.git/commitdiff_plain/099c2ceaa8adfcdcbbaf039000e1fe26a33a6165 util-linux: explicitly use /usr/{bin, sbin, lib}, with merged usr Prevent the installation from attempting to move shared libraries from ${usrlib_execdir} to ${libdir} if both paths are the same, which leads to error messages like this: mv: '$(TARGET_DIR)/usr/lib/libfoo.so.1' and '$(TARGET_DIR)/lib/libfoo.so.1' are the same file That error is not fatal but let's avoid possible future problems. Signed-off-by: Carlos Santos Signed-off-by: Thomas Petazzoni --- diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 8464288600..31a3fe47ab 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -41,6 +41,13 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y) UTIL_LINUX_DEPENDENCIES += busybox endif +# Prevent the installation from attempting to move shared libraries from +# ${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 +endif + ifeq ($(BR2_PACKAGE_NCURSES),y) UTIL_LINUX_DEPENDENCIES += ncurses ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y)