Patchwork [3/4] coreutils: move 'stat' to base_bindir_progs

login
register
mail settings
Submitter Qi.Chen@windriver.com
Date Jan. 22, 2014, 2:39 a.m.
Message ID <1aaa9267168ec59579f3e4a362bfc29ed9de3ec8.1390358320.git.Qi.Chen@windriver.com>
Download mbox | patch
Permalink /patch/65493/
State Accepted
Commit 95ff97e659265408c63c7aec62c62a494ff59705
Headers show

Comments

Qi.Chen@windriver.com - Jan. 22, 2014, 2:39 a.m.
To correctly integrate with busybox in our system, we should add
'stat' to base_bindir_progs so that the 'stat' commands from busybox
and coreutils both register to /bin/stat.

Previously there was a patch in busybox to move 'stat' to /usr/bin.
But as we can easily solve this integration problem by modifying the
coreutils recipe, this patch has been removed. After all, maintaining
a patch that's not accepted by upsteam should not be our No.1 choice.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/recipes-core/coreutils/coreutils_6.9.bb  |    4 ++--
 meta/recipes-core/coreutils/coreutils_8.22.bb |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Patch

diff --git a/meta/recipes-core/coreutils/coreutils_6.9.bb b/meta/recipes-core/coreutils/coreutils_6.9.bb
index 6375041..5a16872 100644
--- a/meta/recipes-core/coreutils/coreutils_6.9.bb
+++ b/meta/recipes-core/coreutils/coreutils_6.9.bb
@@ -49,12 +49,12 @@  bindir_progs = "base64 basename cksum comm csplit cut dir dircolors dirname du \
                 env expand expr factor fmt fold groups head hostid id install \
                 join link logname md5sum mkfifo nice nl nohup od paste pathchk \
                 pinky pr printenv printf ptx readlink seq sha1sum sha224sum sha256sum \
-                sha384sum sha512sum shred shuf sort split stat sum tac tail tee test \
+                sha384sum sha512sum shred shuf sort split sum tac tail tee test \
                 tr tsort tty unexpand uniq unlink users vdir wc who whoami yes uptime"
 
 # hostname gets a special treatment and is not included in this
 base_bindir_progs = "cat chgrp chmod chown cp date dd echo false kill ln ls mkdir \
-                     mknod mv pwd rm rmdir sleep stty sync touch true uname hostname"
+                     mknod mv pwd rm rmdir sleep stty sync touch true uname hostname stat"
 
 sbindir_progs= "chroot"
 
diff --git a/meta/recipes-core/coreutils/coreutils_8.22.bb b/meta/recipes-core/coreutils/coreutils_8.22.bb
index 6b222b5..f88373f 100644
--- a/meta/recipes-core/coreutils/coreutils_8.22.bb
+++ b/meta/recipes-core/coreutils/coreutils_8.22.bb
@@ -38,12 +38,12 @@  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 nice nl nohup nproc od paste pathchk \
                 pinky pr printenv printf ptx readlink realpath runcon seq sha1sum sha224sum sha256sum \
-                sha384sum sha512sum shred shuf sort split stat stdbuf sum tac tail tee test timeout\
+                sha384sum sha512sum shred shuf sort split stdbuf 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
 base_bindir_progs = "cat chgrp chmod chown cp date dd echo false kill ln ls mkdir \
-                     mknod mv pwd rm rmdir sleep stty sync touch true uname"
+                     mknod mv pwd rm rmdir sleep stty sync touch true uname stat"
 
 sbindir_progs= "chroot"