Skip to contentSkip to conversation

coreutils: Move stdbuf into an own package coreutils-stdbuf

PATCH Superseded Adrian Bunk 2 participants 3 messages Oct 28, 2019 – Oct 31, 2019

v4 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 coreutils: Move stdbuf into an own package coreutils-stdbuf

This LD_PRELOAD trick is not really suitable for busybox, so can be the only part of coreutils needed.

coreutils depends on the new package,
so nothing changes when installing coreutils.

---
 meta/recipes-core/coreutils/coreutils_8.31.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
meta/recipes-core/coreutils/coreutils_8.31.bb +5 -1
index 4a74f619af..57b2c1bdba 100644
@@ -49,7 +49,7 @@ bindir_progs = "arch basename chcon cksum comm csplit cut dir dircolors dirname
                 env expand expr factor fmt fold groups head hostid id install \
                 join link logname md5sum mkfifo nl nohup nproc od paste pathchk \
                 pinky pr printf ptx readlink realpath runcon seq sha1sum sha224sum sha256sum \
-                sha384sum sha512sum shred shuf sort split stdbuf sum tac tail tee test timeout \
+                sha384sum sha512sum shred shuf sort split sum tac tail tee test timeout \
                 tr truncate tsort tty unexpand uniq unlink uptime users vdir wc who whoami yes"
 
 # hostname gets a special treatment and is not included in this
@@ -58,6 +58,10 @@ base_bindir_progs = "cat chgrp chmod chown cp date dd echo false hostname kill l
 
 sbindir_progs= "chroot"
 
+PACKAGE_BEFORE_PN_class-target += "coreutils-stdbuf"
+FILES_coreutils-stdbuf = "${bindir}/stdbuf ${libdir}/coreutils/libstdbuf.so"
+RDEPENDS_coreutils_class-target += "coreutils-stdbuf"
+
 # Let aclocal use the relative path for the m4 file rather than the
 # absolute since coreutils has a lot of m4 files, otherwise there might
 # be an "Argument list too long" error when it is built in a long/deep
Signature · 1 line
2.17.1
#1 lore raw
Quoted 2 lines · Adrian Bunk

This LD_PRELOAD trick is not really suitable for busybox, so can be the only part of coreutils needed.

Which LD_PRELOAD trick?

Ah, I think you mean:

The coreutils implementation of stdbuf uses LD_PRELOAD [1] to dynamically load libstdbuf which calls setvbuf(). This can't be implemented simply in busybox since it produces one or two statically linked executables. Therefore, stdbuf should be packaged separately.

[1] ?? http://git.savannah.gnu.org/gitweb/?p=coreutils.git;a=blob;f=src/stdbuf.c;h=7eaadb45fef8c01783eeb5c27853fafbcef34f1c;hb=HEAD#l188

Could you send a v5 for plebs like me?

../Randy

Quoted 34 lines

coreutils depends on the new package,
so nothing changes when installing coreutils.

---
  meta/recipes-core/coreutils/coreutils_8.31.bb | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
meta/recipes-core/coreutils/coreutils_8.31.bb +5 -1
index 4a74f619af..57b2c1bdba 100644
@@ -49,7 +49,7 @@ bindir_progs = "arch basename chcon cksum comm csplit cut dir dircolors dirname
                  env expand expr factor fmt fold groups head hostid id install \
                  join link logname md5sum mkfifo nl nohup nproc od paste pathchk \
                  pinky pr printf ptx readlink realpath runcon seq sha1sum sha224sum sha256sum \
-                sha384sum sha512sum shred shuf sort split stdbuf sum tac tail tee test timeout \
+                sha384sum sha512sum shred shuf sort split sum tac tail tee test timeout \
                  tr truncate tsort tty unexpand uniq unlink uptime users vdir wc who whoami yes"
 
  # hostname gets a special treatment and is not included in this
@@ -58,6 +58,10 @@ base_bindir_progs = "cat chgrp chmod chown cp date dd echo false hostname kill l
 
  sbindir_progs= "chroot"
 
+PACKAGE_BEFORE_PN_class-target += "coreutils-stdbuf"
+FILES_coreutils-stdbuf = "${bindir}/stdbuf ${libdir}/coreutils/libstdbuf.so"
+RDEPENDS_coreutils_class-target += "coreutils-stdbuf"
+
  # Let aclocal use the relative path for the m4 file rather than the
  # absolute since coreutils has a lot of m4 files, otherwise there might
  # be an "Argument list too long" error when it is built in a long/deep
Signature · 2 lines
# Randy MacLeod
# Wind River Linux
#2 lore raw
Quoted 14 lines · Randy MacLeod
Quoted 2 lines · Adrian Bunk

This LD_PRELOAD trick is not really suitable for busybox, so can be the only part of coreutils needed.

Which LD_PRELOAD trick?

Ah, I think you mean:

The coreutils implementation of stdbuf uses LD_PRELOAD [1] to dynamically load libstdbuf which calls setvbuf(). This can't be implemented simply in busybox since it produces one or two statically linked executables. Therefore, stdbuf should be packaged separately.

Quoted 3 lines

[1] ?? http://git.savannah.gnu.org/gitweb/?p=coreutils.git;a=blob;f=src/stdbuf.c;h=7eaadb45fef8c01783eeb5c27853fafbcef34f1c;hb=HEAD#l188

Could you send a v5 for plebs like me?

Done.

Quoted 1 line

../Randy

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed