Switch to toybox uptime.

Now we're manually editing .config because we gave up on the repeated
breakage running the script on the host, we don't need to have a fake
<shadow.h>, and we can fix uptime so we don't need a <utmpx.h> either.

Change-Id: If371bb85bd44fec01362f7fbbbfc392bd2cdfe29
This commit is contained in:
Elliott Hughes 2015-08-17 11:13:01 -07:00
parent 134791c140
commit 68640611f4
5 changed files with 11 additions and 9 deletions

View File

@ -8,8 +8,8 @@ CONFIG_TOYBOX_FIFREEZE=y
CONFIG_TOYBOX_FORK=y
CONFIG_TOYBOX_ICONV=y
CONFIG_TOYBOX_ON_ANDROID=y
CONFIG_TOYBOX_SHADOW=y
CONFIG_TOYBOX_UTMPX=y
# CONFIG_TOYBOX_SHADOW is not set
# CONFIG_TOYBOX_UTMPX is not set
#
# Posix commands
@ -255,7 +255,7 @@ CONFIG_TAC=y
CONFIG_TASKSET=y
CONFIG_TIMEOUT=y
CONFIG_TRUNCATE=y
# CONFIG_UPTIME is not set
CONFIG_UPTIME=y
CONFIG_USLEEP=y
CONFIG_VCONFIG=y
CONFIG_VMSTAT=y

View File

@ -125,6 +125,7 @@ LOCAL_SRC_FILES := \
toys/other/taskset.c \
toys/other/timeout.c \
toys/other/truncate.c \
toys/other/uptime.c \
toys/other/usleep.c \
toys/other/vconfig.c \
toys/other/vmstat.c \
@ -343,6 +344,7 @@ ALL_TOOLS := \
uname \
uniq \
unix2dos \
uptime \
usleep \
vmstat \
wc \

View File

@ -10,10 +10,10 @@
#define USE_TOYBOX_ICONV(...) __VA_ARGS__
#define CFG_TOYBOX_ON_ANDROID 1
#define USE_TOYBOX_ON_ANDROID(...) __VA_ARGS__
#define CFG_TOYBOX_SHADOW 1
#define USE_TOYBOX_SHADOW(...) __VA_ARGS__
#define CFG_TOYBOX_UTMPX 1
#define USE_TOYBOX_UTMPX(...) __VA_ARGS__
#define CFG_TOYBOX_SHADOW 0
#define USE_TOYBOX_SHADOW(...)
#define CFG_TOYBOX_UTMPX 0
#define USE_TOYBOX_UTMPX(...)
#define CFG_BASENAME 1
#define USE_BASENAME(...) __VA_ARGS__
#define CFG_CAL 1
@ -480,8 +480,8 @@
#define USE_TIMEOUT(...) __VA_ARGS__
#define CFG_TRUNCATE 1
#define USE_TRUNCATE(...) __VA_ARGS__
#define CFG_UPTIME 0
#define USE_UPTIME(...)
#define CFG_UPTIME 1
#define USE_UPTIME(...) __VA_ARGS__
#define CFG_USLEEP 1
#define USE_USLEEP(...) __VA_ARGS__
#define CFG_VCONFIG 1

View File

View File