Skip to contentSkip to conversation

coreutils: Move stdbuf into an own package coreutils-stdbuf

PATCH Superseded Adrian Bunk 2 participants 3 messages Oct 4, 2019 – Oct 27, 2019

v2 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 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..cfeb42d579 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 += "${PN}-stdbuf"
+FILES_${PN}-stdbuf = "${bindir}/stdbuf ${libdir}/${PN}/libstdbuf.so"
+RDEPENDS_${PN} += "${PN}-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 25 lines · Adrian Bunk

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 +1 -1
index 4a74f619af..cfeb42d579 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

meta/recipes-core/coreutils/coreutils_8.31.bb base_bindir_progs = "cat chgrp chmod chown cp date dd echo false hostname kill l · line 67

Quoted 10 lines
meta/recipes-core/coreutils/coreutils_8.31.bb +4 -0
@@ -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 += "${PN}-stdbuf"
+FILES_${PN}-stdbuf = "${bindir}/stdbuf ${libdir}/${PN}/libstdbuf.so"
+RDEPENDS_${PN} += "${PN}-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

This seems to break core-utils-native:

https://autobuilder.yoctoproject.org/typhoon/#/builders/39/builds/1157

(can be seen with a world build attempt)

Cheers,

Richard

#2 lore raw
Quoted 5 lines · Richard Purdie

This seems to break core-utils-native:

https://autobuilder.yoctoproject.org/typhoon/#/builders/39/builds/1157
...

Thanks, v3 sent.

Quoted 3 lines

Cheers,

Richard

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