commit 8d292d6

busybox fixes, build-userland fixes

 1@@ -1,8 +1,9 @@
 2-#!/bin/sh
 3+#!/bin/sh -e
 4+. ./util/lib.sh
 5 
 6 printf "\nyou can skip this build process by removing this from create-mwakat; this is just for getting a slightly smaller userland.\n"
 7 
 8-set -xe
 9+set -x
10 pwd=`pwd`
11 
12 rm -rf build/*
13@@ -24,7 +25,7 @@ sed -i 's#scripts/install.sh#scripts/install.sh --static#g' Makefile
14 sed -i 's/\$HOSTCC/$HOSTCC -static -Oz -Wl,-s -Wl,--as-needed -Wl,-Os/g' scripts/make.sh
15 
16 make CFLAGS='-static -Oz -Wl,-s -Wl,--as-needed -Wl,-Os' LDFLAGS='-static -Oz -Wl,-s -Wl,--as-needed -Wl,-Os' PREFIX="$PKG"
17-cp -f ./build/build/toybox $m/bin/toybox
18+cp -f ./toybox $m/bin/toybox
19 
20 ### busybox
21 

  1@@ -51,8 +51,8 @@ CONFIG_PIE=n
  2 # CONFIG_FEATURE_SHARED_BUSYBOX is not set
  3 CONFIG_CROSS_COMPILER_PREFIX=""
  4 CONFIG_SYSROOT=""
  5-CONFIG_EXTRA_CFLAGS="-Oz"
  6-CONFIG_EXTRA_LDFLAGS="-Wl,-s -Wl,--as-needed -Wl,-Os"
  7+CONFIG_EXTRA_CFLAGS="-Oz -static"
  8+CONFIG_EXTRA_LDFLAGS="-Wl,-s -Wl,--as-needed -Wl,-Os -static -Wl,-static"
  9 CONFIG_EXTRA_LDLIBS=""
 10 CONFIG_USE_PORTABLE_CODE=y
 11 CONFIG_STACK_OPTIMIZATION_386=y
 12@@ -372,12 +372,12 @@ CONFIG_YES=y
 13 # Console Utilities
 14 #
 15 CONFIG_CHVT=y
 16-CONFIG_CLEAR=y
 17+CONFIG_CLEAR=n
 18 CONFIG_DEALLOCVT=y
 19 CONFIG_DUMPKMAP=y
 20 # CONFIG_FGCONSOLE is not set
 21 CONFIG_KBD_MODE=y
 22-CONFIG_LOADFONT=y
 23+CONFIG_LOADFONT=n
 24 CONFIG_SETFONT=y
 25 CONFIG_FEATURE_SETFONT_TEXTUAL_MAP=y
 26 CONFIG_DEFAULT_SETFONT_DIR="/usr/share"
 27@@ -388,7 +388,7 @@ CONFIG_DEFAULT_SETFONT_DIR="/usr/share"
 28 CONFIG_FEATURE_LOADFONT_PSF2=y
 29 CONFIG_FEATURE_LOADFONT_RAW=y
 30 CONFIG_LOADKMAP=y
 31-CONFIG_OPENVT=y
 32+CONFIG_OPENVT=n
 33 CONFIG_RESET=y
 34 CONFIG_RESIZE=y
 35 CONFIG_FEATURE_RESIZE_PRINT=y
 36@@ -402,9 +402,9 @@ CONFIG_SHOWKEY=y
 37 # Debian Utilities
 38 #
 39 CONFIG_PIPE_PROGRESS=y
 40-CONFIG_RUN_PARTS=y
 41-CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
 42-CONFIG_FEATURE_RUN_PARTS_FANCY=y
 43+CONFIG_RUN_PARTS=n
 44+CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=n
 45+CONFIG_FEATURE_RUN_PARTS_FANCY=n
 46 # CONFIG_START_STOP_DAEMON is not set
 47 # CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set
 48 # CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set
 49@@ -507,20 +507,20 @@ CONFIG_FEATURE_XARGS_SUPPORT_ARGS_FILE=y
 50 # CONFIG_BOOTCHARTD is not set
 51 # CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set
 52 # CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set
 53-CONFIG_HALT=y
 54-CONFIG_POWEROFF=y
 55-CONFIG_REBOOT=y
 56-CONFIG_FEATURE_WAIT_FOR_INIT=y
 57+CONFIG_HALT=n
 58+CONFIG_POWEROFF=n
 59+CONFIG_REBOOT=n
 60+CONFIG_FEATURE_WAIT_FOR_INIT=n
 61 # CONFIG_FEATURE_CALL_TELINIT is not set
 62 CONFIG_TELINIT_PATH=""
 63-CONFIG_INIT=y
 64+CONFIG_INIT=n
 65 # CONFIG_LINUXRC is not set
 66-CONFIG_FEATURE_USE_INITTAB=y
 67-CONFIG_FEATURE_KILL_REMOVED=y
 68+CONFIG_FEATURE_USE_INITTAB=n
 69+CONFIG_FEATURE_KILL_REMOVED=n
 70 CONFIG_FEATURE_KILL_DELAY=0
 71-CONFIG_FEATURE_INIT_SCTTY=y
 72-CONFIG_FEATURE_INIT_SYSLOG=y
 73-CONFIG_FEATURE_INIT_QUIET=y
 74+CONFIG_FEATURE_INIT_SCTTY=n
 75+CONFIG_FEATURE_INIT_SYSLOG=n
 76+CONFIG_FEATURE_INIT_QUIET=n
 77 # CONFIG_FEATURE_INIT_COREDUMPS is not set
 78 CONFIG_INIT_TERMINAL_TYPE="linux"
 79 # CONFIG_FEATURE_INIT_MODIFY_CMDLINE is not set
 80@@ -536,8 +536,8 @@ CONFIG_FEATURE_SHADOWPASSWDS=y
 81 # CONFIG_USE_BB_CRYPT_YES is not set
 82 CONFIG_ADD_SHELL=y
 83 CONFIG_REMOVE_SHELL=y
 84-CONFIG_ADDGROUP=y
 85-CONFIG_FEATURE_ADDUSER_TO_GROUP=y
 86+CONFIG_ADDGROUP=n
 87+CONFIG_FEATURE_ADDUSER_TO_GROUP=n
 88 CONFIG_ADDUSER=y
 89 CONFIG_FEATURE_CHECK_NAMES=y
 90 CONFIG_LAST_ID=2147483647
 91@@ -545,8 +545,8 @@ CONFIG_FIRST_SYSTEM_ID=100
 92 CONFIG_LAST_SYSTEM_ID=999
 93 CONFIG_CHPASSWD=y
 94 CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="sha512"
 95-CONFIG_CRYPTPW=y
 96-CONFIG_MKPASSWD=y
 97+CONFIG_CRYPTPW=n
 98+CONFIG_MKPASSWD=n
 99 CONFIG_DELUSER=y
100 CONFIG_DELGROUP=y
101 CONFIG_FEATURE_DEL_USER_FROM_GROUP=y