summaryrefslogtreecommitdiffstats
path: root/package/coreutils
diff options
context:
space:
mode:
authorBaruch Siach <baruch@tkos.co.il>2018-07-11 22:51:18 +0300
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>2018-07-16 16:41:20 +0200
commitc5dec11d71ac7436892749b40394daead5752524 (patch)
treef01f2e4400e926ea02c9176ae77523f62b82d36e /package/coreutils
parent0fbc50d46a52555b7fc199ba319d011c0c7fd1c8 (diff)
downloadbuildroot-c5dec11d71ac7436892749b40394daead5752524.tar.gz
buildroot-c5dec11d71ac7436892749b40394daead5752524.zip
coreutils: fix chroot installation
Since commit 256bb383fb7 (coreutils: use single binary in symlink method) the chroot move command creates a dangling symlink, because the symlink target is 'coreutils' which is not in the /usr/sbin/ directory. Instead of moving, remove the coreutils installed symlink, and create a new one in $(TARGET_DIR)/usr/sbin with the correct target. Should also fix (busybox): http://autobuild.buildroot.net/results/6b3/6b39648b466738162516aa50ab328d839ec85448/ Cc: Carlos Santos <casantos@datacom.ind.br> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Diffstat (limited to 'package/coreutils')
-rw-r--r--package/coreutils/coreutils.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk
index 3cb96589f2..2fb4a32c79 100644
--- a/package/coreutils/coreutils.mk
+++ b/package/coreutils/coreutils.mk
@@ -114,7 +114,8 @@ define COREUTILS_CLEANUP
# link for archaic shells
ln -fs test $(TARGET_DIR)/usr/bin/[
# gnu thinks chroot is in bin, debian thinks it's in sbin
- mv -f $(TARGET_DIR)/usr/bin/chroot $(TARGET_DIR)/usr/sbin/chroot
+ rm -f $(TARGET_DIR)/usr/bin/chroot
+ ln -sf ../bin/coreutils $(TARGET_DIR)/usr/sbin/chroot
endef
COREUTILS_POST_INSTALL_TARGET_HOOKS += COREUTILS_CLEANUP
OpenPOWER on IntegriCloud