diff options
| author | Denys Vlasenko | 2017-07-18 20:17:51 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2017-07-18 20:17:51 +0200 |
| commit | 483405a9b0df6ea14344b1144959be1debef925e (patch) | |
| tree | 4aeb87458ccc564621985c181142e2498d0b8d9f /coreutils | |
| parent | d2c15bc7633d91400a46700af78bb36b2aa0a402 (diff) | |
| download | busybox-483405a9b0df6ea14344b1144959be1debef925e.zip busybox-483405a9b0df6ea14344b1144959be1debef925e.tar.gz | |
Tweaks from mass recompile for 1.27.1 release
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'coreutils')
| -rw-r--r-- | coreutils/uname.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/coreutils/uname.c b/coreutils/uname.c index 9c6a06e..1f19c93 100644 --- a/coreutils/uname.c +++ b/coreutils/uname.c @@ -57,18 +57,18 @@ //config: default is "GNU/Linux". //config: //can't use "ARCH" for this applet, all hell breaks loose in build system :) -//config:config BBARCH +//config:config BB_ARCH //config: bool "arch" //config: default y //config: help //config: Same as uname -m. //applet:IF_UNAME(APPLET(uname, BB_DIR_BIN, BB_SUID_DROP)) -// APPLET_ODDNAME:name main location suid_type help -//applet:IF_BBARCH(APPLET_ODDNAME(arch, uname, BB_DIR_BIN, BB_SUID_DROP, arch)) +// APPLET_ODDNAME:name main location suid_type help +//applet:IF_BB_ARCH(APPLET_ODDNAME(arch, uname, BB_DIR_BIN, BB_SUID_DROP, arch)) -//kbuild:lib-$(CONFIG_UNAME) += uname.o -//kbuild:lib-$(CONFIG_BBARCH) += uname.o +//kbuild:lib-$(CONFIG_UNAME) += uname.o +//kbuild:lib-$(CONFIG_BB_ARCH) += uname.o /* BB_AUDIT SUSv3 compliant */ /* http://www.opengroup.org/onlinepubs/007904975/utilities/uname.html */ @@ -131,7 +131,7 @@ int uname_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) toprint = (1 << 4); /* "arch" = "uname -m" */ #if ENABLE_UNAME - if (!ENABLE_BBARCH || applet_name[0] == 'u') { + if (!ENABLE_BB_ARCH || applet_name[0] == 'u') { # if ENABLE_LONG_OPTS static const char uname_longopts[] ALIGN1 = /* name, has_arg, val */ @@ -172,7 +172,7 @@ int uname_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) } } #endif - if (ENABLE_BBARCH && (!ENABLE_UNAME || applet_name[0] == 'a')) { + if (ENABLE_BB_ARCH && (!ENABLE_UNAME || applet_name[0] == 'a')) { puts(uname_info.name.machine); } else { #if ENABLE_UNAME |