diff mbox

[OpenWrt-Devel,v2] Fix Busybox “uname -o”

Message ID alpine.DEB.2.20.1511211617320.29881@ebony
State Superseded
Headers show

Commit Message

Mark Mentovai Nov. 21, 2015, 9:20 p.m. UTC
Since r47288, “uname -o” shows “n”. It used to be “GNU/Linux”.

root at gw1 sh# uname -a
Linux gw1.nyc 4.1.11 #1 Sat Nov 21 12:50:41 EST 2015 mips n
root at gw1 sh# uname -o
n

It looks like a recent change in Busybox uname made “uname -o” 
configurable: 
http://git.busybox.net/busybox/commit?id=64ed5f0d3c5eefbb208d4a334654834c78be2cbd.

In build_dir/target-mips_34kc_musl-1.1.11/busybox-1.24.1/.config, I see

CONFIG_UNAME_OSNAME="n"

Probably relevant, I use CONFIG_BUSYBOX_CUSTOM=y.

OpenWrt’s busybox/config/coreutils/Config.in needs to mirror Busybox’ own 
coreutils/Config.src. Likely, all of OpenWrt’s busybox Config.in files 
need to be updated in this way after a Busybox update.

Signed-off-by: Mark Mentovai <mark@moxienet.com>

Comments

Mark Mentovai Nov. 21, 2015, 9:47 p.m. UTC | #1
I wrote:
> OpenWrt’s busybox/config/coreutils/Config.in needs to mirror Busybox’ own 
> coreutils/Config.src. Likely, all of OpenWrt’s busybox Config.in files need 
> to be updated in this way after a Busybox update.

I posted this as an alternative, more complete patch, under the title 
[PATCH] busybox: Update config for 1.24.1.
diff mbox

Patch

diff --git a/package/utils/busybox/config/coreutils/Config.in b/package/utils/busybox/config/coreutils/Config.in
index f50823f012de..e25da6519f2b 100644
--- a/package/utils/busybox/config/coreutils/Config.in
+++ b/package/utils/busybox/config/coreutils/Config.in
@@ -829,6 +829,14 @@  config BUSYBOX_CONFIG_UNAME
  	help
  	  uname is used to print system information.

+config BUSYBOX_CONFIG_UNAME_OSNAME
+	string "Operating system name"
+	default "GNU/Linux"
+	depends on BUSYBOX_CONFIG_UNAME
+	help
+	  Sets the operating system name reported by uname -o.  The
+	  default is "GNU/Linux".
+
  config BUSYBOX_CONFIG_UNEXPAND
  	bool "unexpand"
  	default BUSYBOX_DEFAULT_UNEXPAND