| Message ID | 2b42d6f4f947a7423813916cd6f8e5f37c5b113a.1531338679.git.baruch@tkos.co.il |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2,1/2] coreutils: fix chroot installation | expand |
Hello, On Wed, 11 Jul 2018 22:51:18 +0300, Baruch Siach wrote: > 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> > --- > v2: Drop ../usr from symlink target (Arnout, Carlos) > --- > package/coreutils/coreutils.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Series applied. Thanks! Thomas
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes: > 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> > --- > v2: Drop ../usr from symlink target (Arnout, Carlos) Committed to 2018.05.x, thanks.
diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk index 3cb96589f228..2fb4a32c794f 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
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> --- v2: Drop ../usr from symlink target (Arnout, Carlos) --- package/coreutils/coreutils.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)