Skip to contentSkip to conversation

coreutils: handle merged usr folder

PATCH New James Knight 3 participants 3 messages Oct 18, 2015 – Oct 20, 2015

lore
Share & tools
lore

James Knight

author
#0 lore raw

PATCH 1/1 coreutils: handle merged usr folder

For targets prepared with a usr-move, coreutils should not be attempting to move binaries from usr/bin to bin.

Signed-off-by James Knight <[email protected]>
---
 package/coreutils/coreutils.mk | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
package/coreutils/coreutils.mk +8 -2
index bb2ef96..60455ac 100644
@@ -99,18 +99,24 @@ COREUTILS_CONF_OPTS += --with-openssl=yes
 COREUTILS_DEPENDENCIES += openssl
 endif
 
-define COREUTILS_POST_INSTALL
+ifeq ($(BR2_ROOTFS_MERGED_USR),)
+define COREUTILS_CLEANUP_BIN
 	# some things go in root rather than usr
 	for f in $(COREUTILS_BIN_PROGS); do \
 		mv -f $(TARGET_DIR)/usr/bin/$$f $(TARGET_DIR)/bin/$$f || exit 1; \
 	done
+endef
+COREUTILS_POST_INSTALL_TARGET_HOOKS += COREUTILS_CLEANUP_BIN
+endif
+
+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
 endef
 
-COREUTILS_POST_INSTALL_TARGET_HOOKS += COREUTILS_POST_INSTALL
+COREUTILS_POST_INSTALL_TARGET_HOOKS += COREUTILS_CLEANUP
 
 # If both coreutils and busybox are selected, the corresponding applets
 # may need to be reinstated by the clean targets.
Signature · 1 line
1.9.5.msysgit.1
#1 lore raw

PATCH 1/1 coreutils: handle merged usr folder

James, All,

On 2015-10-18 02:32 -0400, James Knight spake thusly:

Quoted 2 lines

For targets prepared with a usr-move, coreutils should not be attempting to move binaries from usr/bin to bin.

For the records, pleas see comments already made on the patch doing the same for sed:

    http://lists.busybox.net/pipermail/buildroot/2015-October/142230.html
Quoted 1 line
Signed-off-by James Knight <[email protected]>
Reviewed-by "Yann E. MORIN" <[email protected]>
Tested-by "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Quoted 42 lines
---
 package/coreutils/coreutils.mk | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
package/coreutils/coreutils.mk +8 -2
index bb2ef96..60455ac 100644
@@ -99,18 +99,24 @@ COREUTILS_CONF_OPTS += --with-openssl=yes
 COREUTILS_DEPENDENCIES += openssl
 endif
 
-define COREUTILS_POST_INSTALL
+ifeq ($(BR2_ROOTFS_MERGED_USR),)
+define COREUTILS_CLEANUP_BIN
 	# some things go in root rather than usr
 	for f in $(COREUTILS_BIN_PROGS); do \
 		mv -f $(TARGET_DIR)/usr/bin/$$f $(TARGET_DIR)/bin/$$f || exit 1; \
 	done
+endef
+COREUTILS_POST_INSTALL_TARGET_HOOKS += COREUTILS_CLEANUP_BIN
+endif
+
+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
 endef
 
-COREUTILS_POST_INSTALL_TARGET_HOOKS += COREUTILS_POST_INSTALL
+COREUTILS_POST_INSTALL_TARGET_HOOKS += COREUTILS_CLEANUP
 
 # If both coreutils and busybox are selected, the corresponding applets
 # may need to be reinstated by the clean targets.
Signature · 6 lines
1.9.5.msysgit.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'