[Buildroot] [PATCH v2 0/2] Switch coreutils to symlink method

[Buildroot] [PATCH v2 0/2] Switch coreutils to symlink method

[Thomas Petazzoni]

Hello,

This is a new iteration of Carlos Santos patch [1] for coreutils, with
the following changes:

 - Add a patch to use a foreach make loop instead of a for shell loop.

 - Use the symlink method instead of shell wrappers in all cases, not
   only in the merged /usr situation, by tweaking how some programs
   are moved from /usr/bin to /bin.

[1] https://patchwork.ozlabs.org/patch/819273/

Thanks,

Thomas

Carlos Santos (1):
  coreutils: use single binary in symlink method

Thomas Petazzoni (1):
  coreutils: rewrite for loop with foreach

 package/coreutils/coreutils.mk | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

-- 
2.14.3

[Buildroot] [PATCH v2 1/2] coreutils: rewrite for loop with foreach

[Thomas Petazzoni]

This brings up error checking at each iteration of the loop for free,
which removes the need for "|| exit 1".

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 package/coreutils/coreutils.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk
index 8259f42f4a..8880e77dcc 100644
--- a/package/coreutils/coreutils.mk
+++ b/package/coreutils/coreutils.mk
@@ -104,9 +104,9 @@ endif
 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
+	$(foreach f,$(COREUTILS_BIN_PROGS), \
+		mv -f $(TARGET_DIR)/usr/bin/$(f) $(TARGET_DIR)/bin/$(f)
+	)
 endef
 COREUTILS_POST_INSTALL_TARGET_HOOKS += COREUTILS_CLEANUP_BIN
 endif
-- 
2.14.3

[Buildroot] [PATCH v2 1/2] coreutils: rewrite for loop with foreach

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes:

 > This brings up error checking at each iteration of the loop for free,
 > which removes the need for "|| exit 1".

 > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH v2 2/2] coreutils: use single binary in symlink method

[Thomas Petazzoni]

From: Carlos Santos <casantos@datacom.ind.br>

The symlink method is faster, since there is no shell fork/exec, and
provides extra space savings.

Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
[Thomas: use the symlinks method not only for the merged /usr case,
but also in the non-merged case to be consistent, and therefore adjust
the logic that was moving the shell wrappers to a logic that recreates
the symlinks.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 package/coreutils/coreutils.mk | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk
index 8880e77dcc..4ef888829f 100644
--- a/package/coreutils/coreutils.mk
+++ b/package/coreutils/coreutils.mk
@@ -14,7 +14,7 @@ COREUTILS_LICENSE_FILES = COPYING
 COREUTILS_AUTORECONF = YES
 COREUTILS_GETTEXTIZE = YES
 
-COREUTILS_CONF_OPTS = --disable-rpath --enable-single-binary=shebangs \
+COREUTILS_CONF_OPTS = --disable-rpath --enable-single-binary=symlinks \
 	$(if $(BR2_TOOLCHAIN_USES_MUSL),--with-included-regex)
 COREUTILS_CONF_ENV = ac_cv_c_restrict=no \
 	ac_cv_func_chown_works=yes \
@@ -103,9 +103,10 @@ endif
 
 ifeq ($(BR2_ROOTFS_MERGED_USR),)
 define COREUTILS_CLEANUP_BIN
-	# some things go in root rather than usr
+	# some things go in /bin rather than /usr/bin
 	$(foreach f,$(COREUTILS_BIN_PROGS), \
-		mv -f $(TARGET_DIR)/usr/bin/$(f) $(TARGET_DIR)/bin/$(f)
+		rm -f $(TARGET_DIR)/usr/bin/$(f) && \
+		ln -sf ../usr/bin/coreutils $(TARGET_DIR)/bin/$(f)
 	)
 endef
 COREUTILS_POST_INSTALL_TARGET_HOOKS += COREUTILS_CLEANUP_BIN
-- 
2.14.3

[Buildroot] [PATCH v2 2/2] coreutils: use single binary in symlink method

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes:

 > From: Carlos Santos <casantos@datacom.ind.br>
 > The symlink method is faster, since there is no shell fork/exec, and
 > provides extra space savings.

 > Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
 > [Thomas: use the symlinks method not only for the merged /usr case,
 > but also in the non-merged case to be consistent, and therefore adjust
 > the logic that was moving the shell wrappers to a logic that recreates
 > the symlinks.]
 > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard