From c5dec11d71ac7436892749b40394daead5752524 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 11 Jul 2018 22:51:18 +0300 Subject: [PATCH] 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 Cc: Thomas Petazzoni Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/coreutils/coreutils.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 -- 2.30.2