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 <casantos@datacom.ind.br> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
parent
273aad9e50
commit
099c2ceaa8
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue