diff options
| author | Carlos Santos <casantos@datacom.ind.br> | 2017-11-08 22:05:33 -0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-11-22 22:46:06 +0100 |
| commit | 099c2ceaa8adfcdcbbaf039000e1fe26a33a6165 (patch) | |
| tree | 051da673c699097d85197b2c523a29e92797e0b2 | |
| parent | 273aad9e507eedf5245a004be8f7372a7c4d5ca7 (diff) | |
| download | buildroot-099c2ceaa8adfcdcbbaf039000e1fe26a33a6165.tar.gz buildroot-099c2ceaa8adfcdcbbaf039000e1fe26a33a6165.zip | |
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>
| -rw-r--r-- | package/util-linux/util-linux.mk | 7 |
1 files changed, 7 insertions, 0 deletions
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) |
