diff options
| author | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-03-03 17:39:29 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-03-03 17:39:29 +0000 |
| commit | 6314103003cef434c29d2133769195daf5cc9309 (patch) | |
| tree | 9c450c156ce82a0a424d5654790def0e895a4707 /meta/packages | |
| parent | 9f9900b9b4ef2d2e855293f7850f81fa0f33a616 (diff) | |
| download | poky-6314103003cef434c29d2133769195daf5cc9309.tar.gz | |
busybox: drop 1.01, make 1.8.2 default
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3888 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages')
30 files changed, 0 insertions, 5180 deletions
diff --git a/meta/packages/busybox/busybox-1.01/add-getkey-applet.patch b/meta/packages/busybox/busybox-1.01/add-getkey-applet.patch deleted file mode 100644 index 6ce0df21bd..0000000000 --- a/meta/packages/busybox/busybox-1.01/add-getkey-applet.patch +++ /dev/null | |||
| @@ -1,157 +0,0 @@ | |||
| 1 | |||
| 2 | # | ||
| 3 | # Patch managed by http://www.holgerschurig.de/patcher.html | ||
| 4 | # | ||
| 5 | |||
| 6 | --- /dev/null | ||
| 7 | +++ busybox-1.00/console-tools/getkey.c | ||
| 8 | @@ -0,0 +1,94 @@ | ||
| 9 | +/* vi: set sw=4 ts=4: */ | ||
| 10 | +/* | ||
| 11 | + * getkey.c - Michael 'Mickey' Lauer | ||
| 12 | + * | ||
| 13 | + * Version 0.1 | ||
| 14 | + * | ||
| 15 | + * A simple keygrapper. Displays a configurable message and waits a dedicated number | ||
| 16 | + * of seconds for a keypress. Sets the exit code accordingly (SUCCESS on keypress). | ||
| 17 | + */ | ||
| 18 | +#include <stdio.h> | ||
| 19 | +#include <fcntl.h> | ||
| 20 | +#include <memory.h> | ||
| 21 | +#include <stdlib.h> | ||
| 22 | +#include <unistd.h> | ||
| 23 | +#include <sys/types.h> | ||
| 24 | +#include <errno.h> | ||
| 25 | +#include <sys/ioctl.h> | ||
| 26 | +#include <sys/kd.h> | ||
| 27 | +#include "busybox.h" | ||
| 28 | + | ||
| 29 | +extern int getkey_main(int argc, char **argv) | ||
| 30 | +{ | ||
| 31 | + int status = EXIT_FAILURE; | ||
| 32 | + | ||
| 33 | + if ( argc < 2 ) | ||
| 34 | + { | ||
| 35 | + bb_show_usage(); | ||
| 36 | + } | ||
| 37 | + | ||
| 38 | + /* | ||
| 39 | + * If no terminal is attached it is quite useless | ||
| 40 | + * to treat it like one. | ||
| 41 | + */ | ||
| 42 | + if( !isatty(STDIN_FILENO) ) | ||
| 43 | + { | ||
| 44 | + goto error_hard; | ||
| 45 | + } | ||
| 46 | + | ||
| 47 | + //bb_printf( "DEBUG: time = '%s'\n", argv[1] ); | ||
| 48 | + //bb_printf( "DEBUG: mesg = '%s'\n", argv[2] ); | ||
| 49 | + | ||
| 50 | + struct termios orig; | ||
| 51 | + struct termios attr; | ||
| 52 | + | ||
| 53 | + if ( tcgetattr(STDIN_FILENO, &orig) == -1 ) | ||
| 54 | + { | ||
| 55 | + goto error_hard; | ||
| 56 | + } | ||
| 57 | + | ||
| 58 | + attr = orig; | ||
| 59 | + attr.c_cc[VMIN] = 0; | ||
| 60 | + attr.c_cc[VTIME] = 0; | ||
| 61 | + attr.c_iflag |= INLCR; | ||
| 62 | + attr.c_oflag |= OPOST|ONLCR; | ||
| 63 | + attr.c_cflag &= ~PARENB; | ||
| 64 | + attr.c_lflag &= ~(ICANON/*|ECHO*/); | ||
| 65 | + if ( tcsetattr(STDIN_FILENO,TCSANOW,&attr) == -1 ) | ||
| 66 | + { | ||
| 67 | + goto error_hard; | ||
| 68 | + } | ||
| 69 | + | ||
| 70 | + fd_set rfds; | ||
| 71 | + struct timeval tv; | ||
| 72 | + int retval; | ||
| 73 | + | ||
| 74 | + FD_ZERO(&rfds); | ||
| 75 | + FD_SET(0, &rfds); | ||
| 76 | + | ||
| 77 | + tv.tv_sec = atoi( argv[1] ); | ||
| 78 | + tv.tv_usec = 0; | ||
| 79 | + | ||
| 80 | + if ( argc == 3 ) | ||
| 81 | + { | ||
| 82 | + bb_printf( argv[2], tv.tv_sec ); | ||
| 83 | + bb_printf( "\n" ); | ||
| 84 | + fflush(stdout); | ||
| 85 | + } | ||
| 86 | + retval = select(1, &rfds, NULL, NULL, &tv); | ||
| 87 | + if (retval > 0) | ||
| 88 | + { | ||
| 89 | + status = EXIT_SUCCESS; | ||
| 90 | + } | ||
| 91 | + | ||
| 92 | + if (tcsetattr(STDIN_FILENO,TCSANOW,&orig) == -1 ) | ||
| 93 | + { | ||
| 94 | + goto error_hard; | ||
| 95 | + } | ||
| 96 | + | ||
| 97 | + return status; | ||
| 98 | + | ||
| 99 | +error_hard : | ||
| 100 | + return EXIT_FAILURE; | ||
| 101 | +}; | ||
| 102 | + | ||
| 103 | --- busybox-1.00/console-tools/Makefile.in~add-getkey-applet.patch | ||
| 104 | +++ busybox-1.00/console-tools/Makefile.in | ||
| 105 | @@ -28,6 +28,7 @@ | ||
| 106 | CONSOLETOOLS_DIR-$(CONFIG_CLEAR) += clear.o | ||
| 107 | CONSOLETOOLS_DIR-$(CONFIG_DEALLOCVT) += deallocvt.o | ||
| 108 | CONSOLETOOLS_DIR-$(CONFIG_DUMPKMAP) += dumpkmap.o | ||
| 109 | +CONSOLETOOLS_DIR-$(CONFIG_GETKEY) += getkey.o | ||
| 110 | CONSOLETOOLS_DIR-$(CONFIG_LOADFONT) += loadfont.o | ||
| 111 | CONSOLETOOLS_DIR-$(CONFIG_LOADKMAP) += loadkmap.o | ||
| 112 | CONSOLETOOLS_DIR-$(CONFIG_OPENVT) += openvt.o | ||
| 113 | --- busybox-1.00/console-tools/Config.in~add-getkey-applet.patch | ||
| 114 | +++ busybox-1.00/console-tools/Config.in | ||
| 115 | @@ -31,6 +31,14 @@ | ||
| 116 | This program dumps the kernel's keyboard translation table to | ||
| 117 | stdout, in binary format. You can then use loadkmap to load it. | ||
| 118 | |||
| 119 | +config CONFIG_GETKEY | ||
| 120 | + bool "getkey" | ||
| 121 | + default n | ||
| 122 | + help | ||
| 123 | + This program displays a configurable message and waits | ||
| 124 | + a dedicated number of seconds for a keypress. It sets | ||
| 125 | + the exit code accordingly, i.e. SUCCESS if there was a keypress. | ||
| 126 | + | ||
| 127 | config CONFIG_LOADFONT | ||
| 128 | bool "loadfont" | ||
| 129 | default n | ||
| 130 | --- busybox-1.00/include/applets.h~add-getkey-applet.patch | ||
| 131 | +++ busybox-1.00/include/applets.h | ||
| 132 | @@ -223,6 +223,9 @@ | ||
| 133 | #ifdef CONFIG_FTPPUT | ||
| 134 | APPLET(ftpput, ftpgetput_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) | ||
| 135 | #endif | ||
| 136 | +#ifdef CONFIG_GETKEY | ||
| 137 | + APPLET(getkey, getkey_main, _BB_DIR_SBIN, _BB_SUID_NEVER) | ||
| 138 | +#endif | ||
| 139 | #ifdef CONFIG_GETOPT | ||
| 140 | APPLET(getopt, getopt_main, _BB_DIR_BIN, _BB_SUID_NEVER) | ||
| 141 | #endif | ||
| 142 | --- busybox-1.00/include/usage.h~add-getkey-applet.patch | ||
| 143 | +++ busybox-1.00/include/usage.h | ||
| 144 | @@ -734,6 +734,13 @@ | ||
| 145 | "\t-p, --password Password to be used\n" \ | ||
| 146 | "\t-P, --port Port number to be used" | ||
| 147 | |||
| 148 | +#define getkey_trivial_usage \ | ||
| 149 | + "time [message]" | ||
| 150 | +#define getkey_full_usage \ | ||
| 151 | + "Display a message and wait for a keypress." | ||
| 152 | +#define getkey_example_usage \ | ||
| 153 | + "$ getkey 5 'Press a key within %d seconds to interrupt autoboot.'" | ||
| 154 | + | ||
| 155 | #define getopt_trivial_usage \ | ||
| 156 | "[OPTIONS]..." | ||
| 157 | #define getopt_full_usage \ | ||
diff --git a/meta/packages/busybox/busybox-1.01/angstrom/defconfig b/meta/packages/busybox/busybox-1.01/angstrom/defconfig deleted file mode 100644 index 34a5804a4d..0000000000 --- a/meta/packages/busybox/busybox-1.01/angstrom/defconfig +++ /dev/null | |||
| @@ -1,475 +0,0 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # | ||
| 4 | HAVE_DOT_CONFIG=y | ||
| 5 | |||
| 6 | # | ||
| 7 | # General Configuration | ||
| 8 | # | ||
| 9 | # CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set | ||
| 10 | CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y | ||
| 11 | # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set | ||
| 12 | # CONFIG_FEATURE_VERBOSE_USAGE is not set | ||
| 13 | # CONFIG_FEATURE_INSTALLER is not set | ||
| 14 | # CONFIG_LOCALE_SUPPORT is not set | ||
| 15 | # CONFIG_FEATURE_DEVFS is not set | ||
| 16 | CONFIG_FEATURE_DEVPTS=y | ||
| 17 | # CONFIG_FEATURE_CLEAN_UP is not set | ||
| 18 | # CONFIG_FEATURE_SUID is not set | ||
| 19 | # CONFIG_SELINUX is not set | ||
| 20 | |||
| 21 | # | ||
| 22 | # Build Options | ||
| 23 | # | ||
| 24 | # CONFIG_STATIC is not set | ||
| 25 | CONFIG_LFS=y | ||
| 26 | # USING_CROSS_COMPILER is not set | ||
| 27 | EXTRA_CFLAGS_OPTIONS="" | ||
| 28 | |||
| 29 | # | ||
| 30 | # Installation Options | ||
| 31 | # | ||
| 32 | # CONFIG_INSTALL_NO_USR is not set | ||
| 33 | PREFIX="./_install" | ||
| 34 | |||
| 35 | # | ||
| 36 | # Archival Utilities | ||
| 37 | # | ||
| 38 | CONFIG_AR=y | ||
| 39 | # CONFIG_FEATURE_AR_LONG_FILENAMES is not set | ||
| 40 | CONFIG_BUNZIP2=y | ||
| 41 | CONFIG_CPIO=y | ||
| 42 | # CONFIG_DPKG is not set | ||
| 43 | # CONFIG_DPKG_DEB is not set | ||
| 44 | CONFIG_GUNZIP=y | ||
| 45 | # CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set | ||
| 46 | CONFIG_GZIP=y | ||
| 47 | # CONFIG_RPM2CPIO is not set | ||
| 48 | # CONFIG_RPM is not set | ||
| 49 | CONFIG_TAR=y | ||
| 50 | CONFIG_FEATURE_TAR_CREATE=y | ||
| 51 | CONFIG_FEATURE_TAR_BZIP2=y | ||
| 52 | CONFIG_FEATURE_TAR_FROM=y | ||
| 53 | CONFIG_FEATURE_TAR_GZIP=y | ||
| 54 | # CONFIG_FEATURE_TAR_COMPRESS is not set | ||
| 55 | CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY=y | ||
| 56 | CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y | ||
| 57 | # CONFIG_FEATURE_TAR_LONG_OPTIONS is not set | ||
| 58 | # CONFIG_UNCOMPRESS is not set | ||
| 59 | # CONFIG_UNZIP is not set | ||
| 60 | |||
| 61 | # | ||
| 62 | # Common options for cpio and tar | ||
| 63 | # | ||
| 64 | # CONFIG_FEATURE_UNARCHIVE_TAPE is not set | ||
| 65 | |||
| 66 | # | ||
| 67 | # Coreutils | ||
| 68 | # | ||
| 69 | CONFIG_BASENAME=y | ||
| 70 | # CONFIG_CAL is not set | ||
| 71 | CONFIG_CAT=y | ||
| 72 | CONFIG_CHGRP=y | ||
| 73 | CONFIG_CHMOD=y | ||
| 74 | CONFIG_CHOWN=y | ||
| 75 | CONFIG_CHROOT=y | ||
| 76 | # CONFIG_CMP is not set | ||
| 77 | CONFIG_CP=y | ||
| 78 | CONFIG_CUT=y | ||
| 79 | CONFIG_DATE=y | ||
| 80 | |||
| 81 | # | ||
| 82 | # date (forced enabled for use with watch) | ||
| 83 | # | ||
| 84 | # CONFIG_FEATURE_DATE_ISOFMT is not set | ||
| 85 | CONFIG_DD=y | ||
| 86 | CONFIG_DF=y | ||
| 87 | CONFIG_DIRNAME=y | ||
| 88 | # CONFIG_DOS2UNIX is not set | ||
| 89 | CONFIG_DU=y | ||
| 90 | CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y | ||
| 91 | CONFIG_ECHO=y | ||
| 92 | CONFIG_FEATURE_FANCY_ECHO=y | ||
| 93 | CONFIG_ENV=y | ||
| 94 | CONFIG_EXPR=y | ||
| 95 | CONFIG_FALSE=y | ||
| 96 | # CONFIG_FOLD is not set | ||
| 97 | CONFIG_HEAD=y | ||
| 98 | # CONFIG_FEATURE_FANCY_HEAD is not set | ||
| 99 | # CONFIG_HOSTID is not set | ||
| 100 | CONFIG_ID=y | ||
| 101 | # CONFIG_INSTALL is not set | ||
| 102 | # CONFIG_LENGTH is not set | ||
| 103 | CONFIG_LN=y | ||
| 104 | CONFIG_LOGNAME=y | ||
| 105 | CONFIG_LS=y | ||
| 106 | CONFIG_FEATURE_LS_FILETYPES=y | ||
| 107 | CONFIG_FEATURE_LS_FOLLOWLINKS=y | ||
| 108 | # CONFIG_FEATURE_LS_RECURSIVE is not set | ||
| 109 | CONFIG_FEATURE_LS_SORTFILES=y | ||
| 110 | CONFIG_FEATURE_LS_TIMESTAMPS=y | ||
| 111 | CONFIG_FEATURE_LS_USERNAME=y | ||
| 112 | CONFIG_FEATURE_LS_COLOR=y | ||
| 113 | CONFIG_MD5SUM=y | ||
| 114 | CONFIG_MKDIR=y | ||
| 115 | CONFIG_MKFIFO=y | ||
| 116 | CONFIG_MKNOD=y | ||
| 117 | CONFIG_MV=y | ||
| 118 | CONFIG_OD=y | ||
| 119 | CONFIG_PRINTF=y | ||
| 120 | CONFIG_PWD=y | ||
| 121 | # CONFIG_REALPATH is not set | ||
| 122 | CONFIG_RM=y | ||
| 123 | CONFIG_RMDIR=y | ||
| 124 | CONFIG_SEQ=y | ||
| 125 | # CONFIG_SHA1SUM is not set | ||
| 126 | CONFIG_SLEEP=y | ||
| 127 | # CONFIG_FEATURE_FANCY_SLEEP is not set | ||
| 128 | CONFIG_SORT=y | ||
| 129 | CONFIG_STTY=y | ||
| 130 | CONFIG_SYNC=y | ||
| 131 | CONFIG_TAIL=y | ||
| 132 | CONFIG_FEATURE_FANCY_TAIL=y | ||
| 133 | CONFIG_TEE=y | ||
| 134 | # CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set | ||
| 135 | CONFIG_TEST=y | ||
| 136 | |||
| 137 | # | ||
| 138 | # test (forced enabled for use with shell) | ||
| 139 | # | ||
| 140 | # CONFIG_FEATURE_TEST_64 is not set | ||
| 141 | CONFIG_TOUCH=y | ||
| 142 | CONFIG_TR=y | ||
| 143 | CONFIG_TRUE=y | ||
| 144 | CONFIG_TTY=y | ||
| 145 | CONFIG_UNAME=y | ||
| 146 | CONFIG_UNIQ=y | ||
| 147 | # CONFIG_USLEEP is not set | ||
| 148 | # CONFIG_UUDECODE is not set | ||
| 149 | # CONFIG_UUENCODE is not set | ||
| 150 | CONFIG_WATCH=y | ||
| 151 | CONFIG_WC=y | ||
| 152 | CONFIG_WHO=y | ||
| 153 | CONFIG_WHOAMI=y | ||
| 154 | CONFIG_YES=y | ||
| 155 | |||
| 156 | # | ||
| 157 | # Common options for cp and mv | ||
| 158 | # | ||
| 159 | # CONFIG_FEATURE_PRESERVE_HARDLINKS is not set | ||
| 160 | |||
| 161 | # | ||
| 162 | # Common options for ls and more | ||
| 163 | # | ||
| 164 | CONFIG_FEATURE_AUTOWIDTH=y | ||
| 165 | |||
| 166 | # | ||
| 167 | # Common options for df, du, ls | ||
| 168 | # | ||
| 169 | CONFIG_FEATURE_HUMAN_READABLE=y | ||
| 170 | |||
| 171 | # | ||
| 172 | # Common options for md5sum, sha1sum | ||
| 173 | # | ||
| 174 | # CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set | ||
| 175 | |||
| 176 | # | ||
| 177 | # Console Utilities | ||
| 178 | # | ||
| 179 | CONFIG_CHVT=y | ||
| 180 | CONFIG_CLEAR=y | ||
| 181 | CONFIG_DEALLOCVT=y | ||
| 182 | # CONFIG_DUMPKMAP is not set | ||
| 183 | CONFIG_GETKEY=y | ||
| 184 | # CONFIG_LOADFONT is not set | ||
| 185 | # CONFIG_LOADKMAP is not set | ||
| 186 | CONFIG_OPENVT=y | ||
| 187 | CONFIG_RESET=y | ||
| 188 | # CONFIG_SETKEYCODES is not set | ||
| 189 | |||
| 190 | # | ||
| 191 | # Debian Utilities | ||
| 192 | # | ||
| 193 | CONFIG_MKTEMP=y | ||
| 194 | # CONFIG_PIPE_PROGRESS is not set | ||
| 195 | CONFIG_READLINK=y | ||
| 196 | CONFIG_FEATURE_READLINK_FOLLOW=y | ||
| 197 | CONFIG_RUN_PARTS=y | ||
| 198 | CONFIG_START_STOP_DAEMON=y | ||
| 199 | CONFIG_WHICH=y | ||
| 200 | |||
| 201 | # | ||
| 202 | # Editors | ||
| 203 | # | ||
| 204 | CONFIG_AWK=y | ||
| 205 | CONFIG_FEATURE_AWK_MATH=y | ||
| 206 | # CONFIG_PATCH is not set | ||
| 207 | CONFIG_SED=y | ||
| 208 | CONFIG_VI=y | ||
| 209 | CONFIG_FEATURE_VI_COLON=y | ||
| 210 | CONFIG_FEATURE_VI_YANKMARK=y | ||
| 211 | CONFIG_FEATURE_VI_SEARCH=y | ||
| 212 | CONFIG_FEATURE_VI_USE_SIGNALS=y | ||
| 213 | # CONFIG_FEATURE_VI_DOT_CMD is not set | ||
| 214 | # CONFIG_FEATURE_VI_READONLY is not set | ||
| 215 | # CONFIG_FEATURE_VI_SETOPTS is not set | ||
| 216 | # CONFIG_FEATURE_VI_SET is not set | ||
| 217 | CONFIG_FEATURE_VI_WIN_RESIZE=y | ||
| 218 | CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y | ||
| 219 | |||
| 220 | # | ||
| 221 | # Finding Utilities | ||
| 222 | # | ||
| 223 | CONFIG_FIND=y | ||
| 224 | CONFIG_FEATURE_FIND_MTIME=y | ||
| 225 | CONFIG_FEATURE_FIND_PERM=y | ||
| 226 | CONFIG_FEATURE_FIND_TYPE=y | ||
| 227 | CONFIG_FEATURE_FIND_XDEV=y | ||
| 228 | CONFIG_FEATURE_FIND_NEWER=y | ||
| 229 | # CONFIG_FEATURE_FIND_INUM is not set | ||
| 230 | CONFIG_GREP=y | ||
| 231 | CONFIG_FEATURE_GREP_EGREP_ALIAS=y | ||
| 232 | CONFIG_FEATURE_GREP_FGREP_ALIAS=y | ||
| 233 | CONFIG_FEATURE_GREP_CONTEXT=y | ||
| 234 | CONFIG_XARGS=y | ||
| 235 | # CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set | ||
| 236 | # CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set | ||
| 237 | # CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set | ||
| 238 | # CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set | ||
| 239 | |||
| 240 | # | ||
| 241 | # Init Utilities | ||
| 242 | # | ||
| 243 | # CONFIG_INIT is not set | ||
| 244 | # CONFIG_HALT is not set | ||
| 245 | # CONFIG_POWEROFF is not set | ||
| 246 | # CONFIG_REBOOT is not set | ||
| 247 | # CONFIG_MESG is not set | ||
| 248 | |||
| 249 | # | ||
| 250 | # Login/Password Management Utilities | ||
| 251 | # | ||
| 252 | # CONFIG_USE_BB_PWD_GRP is not set | ||
| 253 | # CONFIG_ADDGROUP is not set | ||
| 254 | # CONFIG_DELGROUP is not set | ||
| 255 | # CONFIG_ADDUSER is not set | ||
| 256 | # CONFIG_DELUSER is not set | ||
| 257 | # CONFIG_GETTY is not set | ||
| 258 | CONFIG_FEATURE_U_W_TMP=y | ||
| 259 | # CONFIG_LOGIN is not set | ||
| 260 | # CONFIG_PASSWD is not set | ||
| 261 | # CONFIG_SU is not set | ||
| 262 | # CONFIG_SULOGIN is not set | ||
| 263 | # CONFIG_VLOCK is not set | ||
| 264 | |||
| 265 | # | ||
| 266 | # Miscellaneous Utilities | ||
| 267 | # | ||
| 268 | # CONFIG_ADJTIMEX is not set | ||
| 269 | # CONFIG_CROND is not set | ||
| 270 | # CONFIG_CRONTAB is not set | ||
| 271 | CONFIG_DC=y | ||
| 272 | # CONFIG_DEVFSD is not set | ||
| 273 | # CONFIG_LAST is not set | ||
| 274 | # CONFIG_HDPARM is not set | ||
| 275 | # CONFIG_MAKEDEVS is not set | ||
| 276 | # CONFIG_MT is not set | ||
| 277 | # CONFIG_RX is not set | ||
| 278 | CONFIG_STRINGS=y | ||
| 279 | # CONFIG_TIME is not set | ||
| 280 | # CONFIG_WATCHDOG is not set | ||
| 281 | |||
| 282 | # | ||
| 283 | # Linux Module Utilities | ||
| 284 | # | ||
| 285 | CONFIG_INSMOD=y | ||
| 286 | CONFIG_FEATURE_2_4_MODULES=y | ||
| 287 | CONFIG_FEATURE_2_6_MODULES=y | ||
| 288 | # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set | ||
| 289 | CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y | ||
| 290 | # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set | ||
| 291 | CONFIG_FEATURE_INSMOD_LOAD_MAP=y | ||
| 292 | CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL=y | ||
| 293 | CONFIG_LSMOD=y | ||
| 294 | CONFIG_MODPROBE=y | ||
| 295 | CONFIG_RMMOD=y | ||
| 296 | CONFIG_FEATURE_CHECK_TAINTED_MODULE=y | ||
| 297 | |||
| 298 | # | ||
| 299 | # Networking Utilities | ||
| 300 | # | ||
| 301 | CONFIG_FEATURE_IPV6=y | ||
| 302 | # CONFIG_ARPING is not set | ||
| 303 | # CONFIG_FTPGET is not set | ||
| 304 | # CONFIG_FTPPUT is not set | ||
| 305 | CONFIG_HOSTNAME=y | ||
| 306 | # CONFIG_HTTPD is not set | ||
| 307 | CONFIG_IFCONFIG=y | ||
| 308 | CONFIG_FEATURE_IFCONFIG_STATUS=y | ||
| 309 | # CONFIG_FEATURE_IFCONFIG_SLIP is not set | ||
| 310 | # CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set | ||
| 311 | CONFIG_FEATURE_IFCONFIG_HW=y | ||
| 312 | # CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set | ||
| 313 | CONFIG_IFUPDOWN=y | ||
| 314 | # CONFIG_FEATURE_IFUPDOWN_IP is not set | ||
| 315 | CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y | ||
| 316 | CONFIG_FEATURE_IFUPDOWN_IPV4=y | ||
| 317 | CONFIG_FEATURE_IFUPDOWN_IPV6=y | ||
| 318 | # CONFIG_FEATURE_IFUPDOWN_IPX is not set | ||
| 319 | CONFIG_FEATURE_IFUPDOWN_MAPPING=y | ||
| 320 | # CONFIG_INETD is not set | ||
| 321 | CONFIG_IP=y | ||
| 322 | CONFIG_FEATURE_IP_ADDRESS=y | ||
| 323 | CONFIG_FEATURE_IP_LINK=y | ||
| 324 | CONFIG_FEATURE_IP_ROUTE=y | ||
| 325 | CONFIG_FEATURE_IP_TUNNEL=y | ||
| 326 | # CONFIG_IPCALC is not set | ||
| 327 | # CONFIG_IPADDR is not set | ||
| 328 | # CONFIG_IPLINK is not set | ||
| 329 | # CONFIG_IPROUTE is not set | ||
| 330 | # CONFIG_IPTUNNEL is not set | ||
| 331 | # CONFIG_NAMEIF is not set | ||
| 332 | CONFIG_NC=y | ||
| 333 | CONFIG_NETSTAT=y | ||
| 334 | CONFIG_NSLOOKUP=y | ||
| 335 | CONFIG_PING=y | ||
| 336 | CONFIG_FEATURE_FANCY_PING=y | ||
| 337 | CONFIG_PING6=y | ||
| 338 | CONFIG_FEATURE_FANCY_PING6=y | ||
| 339 | CONFIG_ROUTE=y | ||
| 340 | CONFIG_TELNET=y | ||
| 341 | # CONFIG_FEATURE_TELNET_TTYPE is not set | ||
| 342 | CONFIG_FEATURE_TELNET_AUTOLOGIN=y | ||
| 343 | # CONFIG_TELNETD is not set | ||
| 344 | CONFIG_TFTP=y | ||
| 345 | CONFIG_FEATURE_TFTP_GET=y | ||
| 346 | CONFIG_FEATURE_TFTP_PUT=y | ||
| 347 | # CONFIG_FEATURE_TFTP_BLOCKSIZE is not set | ||
| 348 | # CONFIG_FEATURE_TFTP_DEBUG is not set | ||
| 349 | CONFIG_TRACEROUTE=y | ||
| 350 | # CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set | ||
| 351 | # CONFIG_VCONFIG is not set | ||
| 352 | CONFIG_WGET=y | ||
| 353 | CONFIG_FEATURE_WGET_STATUSBAR=y | ||
| 354 | CONFIG_FEATURE_WGET_AUTHENTICATION=y | ||
| 355 | CONFIG_FEATURE_WGET_IP6_LITERAL=y | ||
| 356 | |||
| 357 | # | ||
| 358 | # udhcp Server/Client | ||
| 359 | # | ||
| 360 | # CONFIG_UDHCPD is not set | ||
| 361 | CONFIG_UDHCPC=y | ||
| 362 | CONFIG_FEATURE_UDHCP_SYSLOG=y | ||
| 363 | # CONFIG_FEATURE_UDHCP_DEBUG is not set | ||
| 364 | |||
| 365 | # | ||
| 366 | # Process Utilities | ||
| 367 | # | ||
| 368 | CONFIG_FREE=y | ||
| 369 | CONFIG_KILL=y | ||
| 370 | CONFIG_KILLALL=y | ||
| 371 | # CONFIG_PIDOF is not set | ||
| 372 | CONFIG_PS=y | ||
| 373 | CONFIG_RENICE=y | ||
| 374 | CONFIG_TOP=y | ||
| 375 | FEATURE_CPU_USAGE_PERCENTAGE=y | ||
| 376 | CONFIG_UPTIME=y | ||
| 377 | # CONFIG_SYSCTL is not set | ||
| 378 | |||
| 379 | # | ||
| 380 | # Another Bourne-like Shell | ||
| 381 | # | ||
| 382 | CONFIG_FEATURE_SH_IS_ASH=y | ||
| 383 | # CONFIG_FEATURE_SH_IS_HUSH is not set | ||
| 384 | # CONFIG_FEATURE_SH_IS_LASH is not set | ||
| 385 | # CONFIG_FEATURE_SH_IS_MSH is not set | ||
| 386 | # CONFIG_FEATURE_SH_IS_NONE is not set | ||
| 387 | CONFIG_ASH=y | ||
| 388 | |||
| 389 | # | ||
| 390 | # Ash Shell Options | ||
| 391 | # | ||
| 392 | CONFIG_ASH_JOB_CONTROL=y | ||
| 393 | CONFIG_ASH_ALIAS=y | ||
| 394 | CONFIG_ASH_MATH_SUPPORT=y | ||
| 395 | # CONFIG_ASH_MATH_SUPPORT_64 is not set | ||
| 396 | CONFIG_ASH_GETOPTS=y | ||
| 397 | # CONFIG_ASH_CMDCMD is not set | ||
| 398 | # CONFIG_ASH_MAIL is not set | ||
| 399 | CONFIG_ASH_OPTIMIZE_FOR_SIZE=y | ||
| 400 | # CONFIG_ASH_RANDOM_SUPPORT is not set | ||
| 401 | # CONFIG_HUSH is not set | ||
| 402 | # CONFIG_LASH is not set | ||
| 403 | # CONFIG_MSH is not set | ||
| 404 | |||
| 405 | # | ||
| 406 | # Bourne Shell Options | ||
| 407 | # | ||
| 408 | CONFIG_FEATURE_SH_EXTRA_QUIET=y | ||
| 409 | # CONFIG_FEATURE_SH_STANDALONE_SHELL is not set | ||
| 410 | CONFIG_FEATURE_COMMAND_EDITING=y | ||
| 411 | CONFIG_FEATURE_COMMAND_HISTORY=63 | ||
| 412 | # CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set | ||
| 413 | CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y | ||
| 414 | # CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set | ||
| 415 | CONFIG_FEATURE_SH_FANCY_PROMPT=y | ||
| 416 | |||
| 417 | # | ||
| 418 | # System Logging Utilities | ||
| 419 | # | ||
| 420 | CONFIG_SYSLOGD=y | ||
| 421 | # CONFIG_FEATURE_ROTATE_LOGFILE is not set | ||
| 422 | CONFIG_FEATURE_REMOTE_LOG=y | ||
| 423 | CONFIG_FEATURE_IPC_SYSLOG=y | ||
| 424 | CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 | ||
| 425 | CONFIG_LOGREAD=y | ||
| 426 | # CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set | ||
| 427 | CONFIG_KLOGD=y | ||
| 428 | CONFIG_LOGGER=y | ||
| 429 | |||
| 430 | # | ||
| 431 | # Linux System Utilities | ||
| 432 | # | ||
| 433 | CONFIG_DMESG=y | ||
| 434 | CONFIG_FBSET=y | ||
| 435 | CONFIG_FEATURE_FBSET_FANCY=y | ||
| 436 | # CONFIG_FEATURE_FBSET_READMODE is not set | ||
| 437 | # CONFIG_FDFLUSH is not set | ||
| 438 | # CONFIG_FDFORMAT is not set | ||
| 439 | CONFIG_FDISK=y | ||
| 440 | FDISK_SUPPORT_LARGE_DISKS=y | ||
| 441 | CONFIG_FEATURE_FDISK_WRITABLE=y | ||
| 442 | # CONFIG_FEATURE_AIX_LABEL is not set | ||
| 443 | # CONFIG_FEATURE_SGI_LABEL is not set | ||
| 444 | # CONFIG_FEATURE_SUN_LABEL is not set | ||
| 445 | # CONFIG_FEATURE_OSF_LABEL is not set | ||
| 446 | # CONFIG_FEATURE_FDISK_ADVANCED is not set | ||
| 447 | # CONFIG_FREERAMDISK is not set | ||
| 448 | # CONFIG_FSCK_MINIX is not set | ||
| 449 | # CONFIG_MKFS_MINIX is not set | ||
| 450 | # CONFIG_GETOPT is not set | ||
| 451 | CONFIG_HEXDUMP=y | ||
| 452 | CONFIG_HWCLOCK=y | ||
| 453 | CONFIG_FEATURE_HWCLOCK_LONGOPTIONS=y | ||
| 454 | CONFIG_LOSETUP=y | ||
| 455 | CONFIG_MKSWAP=y | ||
| 456 | CONFIG_MORE=y | ||
| 457 | CONFIG_FEATURE_USE_TERMIOS=y | ||
| 458 | CONFIG_PIVOT_ROOT=y | ||
| 459 | # CONFIG_RDATE is not set | ||
| 460 | CONFIG_SWAPONOFF=y | ||
| 461 | CONFIG_MOUNT=y | ||
| 462 | CONFIG_NFSMOUNT=y | ||
| 463 | CONFIG_UMOUNT=y | ||
| 464 | CONFIG_FEATURE_MOUNT_FORCE=y | ||
| 465 | |||
| 466 | # | ||
| 467 | # Common options for mount/umount | ||
| 468 | # | ||
| 469 | CONFIG_FEATURE_MOUNT_LOOP=y | ||
| 470 | # CONFIG_FEATURE_MTAB_SUPPORT is not set | ||
| 471 | |||
| 472 | # | ||
| 473 | # Debugging Options | ||
| 474 | # | ||
| 475 | # CONFIG_DEBUG is not set | ||
diff --git a/meta/packages/busybox/busybox-1.01/below.patch b/meta/packages/busybox/busybox-1.01/below.patch deleted file mode 100644 index ec97b29962..0000000000 --- a/meta/packages/busybox/busybox-1.01/below.patch +++ /dev/null | |||
| @@ -1,49 +0,0 @@ | |||
| 1 | Index: modutils/modprobe.c | ||
| 2 | =================================================================== | ||
| 3 | RCS file: /var/cvs/busybox/modutils/modprobe.c,v | ||
| 4 | retrieving revision 1.41 | ||
| 5 | diff -u -r1.41 modprobe.c | ||
| 6 | --- busybox/modutils/modprobe.c 24 Sep 2004 09:18:55 -0000 1.41 | ||
| 7 | +++ busybox/modutils/modprobe.c 29 Dec 2004 11:56:07 -0000 | ||
| 8 | @@ -357,6 +357,41 @@ | ||
| 9 | } | ||
| 10 | } | ||
| 11 | } | ||
| 12 | + else if ((strncmp (buffer, "below", 5) == 0) && isspace (buffer[5])) { | ||
| 13 | + char *mod, *deps; | ||
| 14 | + if (parse_tag_value (buffer + 6, &mod, &deps)) { | ||
| 15 | + struct dep_t *dt; | ||
| 16 | + | ||
| 17 | + for (dt = first; dt; dt = dt->m_next) { | ||
| 18 | + if (strcmp (dt->m_name, mod) == 0) | ||
| 19 | + break; | ||
| 20 | + } | ||
| 21 | + if (dt) { | ||
| 22 | + char *pp; | ||
| 23 | + char *name; | ||
| 24 | + | ||
| 25 | + pp = name = deps; | ||
| 26 | + | ||
| 27 | + for (;;) { | ||
| 28 | + while (*pp != 0 && !isspace (*pp)) | ||
| 29 | + pp++; | ||
| 30 | + if (isspace (*pp)) | ||
| 31 | + *(pp++) = 0; | ||
| 32 | + | ||
| 33 | + dt->m_depcnt++; | ||
| 34 | + dt->m_deparr = (char **) xrealloc (dt->m_deparr, | ||
| 35 | + sizeof (char *) * dt->m_depcnt); | ||
| 36 | + dt->m_deparr[dt->m_depcnt - 1] = bb_xstrdup (name); | ||
| 37 | + | ||
| 38 | + while (isspace (*pp)) | ||
| 39 | + pp++; | ||
| 40 | + name = pp; | ||
| 41 | + if (*pp == 0) | ||
| 42 | + break; | ||
| 43 | + } | ||
| 44 | + } | ||
| 45 | + } | ||
| 46 | + } | ||
| 47 | } | ||
| 48 | } | ||
| 49 | close ( fd ); | ||
diff --git a/meta/packages/busybox/busybox-1.01/defconfig b/meta/packages/busybox/busybox-1.01/defconfig deleted file mode 100644 index a590dde272..0000000000 --- a/meta/packages/busybox/busybox-1.01/defconfig +++ /dev/null | |||
| @@ -1,482 +0,0 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # | ||
| 4 | HAVE_DOT_CONFIG=y | ||
| 5 | |||
| 6 | # | ||
| 7 | # General Configuration | ||
| 8 | # | ||
| 9 | CONFIG_FEATURE_BUFFERS_USE_MALLOC=y | ||
| 10 | # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set | ||
| 11 | # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set | ||
| 12 | # CONFIG_FEATURE_VERBOSE_USAGE is not set | ||
| 13 | # CONFIG_FEATURE_INSTALLER is not set | ||
| 14 | # CONFIG_LOCALE_SUPPORT is not set | ||
| 15 | CONFIG_FEATURE_DEVFS=y | ||
| 16 | CONFIG_FEATURE_DEVPTS=y | ||
| 17 | # CONFIG_FEATURE_CLEAN_UP is not set | ||
| 18 | CONFIG_FEATURE_SUID=y | ||
| 19 | # CONFIG_FEATURE_SUID_CONFIG is not set | ||
| 20 | # CONFIG_SELINUX is not set | ||
| 21 | |||
| 22 | # | ||
| 23 | # Build Options | ||
| 24 | # | ||
| 25 | # CONFIG_STATIC is not set | ||
| 26 | CONFIG_LFS=y | ||
| 27 | # USING_CROSS_COMPILER is not set | ||
| 28 | EXTRA_CFLAGS_OPTIONS="" | ||
| 29 | |||
| 30 | # | ||
| 31 | # Installation Options | ||
| 32 | # | ||
| 33 | # CONFIG_INSTALL_NO_USR is not set | ||
| 34 | PREFIX="./_install" | ||
| 35 | |||
| 36 | # | ||
| 37 | # Archival Utilities | ||
| 38 | # | ||
| 39 | CONFIG_AR=y | ||
| 40 | # CONFIG_FEATURE_AR_LONG_FILENAMES is not set | ||
| 41 | CONFIG_BUNZIP2=y | ||
| 42 | CONFIG_CPIO=y | ||
| 43 | # CONFIG_DPKG is not set | ||
| 44 | # CONFIG_DPKG_DEB is not set | ||
| 45 | CONFIG_GUNZIP=y | ||
| 46 | # CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set | ||
| 47 | CONFIG_GZIP=y | ||
| 48 | # CONFIG_RPM2CPIO is not set | ||
| 49 | # CONFIG_RPM is not set | ||
| 50 | CONFIG_TAR=y | ||
| 51 | CONFIG_FEATURE_TAR_CREATE=y | ||
| 52 | CONFIG_FEATURE_TAR_BZIP2=y | ||
| 53 | CONFIG_FEATURE_TAR_FROM=y | ||
| 54 | CONFIG_FEATURE_TAR_GZIP=y | ||
| 55 | # CONFIG_FEATURE_TAR_COMPRESS is not set | ||
| 56 | CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY=y | ||
| 57 | CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y | ||
| 58 | # CONFIG_FEATURE_TAR_LONG_OPTIONS is not set | ||
| 59 | # CONFIG_UNCOMPRESS is not set | ||
| 60 | CONFIG_UNZIP=y | ||
| 61 | |||
| 62 | # | ||
| 63 | # Common options for cpio and tar | ||
| 64 | # | ||
| 65 | # CONFIG_FEATURE_UNARCHIVE_TAPE is not set | ||
| 66 | |||
| 67 | # | ||
| 68 | # Coreutils | ||
| 69 | # | ||
| 70 | CONFIG_BASENAME=y | ||
| 71 | # CONFIG_CAL is not set | ||
| 72 | CONFIG_CAT=y | ||
| 73 | CONFIG_CHGRP=y | ||
| 74 | CONFIG_CHMOD=y | ||
| 75 | CONFIG_CHOWN=y | ||
| 76 | CONFIG_CHROOT=y | ||
| 77 | # CONFIG_CMP is not set | ||
| 78 | CONFIG_CP=y | ||
| 79 | CONFIG_CUT=y | ||
| 80 | CONFIG_DATE=y | ||
| 81 | |||
| 82 | # | ||
| 83 | # date (forced enabled for use with watch) | ||
| 84 | # | ||
| 85 | # CONFIG_FEATURE_DATE_ISOFMT is not set | ||
| 86 | CONFIG_DD=y | ||
| 87 | CONFIG_DF=y | ||
| 88 | CONFIG_DIRNAME=y | ||
| 89 | # CONFIG_DOS2UNIX is not set | ||
| 90 | CONFIG_DU=y | ||
| 91 | CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y | ||
| 92 | CONFIG_ECHO=y | ||
| 93 | CONFIG_FEATURE_FANCY_ECHO=y | ||
| 94 | CONFIG_ENV=y | ||
| 95 | CONFIG_EXPR=y | ||
| 96 | CONFIG_FALSE=y | ||
| 97 | # CONFIG_FOLD is not set | ||
| 98 | CONFIG_HEAD=y | ||
| 99 | # CONFIG_FEATURE_FANCY_HEAD is not set | ||
| 100 | # CONFIG_HOSTID is not set | ||
| 101 | CONFIG_ID=y | ||
| 102 | # CONFIG_INSTALL is not set | ||
| 103 | # CONFIG_LENGTH is not set | ||
| 104 | CONFIG_LN=y | ||
| 105 | CONFIG_LOGNAME=y | ||
| 106 | CONFIG_LS=y | ||
| 107 | CONFIG_FEATURE_LS_FILETYPES=y | ||
| 108 | CONFIG_FEATURE_LS_FOLLOWLINKS=y | ||
| 109 | # CONFIG_FEATURE_LS_RECURSIVE is not set | ||
| 110 | CONFIG_FEATURE_LS_SORTFILES=y | ||
| 111 | CONFIG_FEATURE_LS_TIMESTAMPS=y | ||
| 112 | CONFIG_FEATURE_LS_USERNAME=y | ||
| 113 | CONFIG_FEATURE_LS_COLOR=y | ||
| 114 | CONFIG_MD5SUM=y | ||
| 115 | CONFIG_MKDIR=y | ||
| 116 | CONFIG_MKFIFO=y | ||
| 117 | CONFIG_MKNOD=y | ||
| 118 | CONFIG_MV=y | ||
| 119 | CONFIG_OD=y | ||
| 120 | CONFIG_PRINTF=y | ||
| 121 | CONFIG_PWD=y | ||
| 122 | # CONFIG_REALPATH is not set | ||
| 123 | CONFIG_RM=y | ||
| 124 | CONFIG_RMDIR=y | ||
| 125 | CONFIG_SEQ=y | ||
| 126 | # CONFIG_SHA1SUM is not set | ||
| 127 | CONFIG_SLEEP=y | ||
| 128 | # CONFIG_FEATURE_FANCY_SLEEP is not set | ||
| 129 | CONFIG_SORT=y | ||
| 130 | CONFIG_STTY=y | ||
| 131 | CONFIG_SYNC=y | ||
| 132 | CONFIG_TAIL=y | ||
| 133 | CONFIG_FEATURE_FANCY_TAIL=y | ||
| 134 | CONFIG_TEE=y | ||
| 135 | # CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set | ||
| 136 | CONFIG_TEST=y | ||
| 137 | |||
| 138 | # | ||
| 139 | # test (forced enabled for use with shell) | ||
| 140 | # | ||
| 141 | # CONFIG_FEATURE_TEST_64 is not set | ||
| 142 | CONFIG_TOUCH=y | ||
| 143 | CONFIG_TR=y | ||
| 144 | CONFIG_TRUE=y | ||
| 145 | CONFIG_TTY=y | ||
| 146 | CONFIG_UNAME=y | ||
| 147 | CONFIG_UNIQ=y | ||
| 148 | # CONFIG_USLEEP is not set | ||
| 149 | # CONFIG_UUDECODE is not set | ||
| 150 | # CONFIG_UUENCODE is not set | ||
| 151 | CONFIG_WATCH=y | ||
| 152 | CONFIG_WC=y | ||
| 153 | CONFIG_WHO=y | ||
| 154 | CONFIG_WHOAMI=y | ||
| 155 | CONFIG_YES=y | ||
| 156 | |||
| 157 | # | ||
| 158 | # Common options for cp and mv | ||
| 159 | # | ||
| 160 | # CONFIG_FEATURE_PRESERVE_HARDLINKS is not set | ||
| 161 | |||
| 162 | # | ||
| 163 | # Common options for ls and more | ||
| 164 | # | ||
| 165 | CONFIG_FEATURE_AUTOWIDTH=y | ||
| 166 | |||
| 167 | # | ||
| 168 | # Common options for df, du, ls | ||
| 169 | # | ||
| 170 | CONFIG_FEATURE_HUMAN_READABLE=y | ||
| 171 | |||
| 172 | # | ||
| 173 | # Common options for md5sum, sha1sum | ||
| 174 | # | ||
| 175 | # CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set | ||
| 176 | |||
| 177 | # | ||
| 178 | # Console Utilities | ||
| 179 | # | ||
| 180 | CONFIG_CHVT=y | ||
| 181 | CONFIG_CLEAR=y | ||
| 182 | CONFIG_DEALLOCVT=y | ||
| 183 | CONFIG_DUMPKMAP=y | ||
| 184 | CONFIG_GETKEY=y | ||
| 185 | CONFIG_LOADFONT=y | ||
| 186 | CONFIG_LOADKMAP=y | ||
| 187 | CONFIG_OPENVT=y | ||
| 188 | CONFIG_RESET=y | ||
| 189 | # CONFIG_SETKEYCODES is not set | ||
| 190 | |||
| 191 | # | ||
| 192 | # Debian Utilities | ||
| 193 | # | ||
| 194 | CONFIG_MKTEMP=y | ||
| 195 | # CONFIG_PIPE_PROGRESS is not set | ||
| 196 | CONFIG_READLINK=y | ||
| 197 | CONFIG_FEATURE_READLINK_FOLLOW=y | ||
| 198 | CONFIG_RUN_PARTS=y | ||
| 199 | CONFIG_START_STOP_DAEMON=y | ||
| 200 | CONFIG_WHICH=y | ||
| 201 | |||
| 202 | # | ||
| 203 | # Editors | ||
| 204 | # | ||
| 205 | CONFIG_AWK=y | ||
| 206 | CONFIG_FEATURE_AWK_MATH=y | ||
| 207 | # CONFIG_PATCH is not set | ||
| 208 | CONFIG_SED=y | ||
| 209 | CONFIG_VI=y | ||
| 210 | CONFIG_FEATURE_VI_COLON=y | ||
| 211 | CONFIG_FEATURE_VI_YANKMARK=y | ||
| 212 | CONFIG_FEATURE_VI_SEARCH=y | ||
| 213 | CONFIG_FEATURE_VI_USE_SIGNALS=y | ||
| 214 | # CONFIG_FEATURE_VI_DOT_CMD is not set | ||
| 215 | # CONFIG_FEATURE_VI_READONLY is not set | ||
| 216 | # CONFIG_FEATURE_VI_SETOPTS is not set | ||
| 217 | # CONFIG_FEATURE_VI_SET is not set | ||
| 218 | CONFIG_FEATURE_VI_WIN_RESIZE=y | ||
| 219 | CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y | ||
| 220 | |||
| 221 | # | ||
| 222 | # Finding Utilities | ||
| 223 | # | ||
| 224 | CONFIG_FIND=y | ||
| 225 | CONFIG_FEATURE_FIND_MTIME=y | ||
| 226 | CONFIG_FEATURE_FIND_PERM=y | ||
| 227 | CONFIG_FEATURE_FIND_TYPE=y | ||
| 228 | CONFIG_FEATURE_FIND_XDEV=y | ||
| 229 | CONFIG_FEATURE_FIND_NEWER=y | ||
| 230 | # CONFIG_FEATURE_FIND_INUM is not set | ||
| 231 | CONFIG_GREP=y | ||
| 232 | CONFIG_FEATURE_GREP_EGREP_ALIAS=y | ||
| 233 | CONFIG_FEATURE_GREP_FGREP_ALIAS=y | ||
| 234 | CONFIG_FEATURE_GREP_CONTEXT=y | ||
| 235 | CONFIG_XARGS=y | ||
| 236 | # CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set | ||
| 237 | # CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set | ||
| 238 | # CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set | ||
| 239 | # CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set | ||
| 240 | |||
| 241 | # | ||
| 242 | # Init Utilities | ||
| 243 | # | ||
| 244 | # CONFIG_INIT is not set | ||
| 245 | # CONFIG_HALT is not set | ||
| 246 | # CONFIG_POWEROFF is not set | ||
| 247 | # CONFIG_REBOOT is not set | ||
| 248 | # CONFIG_MESG is not set | ||
| 249 | |||
| 250 | # | ||
| 251 | # Login/Password Management Utilities | ||
| 252 | # | ||
| 253 | # CONFIG_USE_BB_PWD_GRP is not set | ||
| 254 | # CONFIG_ADDGROUP is not set | ||
| 255 | # CONFIG_DELGROUP is not set | ||
| 256 | # CONFIG_ADDUSER is not set | ||
| 257 | # CONFIG_DELUSER is not set | ||
| 258 | # CONFIG_GETTY is not set | ||
| 259 | CONFIG_FEATURE_UTMP=y | ||
| 260 | # CONFIG_LOGIN is not set | ||
| 261 | # CONFIG_PASSWD is not set | ||
| 262 | # CONFIG_SU is not set | ||
| 263 | # CONFIG_SULOGIN is not set | ||
| 264 | # CONFIG_VLOCK is not set | ||
| 265 | |||
| 266 | # | ||
| 267 | # Miscellaneous Utilities | ||
| 268 | # | ||
| 269 | # CONFIG_ADJTIMEX is not set | ||
| 270 | # CONFIG_CROND is not set | ||
| 271 | # CONFIG_CRONTAB is not set | ||
| 272 | CONFIG_DC=y | ||
| 273 | # CONFIG_DEVFSD is not set | ||
| 274 | # CONFIG_LAST is not set | ||
| 275 | # CONFIG_HDPARM is not set | ||
| 276 | # CONFIG_MAKEDEVS is not set | ||
| 277 | # CONFIG_MT is not set | ||
| 278 | # CONFIG_RX is not set | ||
| 279 | CONFIG_STRINGS=y | ||
| 280 | CONFIG_TIME=y | ||
| 281 | # CONFIG_WATCHDOG is not set | ||
| 282 | |||
| 283 | # | ||
| 284 | # Linux Module Utilities | ||
| 285 | # | ||
| 286 | CONFIG_INSMOD=y | ||
| 287 | CONFIG_FEATURE_2_4_MODULES=y | ||
| 288 | CONFIG_FEATURE_2_6_MODULES=y | ||
| 289 | # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set | ||
| 290 | CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y | ||
| 291 | # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set | ||
| 292 | CONFIG_FEATURE_INSMOD_LOAD_MAP=y | ||
| 293 | CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL=y | ||
| 294 | CONFIG_LSMOD=y | ||
| 295 | CONFIG_MODPROBE=y | ||
| 296 | CONFIG_RMMOD=y | ||
| 297 | CONFIG_FEATURE_CHECK_TAINTED_MODULE=y | ||
| 298 | |||
| 299 | # | ||
| 300 | # Networking Utilities | ||
| 301 | # | ||
| 302 | CONFIG_FEATURE_IPV6=y | ||
| 303 | # CONFIG_ARPING is not set | ||
| 304 | # CONFIG_FTPGET is not set | ||
| 305 | # CONFIG_FTPPUT is not set | ||
| 306 | CONFIG_HOSTNAME=y | ||
| 307 | # CONFIG_HTTPD is not set | ||
| 308 | CONFIG_IFCONFIG=y | ||
| 309 | CONFIG_FEATURE_IFCONFIG_STATUS=y | ||
| 310 | # CONFIG_FEATURE_IFCONFIG_SLIP is not set | ||
| 311 | # CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set | ||
| 312 | CONFIG_FEATURE_IFCONFIG_HW=y | ||
| 313 | # CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set | ||
| 314 | CONFIG_IFUPDOWN=y | ||
| 315 | # CONFIG_FEATURE_IFUPDOWN_IP is not set | ||
| 316 | CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y | ||
| 317 | CONFIG_FEATURE_IFUPDOWN_IPV4=y | ||
| 318 | CONFIG_FEATURE_IFUPDOWN_IPV6=y | ||
| 319 | # CONFIG_FEATURE_IFUPDOWN_IPX is not set | ||
| 320 | CONFIG_FEATURE_IFUPDOWN_MAPPING=y | ||
| 321 | # CONFIG_INETD is not set | ||
| 322 | CONFIG_IP=y | ||
| 323 | CONFIG_FEATURE_IP_ADDRESS=y | ||
| 324 | CONFIG_FEATURE_IP_LINK=y | ||
| 325 | CONFIG_FEATURE_IP_ROUTE=y | ||
| 326 | CONFIG_FEATURE_IP_TUNNEL=y | ||
| 327 | # CONFIG_IPCALC is not set | ||
| 328 | # CONFIG_IPADDR is not set | ||
| 329 | # CONFIG_IPLINK is not set | ||
| 330 | # CONFIG_IPROUTE is not set | ||
| 331 | # CONFIG_IPTUNNEL is not set | ||
| 332 | # CONFIG_NAMEIF is not set | ||
| 333 | CONFIG_NC=y | ||
| 334 | CONFIG_NETSTAT=y | ||
| 335 | CONFIG_NSLOOKUP=y | ||
| 336 | CONFIG_PING=y | ||
| 337 | CONFIG_FEATURE_FANCY_PING=y | ||
| 338 | CONFIG_PING6=y | ||
| 339 | CONFIG_FEATURE_FANCY_PING6=y | ||
| 340 | CONFIG_ROUTE=y | ||
| 341 | CONFIG_TELNET=y | ||
| 342 | # CONFIG_FEATURE_TELNET_TTYPE is not set | ||
| 343 | CONFIG_FEATURE_TELNET_AUTOLOGIN=y | ||
| 344 | # CONFIG_TELNETD is not set | ||
| 345 | CONFIG_TFTP=y | ||
| 346 | CONFIG_FEATURE_TFTP_GET=y | ||
| 347 | CONFIG_FEATURE_TFTP_PUT=y | ||
| 348 | # CONFIG_FEATURE_TFTP_BLOCKSIZE is not set | ||
| 349 | # CONFIG_FEATURE_TFTP_DEBUG is not set | ||
| 350 | CONFIG_TRACEROUTE=y | ||
| 351 | # CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set | ||
| 352 | # CONFIG_VCONFIG is not set | ||
| 353 | CONFIG_WGET=y | ||
| 354 | CONFIG_FEATURE_WGET_STATUSBAR=y | ||
| 355 | CONFIG_FEATURE_WGET_AUTHENTICATION=y | ||
| 356 | CONFIG_FEATURE_WGET_IP6_LITERAL=y | ||
| 357 | |||
| 358 | # | ||
| 359 | # udhcp Server/Client | ||
| 360 | # | ||
| 361 | CONFIG_UDHCPD=y | ||
| 362 | CONFIG_UDHCPC=y | ||
| 363 | # CONFIG_DUMPLEASES is not set | ||
| 364 | CONFIG_FEATURE_UDHCP_SYSLOG=y | ||
| 365 | # CONFIG_FEATURE_UDHCP_DEBUG is not set | ||
| 366 | |||
| 367 | # | ||
| 368 | # Process Utilities | ||
| 369 | # | ||
| 370 | CONFIG_FREE=y | ||
| 371 | CONFIG_KILL=y | ||
| 372 | CONFIG_KILLALL=y | ||
| 373 | # CONFIG_PIDOF is not set | ||
| 374 | CONFIG_PS=y | ||
| 375 | CONFIG_RENICE=y | ||
| 376 | CONFIG_TOP=y | ||
| 377 | FEATURE_CPU_USAGE_PERCENTAGE=y | ||
| 378 | CONFIG_UPTIME=y | ||
| 379 | # CONFIG_SYSCTL is not set | ||
| 380 | |||
| 381 | # | ||
| 382 | # Another Bourne-like Shell | ||
| 383 | # | ||
| 384 | CONFIG_FEATURE_SH_IS_ASH=y | ||
| 385 | # CONFIG_FEATURE_SH_IS_HUSH is not set | ||
| 386 | # CONFIG_FEATURE_SH_IS_LASH is not set | ||
| 387 | # CONFIG_FEATURE_SH_IS_MSH is not set | ||
| 388 | # CONFIG_FEATURE_SH_IS_NONE is not set | ||
| 389 | CONFIG_ASH=y | ||
| 390 | |||
| 391 | # | ||
| 392 | # Ash Shell Options | ||
| 393 | # | ||
| 394 | CONFIG_ASH_JOB_CONTROL=y | ||
| 395 | CONFIG_ASH_ALIAS=y | ||
| 396 | CONFIG_ASH_MATH_SUPPORT=y | ||
| 397 | # CONFIG_ASH_MATH_SUPPORT_64 is not set | ||
| 398 | CONFIG_ASH_GETOPTS=y | ||
| 399 | # CONFIG_ASH_CMDCMD is not set | ||
| 400 | # CONFIG_ASH_MAIL is not set | ||
| 401 | CONFIG_ASH_OPTIMIZE_FOR_SIZE=y | ||
| 402 | # CONFIG_ASH_RANDOM_SUPPORT is not set | ||
| 403 | # CONFIG_HUSH is not set | ||
| 404 | # CONFIG_LASH is not set | ||
| 405 | # CONFIG_MSH is not set | ||
| 406 | |||
| 407 | # | ||
| 408 | # Bourne Shell Options | ||
| 409 | # | ||
| 410 | CONFIG_FEATURE_SH_EXTRA_QUIET=y | ||
| 411 | # CONFIG_FEATURE_SH_STANDALONE_SHELL is not set | ||
| 412 | CONFIG_FEATURE_COMMAND_EDITING=y | ||
| 413 | CONFIG_FEATURE_COMMAND_HISTORY=63 | ||
| 414 | # CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set | ||
| 415 | CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y | ||
| 416 | # CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set | ||
| 417 | CONFIG_FEATURE_SH_FANCY_PROMPT=y | ||
| 418 | |||
| 419 | # | ||
| 420 | # System Logging Utilities | ||
| 421 | # | ||
| 422 | CONFIG_SYSLOGD=y | ||
| 423 | # CONFIG_FEATURE_ROTATE_LOGFILE is not set | ||
| 424 | CONFIG_FEATURE_REMOTE_LOG=y | ||
| 425 | CONFIG_FEATURE_IPC_SYSLOG=y | ||
| 426 | CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 | ||
| 427 | CONFIG_LOGREAD=y | ||
| 428 | # CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set | ||
| 429 | CONFIG_KLOGD=y | ||
| 430 | CONFIG_LOGGER=y | ||
| 431 | |||
| 432 | # | ||
| 433 | # Linux System Utilities | ||
| 434 | # | ||
| 435 | CONFIG_DMESG=y | ||
| 436 | CONFIG_FBSET=y | ||
| 437 | CONFIG_FEATURE_FBSET_FANCY=y | ||
| 438 | # CONFIG_FEATURE_FBSET_READMODE is not set | ||
| 439 | # CONFIG_FDFLUSH is not set | ||
| 440 | # CONFIG_FDFORMAT is not set | ||
| 441 | CONFIG_FDISK=y | ||
| 442 | FDISK_SUPPORT_LARGE_DISKS=y | ||
| 443 | CONFIG_FEATURE_FDISK_WRITABLE=y | ||
| 444 | # CONFIG_FEATURE_AIX_LABEL is not set | ||
| 445 | # CONFIG_FEATURE_SGI_LABEL is not set | ||
| 446 | # CONFIG_FEATURE_SUN_LABEL is not set | ||
| 447 | # CONFIG_FEATURE_OSF_LABEL is not set | ||
| 448 | # CONFIG_FEATURE_FDISK_ADVANCED is not set | ||
| 449 | # CONFIG_FREERAMDISK is not set | ||
| 450 | CONFIG_FSCK_MINIX=y | ||
| 451 | CONFIG_MKFS_MINIX=y | ||
| 452 | |||
| 453 | # | ||
| 454 | # Minix filesystem support | ||
| 455 | # | ||
| 456 | CONFIG_FEATURE_MINIX2=y | ||
| 457 | # CONFIG_GETOPT is not set | ||
| 458 | CONFIG_HEXDUMP=y | ||
| 459 | CONFIG_HWCLOCK=y | ||
| 460 | CONFIG_FEATURE_HWCLOCK_LONGOPTIONS=y | ||
| 461 | CONFIG_LOSETUP=y | ||
| 462 | CONFIG_MKSWAP=y | ||
| 463 | CONFIG_MORE=y | ||
| 464 | CONFIG_FEATURE_USE_TERMIOS=y | ||
| 465 | CONFIG_PIVOT_ROOT=y | ||
| 466 | # CONFIG_RDATE is not set | ||
| 467 | CONFIG_SWAPONOFF=y | ||
| 468 | CONFIG_MOUNT=y | ||
| 469 | CONFIG_NFSMOUNT=y | ||
| 470 | CONFIG_UMOUNT=y | ||
| 471 | CONFIG_FEATURE_MOUNT_FORCE=y | ||
| 472 | |||
| 473 | # | ||
| 474 | # Common options for mount/umount | ||
| 475 | # | ||
| 476 | CONFIG_FEATURE_MOUNT_LOOP=y | ||
| 477 | # CONFIG_FEATURE_MTAB_SUPPORT is not set | ||
| 478 | |||
| 479 | # | ||
| 480 | # Debugging Options | ||
| 481 | # | ||
| 482 | # CONFIG_DEBUG is not set | ||
diff --git a/meta/packages/busybox/busybox-1.01/dhcp-hostname.patch b/meta/packages/busybox/busybox-1.01/dhcp-hostname.patch deleted file mode 100644 index e0adea662e..0000000000 --- a/meta/packages/busybox/busybox-1.01/dhcp-hostname.patch +++ /dev/null | |||
| @@ -1,30 +0,0 @@ | |||
| 1 | |||
| 2 | # | ||
| 3 | # Patch managed by http://www.holgerschurig.de/patcher.html | ||
| 4 | # | ||
| 5 | |||
| 6 | --- busybox-1.01/networking/udhcp/dhcpc.c~dhcp-hostname | ||
| 7 | +++ busybox-1.01/networking/udhcp/dhcpc.c | ||
| 8 | @@ -193,6 +193,7 @@ | ||
| 9 | int max_fd; | ||
| 10 | int sig; | ||
| 11 | int no_clientid = 0; | ||
| 12 | + char hostbuf[256]; /* SUSv2: hostnames are <= 255 bytes */ | ||
| 13 | |||
| 14 | static const struct option arg_options[] = { | ||
| 15 | {"clientid", required_argument, 0, 'c'}, | ||
| 16 | @@ -211,6 +212,14 @@ | ||
| 17 | {0, 0, 0, 0} | ||
| 18 | }; | ||
| 19 | |||
| 20 | + if (gethostname (hostbuf, sizeof (hostbuf)) == 0) { | ||
| 21 | + len = strlen (hostbuf); | ||
| 22 | + client_config.hostname = xmalloc (len + 2); | ||
| 23 | + client_config.hostname[OPT_CODE] = DHCP_HOST_NAME; | ||
| 24 | + client_config.hostname[OPT_LEN] = len; | ||
| 25 | + strncpy(client_config.hostname + 2, hostbuf, len); | ||
| 26 | + } | ||
| 27 | + | ||
| 28 | /* get options */ | ||
| 29 | while (1) { | ||
| 30 | int option_index = 0; | ||
diff --git a/meta/packages/busybox/busybox-1.01/dhcpretrytime.patch b/meta/packages/busybox/busybox-1.01/dhcpretrytime.patch deleted file mode 100644 index e41ea9de55..0000000000 --- a/meta/packages/busybox/busybox-1.01/dhcpretrytime.patch +++ /dev/null | |||
| @@ -1,81 +0,0 @@ | |||
| 1 | |||
| 2 | # | ||
| 3 | # Patch managed by http://www.holgerschurig.de/patcher.html | ||
| 4 | # | ||
| 5 | |||
| 6 | --- busybox-1.01/networking/udhcp/dhcpc.c~dhcpretrytime | ||
| 7 | +++ busybox-1.01/networking/udhcp/dhcpc.c | ||
| 8 | @@ -48,6 +48,7 @@ | ||
| 9 | static unsigned long requested_ip; /* = 0 */ | ||
| 10 | static unsigned long server_addr; | ||
| 11 | static unsigned long timeout; | ||
| 12 | +static unsigned long retrytime = 60; | ||
| 13 | static int packet_num; /* = 0 */ | ||
| 14 | static int fd = -1; | ||
| 15 | |||
| 16 | @@ -91,6 +92,7 @@ | ||
| 17 | " -r, --request=IP IP address to request (default: none)\n" | ||
| 18 | " -s, --script=file Run file at dhcp events (default:\n" | ||
| 19 | " " DEFAULT_SCRIPT ")\n" | ||
| 20 | +" -t, --retrytime time to retry DHCP request (default 60s)\n") | ||
| 21 | " -v, --version Display version\n" | ||
| 22 | ); | ||
| 23 | exit(0); | ||
| 24 | @@ -208,6 +210,7 @@ | ||
| 25 | {"quit", no_argument, 0, 'q'}, | ||
| 26 | {"request", required_argument, 0, 'r'}, | ||
| 27 | {"script", required_argument, 0, 's'}, | ||
| 28 | + {"retrytime", required_argument, 0, 't'}, | ||
| 29 | {"version", no_argument, 0, 'v'}, | ||
| 30 | {0, 0, 0, 0} | ||
| 31 | }; | ||
| 32 | @@ -223,7 +226,7 @@ | ||
| 33 | /* get options */ | ||
| 34 | while (1) { | ||
| 35 | int option_index = 0; | ||
| 36 | - c = getopt_long(argc, argv, "c:CfbH:h:i:np:qr:s:v", arg_options, &option_index); | ||
| 37 | + c = getopt_long(argc, argv, "c:fbH:h:i:np:qr:s:t:v", arg_options, &option_index); | ||
| 38 | if (c == -1) break; | ||
| 39 | |||
| 40 | switch (c) { | ||
| 41 | @@ -274,6 +277,9 @@ | ||
| 42 | case 's': | ||
| 43 | client_config.script = optarg; | ||
| 44 | break; | ||
| 45 | + case 't': | ||
| 46 | + retrytime = atol(optarg); | ||
| 47 | + break; | ||
| 48 | case 'v': | ||
| 49 | printf("udhcpcd, version %s\n\n", VERSION); | ||
| 50 | return 0; | ||
| 51 | @@ -353,7 +359,7 @@ | ||
| 52 | } | ||
| 53 | /* wait to try again */ | ||
| 54 | packet_num = 0; | ||
| 55 | - timeout = now + 60; | ||
| 56 | + timeout = now + retrytime; | ||
| 57 | } | ||
| 58 | break; | ||
| 59 | case RENEW_REQUESTED: | ||
| 60 | --- busybox-1.01/networking/ifupdown.c~dhcpretrytime | ||
| 61 | +++ busybox-1.01/networking/ifupdown.c | ||
| 62 | @@ -541,7 +541,7 @@ | ||
| 63 | static int dhcp_up(struct interface_defn_t *ifd, execfn *exec) | ||
| 64 | { | ||
| 65 | if (execable("/sbin/udhcpc")) { | ||
| 66 | - return( execute("udhcpc -n -p /var/run/udhcpc.%iface%.pid -i " | ||
| 67 | + return( execute("udhcpc -b -p /var/run/udhcpc.%iface%.pid -i " | ||
| 68 | "%iface% [[-H %hostname%]] [[-c %clientid%]]", ifd, exec)); | ||
| 69 | } else if (execable("/sbin/pump")) { | ||
| 70 | return( execute("pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]]", ifd, exec)); | ||
| 71 | @@ -561,8 +561,8 @@ | ||
| 72 | /* SIGUSR2 forces udhcpc to release the current lease and go inactive, | ||
| 73 | * and SIGTERM causes udhcpc to exit. Signals are queued and processed | ||
| 74 | * sequentially so we don't need to sleep */ | ||
| 75 | - result = execute("kill -USR2 `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec); | ||
| 76 | - result += execute("kill -TERM `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec); | ||
| 77 | + result = execute("kill -USR2 `cat /var/run/udhcpc.%iface%.pid 2>/dev/null` 2>/dev/null", ifd, exec); | ||
| 78 | + result += execute("kill -TERM `cat /var/run/udhcpc.%iface%.pid 2>/dev/null` 2>/dev/null", ifd, exec); | ||
| 79 | } else if (execable("/sbin/pump")) { | ||
| 80 | result = execute("pump -i %iface% -k", ifd, exec); | ||
| 81 | } else if (execable("/sbin/dhclient")) { | ||
diff --git a/meta/packages/busybox/busybox-1.01/familiar/defconfig b/meta/packages/busybox/busybox-1.01/familiar/defconfig deleted file mode 100644 index 49dd403eb5..0000000000 --- a/meta/packages/busybox/busybox-1.01/familiar/defconfig +++ /dev/null | |||
| @@ -1,470 +0,0 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # | ||
| 4 | HAVE_DOT_CONFIG=y | ||
| 5 | |||
| 6 | # | ||
| 7 | # General Configuration | ||
| 8 | # | ||
| 9 | # CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set | ||
| 10 | CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y | ||
| 11 | # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set | ||
| 12 | # CONFIG_FEATURE_VERBOSE_USAGE is not set | ||
| 13 | # CONFIG_FEATURE_INSTALLER is not set | ||
| 14 | # CONFIG_LOCALE_SUPPORT is not set | ||
| 15 | CONFIG_FEATURE_DEVFS=y | ||
| 16 | CONFIG_FEATURE_DEVPTS=y | ||
| 17 | # CONFIG_FEATURE_CLEAN_UP is not set | ||
| 18 | CONFIG_FEATURE_SUID=y | ||
| 19 | # CONFIG_FEATURE_SUID_CONFIG is not set | ||
| 20 | # CONFIG_SELINUX is not set | ||
| 21 | |||
| 22 | # | ||
| 23 | # Build Options | ||
| 24 | # | ||
| 25 | # CONFIG_STATIC is not set | ||
| 26 | CONFIG_LFS=y | ||
| 27 | # USING_CROSS_COMPILER is not set | ||
| 28 | EXTRA_CFLAGS_OPTIONS="" | ||
| 29 | |||
| 30 | # | ||
| 31 | # Installation Options | ||
| 32 | # | ||
| 33 | # CONFIG_INSTALL_NO_USR is not set | ||
| 34 | PREFIX="./_install" | ||
| 35 | |||
| 36 | # | ||
| 37 | # Archival Utilities | ||
| 38 | # | ||
| 39 | CONFIG_AR=y | ||
| 40 | # CONFIG_FEATURE_AR_LONG_FILENAMES is not set | ||
| 41 | CONFIG_BUNZIP2=y | ||
| 42 | CONFIG_CPIO=y | ||
| 43 | # CONFIG_DPKG is not set | ||
| 44 | # CONFIG_DPKG_DEB is not set | ||
| 45 | CONFIG_GUNZIP=y | ||
| 46 | # CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set | ||
| 47 | CONFIG_GZIP=y | ||
| 48 | # CONFIG_RPM2CPIO is not set | ||
| 49 | # CONFIG_RPM is not set | ||
| 50 | CONFIG_TAR=y | ||
| 51 | CONFIG_FEATURE_TAR_CREATE=y | ||
| 52 | CONFIG_FEATURE_TAR_BZIP2=y | ||
| 53 | CONFIG_FEATURE_TAR_FROM=y | ||
| 54 | CONFIG_FEATURE_TAR_GZIP=y | ||
| 55 | # CONFIG_FEATURE_TAR_COMPRESS is not set | ||
| 56 | CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY=y | ||
| 57 | CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y | ||
| 58 | # CONFIG_FEATURE_TAR_LONG_OPTIONS is not set | ||
| 59 | # CONFIG_UNCOMPRESS is not set | ||
| 60 | # CONFIG_UNZIP is not set | ||
| 61 | |||
| 62 | # | ||
| 63 | # Common options for cpio and tar | ||
| 64 | # | ||
| 65 | # CONFIG_FEATURE_UNARCHIVE_TAPE is not set | ||
| 66 | |||
| 67 | # | ||
| 68 | # Coreutils | ||
| 69 | # | ||
| 70 | CONFIG_BASENAME=y | ||
| 71 | # CONFIG_CAL is not set | ||
| 72 | CONFIG_CAT=y | ||
| 73 | CONFIG_CHGRP=y | ||
| 74 | CONFIG_CHMOD=y | ||
| 75 | CONFIG_CHOWN=y | ||
| 76 | CONFIG_CHROOT=y | ||
| 77 | # CONFIG_CMP is not set | ||
| 78 | CONFIG_CP=y | ||
| 79 | CONFIG_CUT=y | ||
| 80 | CONFIG_DATE=y | ||
| 81 | |||
| 82 | # | ||
| 83 | # date (forced enabled for use with watch) | ||
| 84 | # | ||
| 85 | # CONFIG_FEATURE_DATE_ISOFMT is not set | ||
| 86 | CONFIG_DD=y | ||
| 87 | CONFIG_DF=y | ||
| 88 | CONFIG_DIRNAME=y | ||
| 89 | # CONFIG_DOS2UNIX is not set | ||
| 90 | CONFIG_DU=y | ||
| 91 | CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y | ||
| 92 | CONFIG_ECHO=y | ||
| 93 | CONFIG_FEATURE_FANCY_ECHO=y | ||
| 94 | CONFIG_ENV=y | ||
| 95 | CONFIG_EXPR=y | ||
| 96 | CONFIG_FALSE=y | ||
| 97 | # CONFIG_FOLD is not set | ||
| 98 | CONFIG_HEAD=y | ||
| 99 | # CONFIG_FEATURE_FANCY_HEAD is not set | ||
| 100 | # CONFIG_HOSTID is not set | ||
| 101 | CONFIG_ID=y | ||
| 102 | # CONFIG_INSTALL is not set | ||
| 103 | # CONFIG_LENGTH is not set | ||
| 104 | CONFIG_LN=y | ||
| 105 | CONFIG_LOGNAME=y | ||
| 106 | CONFIG_LS=y | ||
| 107 | CONFIG_FEATURE_LS_FILETYPES=y | ||
| 108 | CONFIG_FEATURE_LS_FOLLOWLINKS=y | ||
| 109 | # CONFIG_FEATURE_LS_RECURSIVE is not set | ||
| 110 | CONFIG_FEATURE_LS_SORTFILES=y | ||
| 111 | CONFIG_FEATURE_LS_TIMESTAMPS=y | ||
| 112 | CONFIG_FEATURE_LS_USERNAME=y | ||
| 113 | CONFIG_FEATURE_LS_COLOR=y | ||
| 114 | CONFIG_MD5SUM=y | ||
| 115 | CONFIG_MKDIR=y | ||
| 116 | CONFIG_MKFIFO=y | ||
| 117 | CONFIG_MKNOD=y | ||
| 118 | CONFIG_MV=y | ||
| 119 | CONFIG_OD=y | ||
| 120 | CONFIG_PRINTF=y | ||
| 121 | CONFIG_PWD=y | ||
| 122 | # CONFIG_REALPATH is not set | ||
| 123 | CONFIG_RM=y | ||
| 124 | CONFIG_RMDIR=y | ||
| 125 | CONFIG_SEQ=y | ||
| 126 | # CONFIG_SHA1SUM is not set | ||
| 127 | CONFIG_SLEEP=y | ||
| 128 | # CONFIG_FEATURE_FANCY_SLEEP is not set | ||
| 129 | CONFIG_SORT=y | ||
| 130 | CONFIG_STTY=y | ||
| 131 | CONFIG_SYNC=y | ||
| 132 | CONFIG_TAIL=y | ||
| 133 | CONFIG_FEATURE_FANCY_TAIL=y | ||
| 134 | CONFIG_TEE=y | ||
| 135 | # CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set | ||
| 136 | CONFIG_TEST=y | ||
| 137 | |||
| 138 | # | ||
| 139 | # test (forced enabled for use with shell) | ||
| 140 | # | ||
| 141 | # CONFIG_FEATURE_TEST_64 is not set | ||
| 142 | CONFIG_TOUCH=y | ||
| 143 | CONFIG_TR=y | ||
| 144 | CONFIG_TRUE=y | ||
| 145 | CONFIG_TTY=y | ||
| 146 | CONFIG_UNAME=y | ||
| 147 | CONFIG_UNIQ=y | ||
| 148 | # CONFIG_USLEEP is not set | ||
| 149 | # CONFIG_UUDECODE is not set | ||
| 150 | # CONFIG_UUENCODE is not set | ||
| 151 | CONFIG_WATCH=y | ||
| 152 | CONFIG_WC=y | ||
| 153 | CONFIG_WHO=y | ||
| 154 | CONFIG_WHOAMI=y | ||
| 155 | CONFIG_YES=y | ||
| 156 | |||
| 157 | # | ||
| 158 | # Common options for cp and mv | ||
| 159 | # | ||
| 160 | # CONFIG_FEATURE_PRESERVE_HARDLINKS is not set | ||
| 161 | |||
| 162 | # | ||
| 163 | # Common options for ls and more | ||
| 164 | # | ||
| 165 | CONFIG_FEATURE_AUTOWIDTH=y | ||
| 166 | |||
| 167 | # | ||
| 168 | # Common options for df, du, ls | ||
| 169 | # | ||
| 170 | CONFIG_FEATURE_HUMAN_READABLE=y | ||
| 171 | |||
| 172 | # | ||
| 173 | # Common options for md5sum, sha1sum | ||
| 174 | # | ||
| 175 | # CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set | ||
| 176 | |||
| 177 | # | ||
| 178 | # Console Utilities | ||
| 179 | # | ||
| 180 | CONFIG_CHVT=y | ||
| 181 | CONFIG_CLEAR=y | ||
| 182 | CONFIG_DEALLOCVT=y | ||
| 183 | CONFIG_DUMPKMAP=y | ||
| 184 | CONFIG_GETKEY=y | ||
| 185 | CONFIG_LOADFONT=y | ||
| 186 | CONFIG_LOADKMAP=y | ||
| 187 | CONFIG_OPENVT=y | ||
| 188 | CONFIG_RESET=y | ||
| 189 | # CONFIG_SETKEYCODES is not set | ||
| 190 | |||
| 191 | # | ||
| 192 | # Debian Utilities | ||
| 193 | # | ||
| 194 | CONFIG_MKTEMP=y | ||
| 195 | # CONFIG_PIPE_PROGRESS is not set | ||
| 196 | CONFIG_READLINK=y | ||
| 197 | CONFIG_FEATURE_READLINK_FOLLOW=y | ||
| 198 | CONFIG_RUN_PARTS=y | ||
| 199 | CONFIG_START_STOP_DAEMON=y | ||
| 200 | CONFIG_WHICH=y | ||
| 201 | |||
| 202 | # | ||
| 203 | # Editors | ||
| 204 | # | ||
| 205 | CONFIG_AWK=y | ||
| 206 | CONFIG_FEATURE_AWK_MATH=y | ||
| 207 | # CONFIG_PATCH is not set | ||
| 208 | CONFIG_SED=y | ||
| 209 | CONFIG_VI=y | ||
| 210 | CONFIG_FEATURE_VI_COLON=y | ||
| 211 | CONFIG_FEATURE_VI_YANKMARK=y | ||
| 212 | CONFIG_FEATURE_VI_SEARCH=y | ||
| 213 | CONFIG_FEATURE_VI_USE_SIGNALS=y | ||
| 214 | # CONFIG_FEATURE_VI_DOT_CMD is not set | ||
| 215 | # CONFIG_FEATURE_VI_READONLY is not set | ||
| 216 | # CONFIG_FEATURE_VI_SETOPTS is not set | ||
| 217 | # CONFIG_FEATURE_VI_SET is not set | ||
| 218 | CONFIG_FEATURE_VI_WIN_RESIZE=y | ||
| 219 | CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y | ||
| 220 | |||
| 221 | # | ||
| 222 | # Finding Utilities | ||
| 223 | # | ||
| 224 | CONFIG_FIND=y | ||
| 225 | CONFIG_FEATURE_FIND_MTIME=y | ||
| 226 | CONFIG_FEATURE_FIND_PERM=y | ||
| 227 | CONFIG_FEATURE_FIND_TYPE=y | ||
| 228 | CONFIG_FEATURE_FIND_XDEV=y | ||
| 229 | CONFIG_FEATURE_FIND_NEWER=y | ||
| 230 | # CONFIG_FEATURE_FIND_INUM is not set | ||
| 231 | CONFIG_GREP=y | ||
| 232 | CONFIG_FEATURE_GREP_EGREP_ALIAS=y | ||
| 233 | CONFIG_FEATURE_GREP_FGREP_ALIAS=y | ||
| 234 | CONFIG_FEATURE_GREP_CONTEXT=y | ||
| 235 | CONFIG_XARGS=y | ||
| 236 | # CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set | ||
| 237 | # CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set | ||
| 238 | # CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set | ||
| 239 | # CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set | ||
| 240 | |||
| 241 | # | ||
| 242 | # Init Utilities | ||
| 243 | # | ||
| 244 | # CONFIG_INIT is not set | ||
| 245 | # CONFIG_HALT is not set | ||
| 246 | # CONFIG_POWEROFF is not set | ||
| 247 | # CONFIG_REBOOT is not set | ||
| 248 | # CONFIG_MESG is not set | ||
| 249 | |||
| 250 | # | ||
| 251 | # Login/Password Management Utilities | ||
| 252 | # | ||
| 253 | # CONFIG_USE_BB_PWD_GRP is not set | ||
| 254 | # CONFIG_ADDGROUP is not set | ||
| 255 | # CONFIG_DELGROUP is not set | ||
| 256 | # CONFIG_ADDUSER is not set | ||
| 257 | # CONFIG_DELUSER is not set | ||
| 258 | # CONFIG_GETTY is not set | ||
| 259 | CONFIG_FEATURE_UTMP=y | ||
| 260 | # CONFIG_LOGIN is not set | ||
| 261 | # CONFIG_PASSWD is not set | ||
| 262 | # CONFIG_SU is not set | ||
| 263 | # CONFIG_SULOGIN is not set | ||
| 264 | # CONFIG_VLOCK is not set | ||
| 265 | |||
| 266 | # | ||
| 267 | # Miscellaneous Utilities | ||
| 268 | # | ||
| 269 | # CONFIG_ADJTIMEX is not set | ||
| 270 | # CONFIG_CROND is not set | ||
| 271 | # CONFIG_CRONTAB is not set | ||
| 272 | CONFIG_DC=y | ||
| 273 | # CONFIG_DEVFSD is not set | ||
| 274 | # CONFIG_LAST is not set | ||
| 275 | # CONFIG_HDPARM is not set | ||
| 276 | # CONFIG_MAKEDEVS is not set | ||
| 277 | # CONFIG_MT is not set | ||
| 278 | # CONFIG_RX is not set | ||
| 279 | CONFIG_STRINGS=y | ||
| 280 | # CONFIG_TIME is not set | ||
| 281 | # CONFIG_WATCHDOG is not set | ||
| 282 | |||
| 283 | # | ||
| 284 | # Linux Module Utilities | ||
| 285 | # | ||
| 286 | CONFIG_INSMOD=y | ||
| 287 | CONFIG_FEATURE_2_4_MODULES=y | ||
| 288 | CONFIG_FEATURE_2_6_MODULES=y | ||
| 289 | # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set | ||
| 290 | CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y | ||
| 291 | # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set | ||
| 292 | CONFIG_FEATURE_INSMOD_LOAD_MAP=y | ||
| 293 | CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL=y | ||
| 294 | CONFIG_LSMOD=y | ||
| 295 | CONFIG_MODPROBE=y | ||
| 296 | CONFIG_RMMOD=y | ||
| 297 | CONFIG_FEATURE_CHECK_TAINTED_MODULE=y | ||
| 298 | |||
| 299 | # | ||
| 300 | # Networking Utilities | ||
| 301 | # | ||
| 302 | CONFIG_FEATURE_IPV6=y | ||
| 303 | # CONFIG_ARPING is not set | ||
| 304 | # CONFIG_FTPGET is not set | ||
| 305 | # CONFIG_FTPPUT is not set | ||
| 306 | CONFIG_HOSTNAME=y | ||
| 307 | # CONFIG_HTTPD is not set | ||
| 308 | CONFIG_IFCONFIG=y | ||
| 309 | CONFIG_FEATURE_IFCONFIG_STATUS=y | ||
| 310 | # CONFIG_FEATURE_IFCONFIG_SLIP is not set | ||
| 311 | # CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set | ||
| 312 | CONFIG_FEATURE_IFCONFIG_HW=y | ||
| 313 | # CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set | ||
| 314 | CONFIG_IFUPDOWN=y | ||
| 315 | # CONFIG_FEATURE_IFUPDOWN_IP is not set | ||
| 316 | CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y | ||
| 317 | CONFIG_FEATURE_IFUPDOWN_IPV4=y | ||
| 318 | CONFIG_FEATURE_IFUPDOWN_IPV6=y | ||
| 319 | # CONFIG_FEATURE_IFUPDOWN_IPX is not set | ||
| 320 | CONFIG_FEATURE_IFUPDOWN_MAPPING=y | ||
| 321 | # CONFIG_INETD is not set | ||
| 322 | CONFIG_IP=y | ||
| 323 | CONFIG_FEATURE_IP_ADDRESS=y | ||
| 324 | CONFIG_FEATURE_IP_LINK=y | ||
| 325 | CONFIG_FEATURE_IP_ROUTE=y | ||
| 326 | CONFIG_FEATURE_IP_TUNNEL=y | ||
| 327 | # CONFIG_IPCALC is not set | ||
| 328 | # CONFIG_IPADDR is not set | ||
| 329 | # CONFIG_IPLINK is not set | ||
| 330 | # CONFIG_IPROUTE is not set | ||
| 331 | # CONFIG_IPTUNNEL is not set | ||
| 332 | # CONFIG_NAMEIF is not set | ||
| 333 | CONFIG_NC=y | ||
| 334 | CONFIG_NETSTAT=y | ||
| 335 | CONFIG_NSLOOKUP=y | ||
| 336 | CONFIG_PING=y | ||
| 337 | CONFIG_FEATURE_FANCY_PING=y | ||
| 338 | CONFIG_PING6=y | ||
| 339 | CONFIG_FEATURE_FANCY_PING6=y | ||
| 340 | CONFIG_ROUTE=y | ||
| 341 | CONFIG_TELNET=y | ||
| 342 | # CONFIG_FEATURE_TELNET_TTYPE is not set | ||
| 343 | CONFIG_FEATURE_TELNET_AUTOLOGIN=y | ||
| 344 | # CONFIG_TELNETD is not set | ||
| 345 | CONFIG_TFTP=y | ||
| 346 | CONFIG_FEATURE_TFTP_GET=y | ||
| 347 | CONFIG_FEATURE_TFTP_PUT=y | ||
| 348 | # CONFIG_FEATURE_TFTP_BLOCKSIZE is not set | ||
| 349 | # CONFIG_FEATURE_TFTP_DEBUG is not set | ||
| 350 | CONFIG_TRACEROUTE=y | ||
| 351 | # CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set | ||
| 352 | # CONFIG_VCONFIG is not set | ||
| 353 | CONFIG_WGET=y | ||
| 354 | CONFIG_FEATURE_WGET_STATUSBAR=y | ||
| 355 | CONFIG_FEATURE_WGET_AUTHENTICATION=y | ||
| 356 | CONFIG_FEATURE_WGET_IP6_LITERAL=y | ||
| 357 | |||
| 358 | # | ||
| 359 | # udhcp Server/Client | ||
| 360 | # | ||
| 361 | # CONFIG_UDHCPD is not set | ||
| 362 | CONFIG_UDHCPC=y | ||
| 363 | CONFIG_FEATURE_UDHCP_SYSLOG=y | ||
| 364 | # CONFIG_FEATURE_UDHCP_DEBUG is not set | ||
| 365 | |||
| 366 | # | ||
| 367 | # Process Utilities | ||
| 368 | # | ||
| 369 | CONFIG_FREE=y | ||
| 370 | CONFIG_KILL=y | ||
| 371 | CONFIG_KILLALL=y | ||
| 372 | # CONFIG_PIDOF is not set | ||
| 373 | CONFIG_PS=y | ||
| 374 | CONFIG_RENICE=y | ||
| 375 | CONFIG_TOP=y | ||
| 376 | FEATURE_CPU_USAGE_PERCENTAGE=y | ||
| 377 | CONFIG_UPTIME=y | ||
| 378 | # CONFIG_SYSCTL is not set | ||
| 379 | |||
| 380 | # | ||
| 381 | # Another Bourne-like Shell | ||
| 382 | # | ||
| 383 | CONFIG_FEATURE_SH_IS_ASH=y | ||
| 384 | # CONFIG_FEATURE_SH_IS_HUSH is not set | ||
| 385 | # CONFIG_FEATURE_SH_IS_LASH is not set | ||
| 386 | # CONFIG_FEATURE_SH_IS_MSH is not set | ||
| 387 | # CONFIG_FEATURE_SH_IS_NONE is not set | ||
| 388 | CONFIG_ASH=y | ||
| 389 | |||
| 390 | # | ||
| 391 | # Ash Shell Options | ||
| 392 | # | ||
| 393 | CONFIG_ASH_JOB_CONTROL=y | ||
| 394 | CONFIG_ASH_ALIAS=y | ||
| 395 | CONFIG_ASH_MATH_SUPPORT=y | ||
| 396 | # CONFIG_ASH_MATH_SUPPORT_64 is not set | ||
| 397 | CONFIG_ASH_GETOPTS=y | ||
| 398 | # CONFIG_ASH_CMDCMD is not set | ||
| 399 | # CONFIG_ASH_MAIL is not set | ||
| 400 | CONFIG_ASH_OPTIMIZE_FOR_SIZE=y | ||
| 401 | # CONFIG_ASH_RANDOM_SUPPORT is not set | ||
| 402 | # CONFIG_HUSH is not set | ||
| 403 | # CONFIG_LASH is not set | ||
| 404 | # CONFIG_MSH is not set | ||
| 405 | |||
| 406 | # | ||
| 407 | # Bourne Shell Options | ||
| 408 | # | ||
| 409 | CONFIG_FEATURE_SH_EXTRA_QUIET=y | ||
| 410 | # CONFIG_FEATURE_SH_STANDALONE_SHELL is not set | ||
| 411 | CONFIG_FEATURE_COMMAND_EDITING=y | ||
| 412 | CONFIG_FEATURE_COMMAND_HISTORY=63 | ||
| 413 | # CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set | ||
| 414 | CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y | ||
| 415 | # CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set | ||
| 416 | CONFIG_FEATURE_SH_FANCY_PROMPT=y | ||
| 417 | |||
| 418 | # | ||
| 419 | # System Logging Utilities | ||
| 420 | # | ||
| 421 | CONFIG_SYSLOGD=y | ||
| 422 | # CONFIG_FEATURE_ROTATE_LOGFILE is not set | ||
| 423 | CONFIG_FEATURE_REMOTE_LOG=y | ||
| 424 | CONFIG_FEATURE_IPC_SYSLOG=y | ||
| 425 | CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 | ||
| 426 | CONFIG_LOGREAD=y | ||
| 427 | # CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set | ||
| 428 | CONFIG_KLOGD=y | ||
| 429 | CONFIG_LOGGER=y | ||
| 430 | |||
| 431 | # | ||
| 432 | # Linux System Utilities | ||
| 433 | # | ||
| 434 | CONFIG_DMESG=y | ||
| 435 | CONFIG_FBSET=y | ||
| 436 | CONFIG_FEATURE_FBSET_FANCY=y | ||
| 437 | # CONFIG_FEATURE_FBSET_READMODE is not set | ||
| 438 | # CONFIG_FDFLUSH is not set | ||
| 439 | # CONFIG_FDFORMAT is not set | ||
| 440 | # CONFIG_FDISK is not set | ||
| 441 | FDISK_SUPPORT_LARGE_DISKS=y | ||
| 442 | # CONFIG_FREERAMDISK is not set | ||
| 443 | # CONFIG_FSCK_MINIX is not set | ||
| 444 | # CONFIG_MKFS_MINIX is not set | ||
| 445 | # CONFIG_GETOPT is not set | ||
| 446 | CONFIG_HEXDUMP=y | ||
| 447 | CONFIG_HWCLOCK=y | ||
| 448 | CONFIG_FEATURE_HWCLOCK_LONGOPTIONS=y | ||
| 449 | CONFIG_LOSETUP=y | ||
| 450 | CONFIG_MKSWAP=y | ||
| 451 | CONFIG_MORE=y | ||
| 452 | CONFIG_FEATURE_USE_TERMIOS=y | ||
| 453 | CONFIG_PIVOT_ROOT=y | ||
| 454 | # CONFIG_RDATE is not set | ||
| 455 | CONFIG_SWAPONOFF=y | ||
| 456 | CONFIG_MOUNT=y | ||
| 457 | CONFIG_NFSMOUNT=y | ||
| 458 | CONFIG_UMOUNT=y | ||
| 459 | CONFIG_FEATURE_MOUNT_FORCE=y | ||
| 460 | |||
| 461 | # | ||
| 462 | # Common options for mount/umount | ||
| 463 | # | ||
| 464 | CONFIG_FEATURE_MOUNT_LOOP=y | ||
| 465 | # CONFIG_FEATURE_MTAB_SUPPORT is not set | ||
| 466 | |||
| 467 | # | ||
| 468 | # Debugging Options | ||
| 469 | # | ||
| 470 | # CONFIG_DEBUG is not set | ||
diff --git a/meta/packages/busybox/busybox-1.01/fbset.patch b/meta/packages/busybox/busybox-1.01/fbset.patch deleted file mode 100644 index d0609ce6f7..0000000000 --- a/meta/packages/busybox/busybox-1.01/fbset.patch +++ /dev/null | |||
| @@ -1,24 +0,0 @@ | |||
| 1 | --- busybox/util-linux/fbset.c~ 2004-07-03 16:24:23.000000000 +0100 | ||
| 2 | +++ busybox/util-linux/fbset.c 2004-12-30 20:09:26.000000000 +0000 | ||
| 3 | @@ -337,7 +337,7 @@ | ||
| 4 | { | ||
| 5 | struct fb_var_screeninfo var, varset; | ||
| 6 | int fh, i; | ||
| 7 | - char *fbdev = DEFAULTFBDEV; | ||
| 8 | + char *fbdev = NULL; | ||
| 9 | char *modefile = DEFAULTFBMODE; | ||
| 10 | char *thisarg, *mode = NULL; | ||
| 11 | |||
| 12 | @@ -404,7 +404,12 @@ | ||
| 13 | } | ||
| 14 | } | ||
| 15 | |||
| 16 | + if (fbdev == NULL) | ||
| 17 | + fbdev = DEFAULTFBDEV; | ||
| 18 | if ((fh = open(fbdev, O_RDONLY)) < 0) | ||
| 19 | +#ifdef CONFIG_FEATURE_DEVFS | ||
| 20 | + if ((fh = open("/dev/fb0", O_RDONLY)) < 0) | ||
| 21 | +#endif | ||
| 22 | bb_perror_msg_and_die("fbset(open)"); | ||
| 23 | if (ioctl(fh, FBIOGET_VSCREENINFO, &var)) | ||
| 24 | bb_perror_msg_and_die("fbset(ioctl)"); | ||
diff --git a/meta/packages/busybox/busybox-1.01/hdparm_M.patch b/meta/packages/busybox/busybox-1.01/hdparm_M.patch deleted file mode 100644 index 170906535e..0000000000 --- a/meta/packages/busybox/busybox-1.01/hdparm_M.patch +++ /dev/null | |||
| @@ -1,47 +0,0 @@ | |||
| 1 | diff -Naur busybox-1.00/miscutils/hdparm.c busybox-1.00-patched/miscutils/hdparm.c | ||
| 2 | --- busybox-1.00/miscutils/hdparm.c 2004-07-21 00:53:59.000000000 +0200 | ||
| 3 | +++ busybox-1.00-patched/miscutils/hdparm.c 2004-10-21 15:17:13.000000000 +0200 | ||
| 4 | @@ -1254,6 +1254,7 @@ | ||
| 5 | static unsigned long set_sleepnow = 0, get_sleepnow = 0; | ||
| 6 | static unsigned long get_powermode = 0; | ||
| 7 | static unsigned long set_apmmode = 0, get_apmmode= 0, apmmode = 0; | ||
| 8 | +static unsigned long set_acoustic = 0, get_acoustic = 0, acoustic = 0; | ||
| 9 | #endif | ||
| 10 | #ifdef CONFIG_FEATURE_HDPARM_GET_IDENTITY | ||
| 11 | static int get_IDentity = 0; | ||
| 12 | @@ -2123,6 +2124,20 @@ | ||
| 13 | } | ||
| 14 | bb_ioctl(fd, HDIO_DRIVE_CMD, &args,"HDIO_DRIVE_CMD"); | ||
| 15 | } | ||
| 16 | + if (set_acoustic) | ||
| 17 | + { | ||
| 18 | + no_scsi(); | ||
| 19 | + acoustic=check_if_min_and_set_val(acoustic,0); | ||
| 20 | + acoustic=check_if_maj_and_set_val(acoustic,254); | ||
| 21 | + if_printf(get_acoustic," setting AAM level to 0x%02lX (%ld)\n", acoustic, acoustic); | ||
| 22 | + bb_ioctl(fd, HDIO_SET_ACOUSTIC, (int*)acoustic,"HDIO_SET_ACOUSTIC"); | ||
| 23 | + } | ||
| 24 | + if (get_acoustic) | ||
| 25 | + { | ||
| 26 | + no_scsi(); | ||
| 27 | + bb_ioctl(fd, HDIO_GET_ACOUSTIC, (unsigned long*)&parm,"HDIO_GET_ACOUSTIC"); | ||
| 28 | + printf(" acoustic = %2ld (128=quiet ... 254=fast)\n", parm); | ||
| 29 | + } | ||
| 30 | if (set_wcache) | ||
| 31 | { | ||
| 32 | #ifdef DO_FLUSHCACHE | ||
| 33 | @@ -2831,6 +2846,13 @@ | ||
| 34 | p = *argv++, --argc; | ||
| 35 | p=GET_NUMBER(p,&set_readahead,&Xreadahead); | ||
| 36 | break; | ||
| 37 | + case 'M': | ||
| 38 | + get_acoustic = noisy; | ||
| 39 | + noisy = 1; | ||
| 40 | + if (!*p && argc && isalnum(**argv)) | ||
| 41 | + p = *argv++, --argc; | ||
| 42 | + p=GET_NUMBER(p,&set_acoustic,&acoustic); | ||
| 43 | + break; | ||
| 44 | case 'B': | ||
| 45 | get_apmmode = noisy; | ||
| 46 | noisy = 1; | ||
| 47 | |||
diff --git a/meta/packages/busybox/busybox-1.01/ifupdown-spurious-environ.patch b/meta/packages/busybox/busybox-1.01/ifupdown-spurious-environ.patch deleted file mode 100644 index 8753315f2c..0000000000 --- a/meta/packages/busybox/busybox-1.01/ifupdown-spurious-environ.patch +++ /dev/null | |||
| @@ -1,12 +0,0 @@ | |||
| 1 | --- busybox-1.00/networking/ifupdown.c.old 2005-06-11 19:51:59.000000000 +0100 | ||
| 2 | +++ busybox-1.00/networking/ifupdown.c 2005-06-11 19:52:19.000000000 +0100 | ||
| 3 | @@ -148,6 +148,9 @@ | ||
| 4 | struct mapping_defn_t *mappings; | ||
| 5 | }; | ||
| 6 | |||
| 7 | +/* XXX */ | ||
| 8 | +#define environ local_environ | ||
| 9 | + | ||
| 10 | static char no_act = 0; | ||
| 11 | static char verbose = 0; | ||
| 12 | static char **environ = NULL; | ||
diff --git a/meta/packages/busybox/busybox-1.01/iproute-flush-cache.patch b/meta/packages/busybox/busybox-1.01/iproute-flush-cache.patch deleted file mode 100644 index f8becc3390..0000000000 --- a/meta/packages/busybox/busybox-1.01/iproute-flush-cache.patch +++ /dev/null | |||
| @@ -1,23 +0,0 @@ | |||
| 1 | Index: networking/libiproute/iproute.c | ||
| 2 | =================================================================== | ||
| 3 | RCS file: /var/cvs/busybox/networking/libiproute/iproute.c,v | ||
| 4 | retrieving revision 1.14 | ||
| 5 | diff -u -r1.14 iproute.c | ||
| 6 | --- networking/libiproute/iproute.c 11 Aug 2004 08:10:58 -0000 1.14 | ||
| 7 | +++ networking/libiproute/iproute.c 30 Nov 2004 20:43:44 -0000 | ||
| 8 | @@ -537,6 +537,15 @@ | ||
| 9 | } else if (matches(*argv, "match") == 0) { | ||
| 10 | NEXT_ARG(); | ||
| 11 | get_prefix(&filter.mdst, *argv, do_ipv6); | ||
| 12 | + } else if (matches(*argv, "table") == 0) { | ||
| 13 | + NEXT_ARG(); | ||
| 14 | + if (matches(*argv, "cache") == 0) { | ||
| 15 | + filter.tb = -1; | ||
| 16 | + } else if (matches(*argv, "main") != 0) { | ||
| 17 | + invarg("invalid \"table\"", *argv); | ||
| 18 | + } | ||
| 19 | + } else if (matches(*argv, "cache") == 0) { | ||
| 20 | + filter.tb = -1; | ||
| 21 | } else { | ||
| 22 | if (matches(*argv, "exact") == 0) { | ||
| 23 | NEXT_ARG(); | ||
diff --git a/meta/packages/busybox/busybox-1.01/mount-all-type.patch b/meta/packages/busybox/busybox-1.01/mount-all-type.patch deleted file mode 100644 index 476094a804..0000000000 --- a/meta/packages/busybox/busybox-1.01/mount-all-type.patch +++ /dev/null | |||
| @@ -1,84 +0,0 @@ | |||
| 1 | --- busybox-1.00/.pc/mount-all-type.patch/util-linux/mount.c 2004-08-02 17:14:02.000000000 -0700 | ||
| 2 | +++ busybox-1.00/util-linux/mount.c 2005-05-13 00:17:19.054232796 -0700 | ||
| 3 | @@ -364,6 +364,56 @@ | ||
| 4 | exit(EXIT_SUCCESS); | ||
| 5 | } | ||
| 6 | |||
| 7 | +/* Does this file system type, from /etc/fstab, match the given | ||
| 8 | + * -t option value? | ||
| 9 | + */ | ||
| 10 | +static int match_fs(const char *option, const char *type) | ||
| 11 | +{ | ||
| 12 | + const int len = strlen(type); | ||
| 13 | + const int no = option[0] == 'n' && option[1] == 'o'; | ||
| 14 | + const char *optp = option; | ||
| 15 | + | ||
| 16 | + if (len > 0) do { | ||
| 17 | + const char *match = strstr(optp, type); | ||
| 18 | + | ||
| 19 | + if (match == NULL) { | ||
| 20 | + /* No match, but if the option string starts 'no' no match | ||
| 21 | + * means yes. | ||
| 22 | + */ | ||
| 23 | + return no; | ||
| 24 | + } | ||
| 25 | + | ||
| 26 | + /* Match, may be partial, check for end-of-type in option string. */ | ||
| 27 | + if (match[len] == 0 || match[len] == ',') { | ||
| 28 | + /* Ok, check for type or notype. */ | ||
| 29 | + if (match == option) { | ||
| 30 | + /* Exact match at start (can't be 'no') */ | ||
| 31 | + return 1; | ||
| 32 | + } | ||
| 33 | + if (match > option+1) { | ||
| 34 | + if (match[-1] == ',') { | ||
| 35 | + /* Exact match in middle, might be 'no' */ | ||
| 36 | + return !no; | ||
| 37 | + } | ||
| 38 | + if (match == option+2 && no) { | ||
| 39 | + /* Exact match to 'notype' at start. */ | ||
| 40 | + return 0; | ||
| 41 | + } | ||
| 42 | + if (match > option+2 && match[-3] == ',' && | ||
| 43 | + match[-2] == 'n' && match[-1] == 'o') { | ||
| 44 | + return 0; | ||
| 45 | + } | ||
| 46 | + } | ||
| 47 | + } | ||
| 48 | + | ||
| 49 | + /* Look for another match. */ | ||
| 50 | + optp = match+1; | ||
| 51 | + } while (1); | ||
| 52 | + | ||
| 53 | + /* zero length type in fstab (impossible?), don't match it. */ | ||
| 54 | + return 0; | ||
| 55 | +} | ||
| 56 | + | ||
| 57 | extern int mount_main(int argc, char **argv) | ||
| 58 | { | ||
| 59 | struct stat statbuf; | ||
| 60 | @@ -371,6 +421,7 @@ | ||
| 61 | char *extra_opts; | ||
| 62 | int flags = 0; | ||
| 63 | char *filesystemType = "auto"; | ||
| 64 | + char *filesystemOption = 0; | ||
| 65 | int got_filesystemType = 0; | ||
| 66 | char *device = xmalloc(PATH_MAX); | ||
| 67 | char *directory = xmalloc(PATH_MAX); | ||
| 68 | @@ -393,6 +444,7 @@ | ||
| 69 | break; | ||
| 70 | case 't': | ||
| 71 | filesystemType = optarg; | ||
| 72 | + filesystemOption = optarg; | ||
| 73 | got_filesystemType = 1; | ||
| 74 | break; | ||
| 75 | case 'w': | ||
| 76 | @@ -460,6 +512,8 @@ | ||
| 77 | |||
| 78 | strcpy(device, m->mnt_fsname); | ||
| 79 | strcpy(directory, m->mnt_dir); | ||
| 80 | + if (all && filesystemOption != 0 && !match_fs(filesystemOption, m->mnt_type)) | ||
| 81 | + continue; | ||
| 82 | filesystemType = bb_xstrdup(m->mnt_type); | ||
| 83 | singlemount: | ||
| 84 | extra_opts = string_flags; | ||
diff --git a/meta/packages/busybox/busybox-1.01/no_strip.patch b/meta/packages/busybox/busybox-1.01/no_strip.patch deleted file mode 100644 index 683bf6bacb..0000000000 --- a/meta/packages/busybox/busybox-1.01/no_strip.patch +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | --- | ||
| 2 | Rules.mak | 2 +- | ||
| 3 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 4 | |||
| 5 | Index: busybox-1.01/Rules.mak | ||
| 6 | =================================================================== | ||
| 7 | --- busybox-1.01.orig/Rules.mak 2005-08-17 02:29:17.000000000 +0100 | ||
| 8 | +++ busybox-1.01/Rules.mak 2007-01-12 01:03:01.000000000 +0000 | ||
| 9 | @@ -167,7 +167,7 @@ ifeq ($(strip $(CONFIG_DEBUG)),y) | ||
| 10 | else | ||
| 11 | CFLAGS+=$(WARNINGS) $(OPTIMIZATIONS) -D_GNU_SOURCE -DNDEBUG | ||
| 12 | LDFLAGS += -Wl,-warn-common | ||
| 13 | - STRIPCMD:=$(STRIP) -s --remove-section=.note --remove-section=.comment | ||
| 14 | + STRIPCMD:=/bin/true -OE_WILL_DO_THIS | ||
| 15 | endif | ||
| 16 | ifeq ($(strip $(CONFIG_STATIC)),y) | ||
| 17 | LDFLAGS += --static | ||
diff --git a/meta/packages/busybox/busybox-1.01/openmn/defconfig b/meta/packages/busybox/busybox-1.01/openmn/defconfig deleted file mode 100644 index f98af91853..0000000000 --- a/meta/packages/busybox/busybox-1.01/openmn/defconfig +++ /dev/null | |||
| @@ -1,475 +0,0 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # | ||
| 4 | HAVE_DOT_CONFIG=y | ||
| 5 | |||
| 6 | # | ||
| 7 | # General Configuration | ||
| 8 | # | ||
| 9 | CONFIG_FEATURE_BUFFERS_USE_MALLOC=y | ||
| 10 | # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set | ||
| 11 | # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set | ||
| 12 | # CONFIG_FEATURE_VERBOSE_USAGE is not set | ||
| 13 | # CONFIG_FEATURE_INSTALLER is not set | ||
| 14 | # CONFIG_LOCALE_SUPPORT is not set | ||
| 15 | CONFIG_FEATURE_DEVFS=y | ||
| 16 | CONFIG_FEATURE_DEVPTS=y | ||
| 17 | # CONFIG_FEATURE_CLEAN_UP is not set | ||
| 18 | # CONFIG_FEATURE_SUID is not set | ||
| 19 | # CONFIG_FEATURE_SUID_CONFIG is not set | ||
| 20 | # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set | ||
| 21 | # CONFIG_SELINUX is not set | ||
| 22 | |||
| 23 | # | ||
| 24 | # Build Options | ||
| 25 | # | ||
| 26 | # CONFIG_STATIC is not set | ||
| 27 | # CONFIG_LFS is not set | ||
| 28 | # USING_CROSS_COMPILER is not set | ||
| 29 | EXTRA_CFLAGS_OPTIONS="" | ||
| 30 | |||
| 31 | # | ||
| 32 | # Installation Options | ||
| 33 | # | ||
| 34 | # CONFIG_INSTALL_NO_USR is not set | ||
| 35 | PREFIX="./_install" | ||
| 36 | |||
| 37 | # | ||
| 38 | # Archival Utilities | ||
| 39 | # | ||
| 40 | CONFIG_AR=y | ||
| 41 | # CONFIG_FEATURE_AR_LONG_FILENAMES is not set | ||
| 42 | CONFIG_BUNZIP2=y | ||
| 43 | CONFIG_CPIO=y | ||
| 44 | # CONFIG_DPKG is not set | ||
| 45 | # CONFIG_DPKG_DEB is not set | ||
| 46 | CONFIG_GUNZIP=y | ||
| 47 | # CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set | ||
| 48 | CONFIG_GZIP=y | ||
| 49 | # CONFIG_RPM2CPIO is not set | ||
| 50 | # CONFIG_RPM is not set | ||
| 51 | CONFIG_TAR=y | ||
| 52 | CONFIG_FEATURE_TAR_CREATE=y | ||
| 53 | CONFIG_FEATURE_TAR_BZIP2=y | ||
| 54 | CONFIG_FEATURE_TAR_FROM=y | ||
| 55 | CONFIG_FEATURE_TAR_GZIP=y | ||
| 56 | # CONFIG_FEATURE_TAR_COMPRESS is not set | ||
| 57 | CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY=y | ||
| 58 | CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y | ||
| 59 | # CONFIG_FEATURE_TAR_LONG_OPTIONS is not set | ||
| 60 | # CONFIG_UNCOMPRESS is not set | ||
| 61 | CONFIG_UNZIP=y | ||
| 62 | |||
| 63 | # | ||
| 64 | # Common options for cpio and tar | ||
| 65 | # | ||
| 66 | # CONFIG_FEATURE_UNARCHIVE_TAPE is not set | ||
| 67 | |||
| 68 | # | ||
| 69 | # Coreutils | ||
| 70 | # | ||
| 71 | CONFIG_BASENAME=y | ||
| 72 | # CONFIG_CAL is not set | ||
| 73 | CONFIG_CAT=y | ||
| 74 | CONFIG_CHGRP=y | ||
| 75 | CONFIG_CHMOD=y | ||
| 76 | CONFIG_CHOWN=y | ||
| 77 | CONFIG_CHROOT=y | ||
| 78 | CONFIG_CMP=y | ||
| 79 | CONFIG_CP=y | ||
| 80 | CONFIG_CUT=y | ||
| 81 | CONFIG_DATE=y | ||
| 82 | |||
| 83 | # | ||
| 84 | # date (forced enabled for use with watch) | ||
| 85 | # | ||
| 86 | CONFIG_FEATURE_DATE_ISOFMT=y | ||
| 87 | CONFIG_DD=y | ||
| 88 | CONFIG_DF=y | ||
| 89 | CONFIG_DIRNAME=y | ||
| 90 | # CONFIG_DOS2UNIX is not set | ||
| 91 | CONFIG_DU=y | ||
| 92 | CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y | ||
| 93 | CONFIG_ECHO=y | ||
| 94 | CONFIG_FEATURE_FANCY_ECHO=y | ||
| 95 | CONFIG_ENV=y | ||
| 96 | CONFIG_EXPR=y | ||
| 97 | CONFIG_FALSE=y | ||
| 98 | # CONFIG_FOLD is not set | ||
| 99 | CONFIG_HEAD=y | ||
| 100 | # CONFIG_FEATURE_FANCY_HEAD is not set | ||
| 101 | # CONFIG_HOSTID is not set | ||
| 102 | CONFIG_ID=y | ||
| 103 | # CONFIG_INSTALL is not set | ||
| 104 | # CONFIG_LENGTH is not set | ||
| 105 | CONFIG_LN=y | ||
| 106 | CONFIG_LOGNAME=y | ||
| 107 | CONFIG_LS=y | ||
| 108 | CONFIG_FEATURE_LS_FILETYPES=y | ||
| 109 | CONFIG_FEATURE_LS_FOLLOWLINKS=y | ||
| 110 | CONFIG_FEATURE_LS_RECURSIVE=y | ||
| 111 | CONFIG_FEATURE_LS_SORTFILES=y | ||
| 112 | CONFIG_FEATURE_LS_TIMESTAMPS=y | ||
| 113 | CONFIG_FEATURE_LS_USERNAME=y | ||
| 114 | # CONFIG_FEATURE_LS_COLOR is not set | ||
| 115 | CONFIG_MD5SUM=y | ||
| 116 | CONFIG_MKDIR=y | ||
| 117 | CONFIG_MKFIFO=y | ||
| 118 | CONFIG_MKNOD=y | ||
| 119 | CONFIG_MV=y | ||
| 120 | CONFIG_OD=y | ||
| 121 | CONFIG_PRINTF=y | ||
| 122 | CONFIG_PWD=y | ||
| 123 | # CONFIG_REALPATH is not set | ||
| 124 | CONFIG_RM=y | ||
| 125 | CONFIG_RMDIR=y | ||
| 126 | CONFIG_SEQ=y | ||
| 127 | # CONFIG_SHA1SUM is not set | ||
| 128 | CONFIG_SLEEP=y | ||
| 129 | # CONFIG_FEATURE_FANCY_SLEEP is not set | ||
| 130 | CONFIG_SORT=y | ||
| 131 | CONFIG_STTY=y | ||
| 132 | CONFIG_SYNC=y | ||
| 133 | CONFIG_TAIL=y | ||
| 134 | # CONFIG_FEATURE_FANCY_TAIL is not set | ||
| 135 | CONFIG_TEE=y | ||
| 136 | # CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set | ||
| 137 | CONFIG_TEST=y | ||
| 138 | |||
| 139 | # | ||
| 140 | # test (forced enabled for use with shell) | ||
| 141 | # | ||
| 142 | # CONFIG_FEATURE_TEST_64 is not set | ||
| 143 | CONFIG_TOUCH=y | ||
| 144 | CONFIG_TR=y | ||
| 145 | CONFIG_TRUE=y | ||
| 146 | CONFIG_TTY=y | ||
| 147 | CONFIG_UNAME=y | ||
| 148 | CONFIG_UNIQ=y | ||
| 149 | CONFIG_USLEEP=y | ||
| 150 | # CONFIG_UUDECODE is not set | ||
| 151 | # CONFIG_UUENCODE is not set | ||
| 152 | CONFIG_WATCH=y | ||
| 153 | CONFIG_WC=y | ||
| 154 | CONFIG_WHO=y | ||
| 155 | CONFIG_WHOAMI=y | ||
| 156 | CONFIG_YES=y | ||
| 157 | |||
| 158 | # | ||
| 159 | # Common options for cp and mv | ||
| 160 | # | ||
| 161 | # CONFIG_FEATURE_PRESERVE_HARDLINKS is not set | ||
| 162 | |||
| 163 | # | ||
| 164 | # Common options for ls and more | ||
| 165 | # | ||
| 166 | CONFIG_FEATURE_AUTOWIDTH=y | ||
| 167 | |||
| 168 | # | ||
| 169 | # Common options for df, du, ls | ||
| 170 | # | ||
| 171 | CONFIG_FEATURE_HUMAN_READABLE=y | ||
| 172 | |||
| 173 | # | ||
| 174 | # Common options for md5sum, sha1sum | ||
| 175 | # | ||
| 176 | # CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set | ||
| 177 | |||
| 178 | # | ||
| 179 | # Console Utilities | ||
| 180 | # | ||
| 181 | CONFIG_CHVT=y | ||
| 182 | CONFIG_CLEAR=y | ||
| 183 | CONFIG_DEALLOCVT=y | ||
| 184 | CONFIG_DUMPKMAP=y | ||
| 185 | CONFIG_GETKEY=y | ||
| 186 | CONFIG_LOADFONT=y | ||
| 187 | CONFIG_LOADKMAP=y | ||
| 188 | CONFIG_OPENVT=y | ||
| 189 | CONFIG_RESET=y | ||
| 190 | CONFIG_SETKEYCODES=y | ||
| 191 | |||
| 192 | # | ||
| 193 | # Debian Utilities | ||
| 194 | # | ||
| 195 | CONFIG_MKTEMP=y | ||
| 196 | # CONFIG_PIPE_PROGRESS is not set | ||
| 197 | CONFIG_READLINK=y | ||
| 198 | CONFIG_FEATURE_READLINK_FOLLOW=y | ||
| 199 | CONFIG_RUN_PARTS=y | ||
| 200 | CONFIG_START_STOP_DAEMON=y | ||
| 201 | CONFIG_WHICH=y | ||
| 202 | |||
| 203 | # | ||
| 204 | # Editors | ||
| 205 | # | ||
| 206 | CONFIG_AWK=y | ||
| 207 | CONFIG_FEATURE_AWK_MATH=y | ||
| 208 | # CONFIG_PATCH is not set | ||
| 209 | CONFIG_SED=y | ||
| 210 | CONFIG_VI=y | ||
| 211 | CONFIG_FEATURE_VI_COLON=y | ||
| 212 | CONFIG_FEATURE_VI_YANKMARK=y | ||
| 213 | CONFIG_FEATURE_VI_SEARCH=y | ||
| 214 | CONFIG_FEATURE_VI_USE_SIGNALS=y | ||
| 215 | # CONFIG_FEATURE_VI_DOT_CMD is not set | ||
| 216 | # CONFIG_FEATURE_VI_READONLY is not set | ||
| 217 | # CONFIG_FEATURE_VI_SETOPTS is not set | ||
| 218 | # CONFIG_FEATURE_VI_SET is not set | ||
| 219 | CONFIG_FEATURE_VI_WIN_RESIZE=y | ||
| 220 | CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y | ||
| 221 | |||
| 222 | # | ||
| 223 | # Finding Utilities | ||
| 224 | # | ||
| 225 | CONFIG_FIND=y | ||
| 226 | CONFIG_FEATURE_FIND_MTIME=y | ||
| 227 | CONFIG_FEATURE_FIND_PERM=y | ||
| 228 | CONFIG_FEATURE_FIND_TYPE=y | ||
| 229 | CONFIG_FEATURE_FIND_XDEV=y | ||
| 230 | CONFIG_FEATURE_FIND_NEWER=y | ||
| 231 | # CONFIG_FEATURE_FIND_INUM is not set | ||
| 232 | CONFIG_GREP=y | ||
| 233 | CONFIG_FEATURE_GREP_EGREP_ALIAS=y | ||
| 234 | CONFIG_FEATURE_GREP_FGREP_ALIAS=y | ||
| 235 | CONFIG_FEATURE_GREP_CONTEXT=y | ||
| 236 | CONFIG_XARGS=y | ||
| 237 | # CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set | ||
| 238 | # CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set | ||
| 239 | # CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set | ||
| 240 | CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y | ||
| 241 | |||
| 242 | # | ||
| 243 | # Init Utilities | ||
| 244 | # | ||
| 245 | # CONFIG_INIT is not set | ||
| 246 | # CONFIG_HALT is not set | ||
| 247 | # CONFIG_POWEROFF is not set | ||
| 248 | # CONFIG_REBOOT is not set | ||
| 249 | # CONFIG_MESG is not set | ||
| 250 | |||
| 251 | # | ||
| 252 | # Login/Password Management Utilities | ||
| 253 | # | ||
| 254 | # CONFIG_USE_BB_PWD_GRP is not set | ||
| 255 | CONFIG_ADDGROUP=y | ||
| 256 | CONFIG_DELGROUP=y | ||
| 257 | CONFIG_ADDUSER=y | ||
| 258 | CONFIG_DELUSER=y | ||
| 259 | CONFIG_GETTY=y | ||
| 260 | CONFIG_FEATURE_U_W_TMP=y | ||
| 261 | CONFIG_LOGIN=y | ||
| 262 | # CONFIG_FEATURE_SECURETTY is not set | ||
| 263 | CONFIG_PASSWD=y | ||
| 264 | CONFIG_SU=y | ||
| 265 | CONFIG_SULOGIN=y | ||
| 266 | CONFIG_VLOCK=y | ||
| 267 | |||
| 268 | # | ||
| 269 | # Common options for adduser, deluser, login, su | ||
| 270 | # | ||
| 271 | CONFIG_FEATURE_SHADOWPASSWDS=y | ||
| 272 | |||
| 273 | # | ||
| 274 | # Miscellaneous Utilities | ||
| 275 | # | ||
| 276 | # CONFIG_ADJTIMEX is not set | ||
| 277 | # CONFIG_CROND is not set | ||
| 278 | # CONFIG_CRONTAB is not set | ||
| 279 | CONFIG_DC=y | ||
| 280 | # CONFIG_DEVFSD is not set | ||
| 281 | # CONFIG_LAST is not set | ||
| 282 | # CONFIG_HDPARM is not set | ||
| 283 | # CONFIG_MAKEDEVS is not set | ||
| 284 | # CONFIG_MT is not set | ||
| 285 | # CONFIG_RX is not set | ||
| 286 | CONFIG_STRINGS=y | ||
| 287 | CONFIG_TIME=y | ||
| 288 | # CONFIG_WATCHDOG is not set | ||
| 289 | |||
| 290 | # | ||
| 291 | # Linux Module Utilities | ||
| 292 | # | ||
| 293 | CONFIG_INSMOD=y | ||
| 294 | CONFIG_FEATURE_2_4_MODULES=y | ||
| 295 | CONFIG_FEATURE_2_6_MODULES=y | ||
| 296 | # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set | ||
| 297 | CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y | ||
| 298 | # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set | ||
| 299 | CONFIG_FEATURE_INSMOD_LOAD_MAP=y | ||
| 300 | CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL=y | ||
| 301 | CONFIG_LSMOD=y | ||
| 302 | CONFIG_MODPROBE=y | ||
| 303 | CONFIG_RMMOD=y | ||
| 304 | # CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set | ||
| 305 | |||
| 306 | # | ||
| 307 | # Networking Utilities | ||
| 308 | # | ||
| 309 | # CONFIG_FEATURE_IPV6 is not set | ||
| 310 | CONFIG_ARPING=y | ||
| 311 | # CONFIG_FTPGET is not set | ||
| 312 | CONFIG_FTPPUT=y | ||
| 313 | CONFIG_HOSTNAME=y | ||
| 314 | # CONFIG_HTTPD is not set | ||
| 315 | CONFIG_IFCONFIG=y | ||
| 316 | CONFIG_FEATURE_IFCONFIG_STATUS=y | ||
| 317 | # CONFIG_FEATURE_IFCONFIG_SLIP is not set | ||
| 318 | # CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set | ||
| 319 | CONFIG_FEATURE_IFCONFIG_HW=y | ||
| 320 | # CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set | ||
| 321 | CONFIG_IFUPDOWN=y | ||
| 322 | # CONFIG_FEATURE_IFUPDOWN_IP is not set | ||
| 323 | CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y | ||
| 324 | CONFIG_FEATURE_IFUPDOWN_IPV4=y | ||
| 325 | # CONFIG_FEATURE_IFUPDOWN_IPV6 is not set | ||
| 326 | # CONFIG_FEATURE_IFUPDOWN_IPX is not set | ||
| 327 | # CONFIG_FEATURE_IFUPDOWN_MAPPING is not set | ||
| 328 | # CONFIG_INETD is not set | ||
| 329 | CONFIG_IP=y | ||
| 330 | CONFIG_FEATURE_IP_ADDRESS=y | ||
| 331 | CONFIG_FEATURE_IP_LINK=y | ||
| 332 | CONFIG_FEATURE_IP_ROUTE=y | ||
| 333 | # CONFIG_FEATURE_IP_TUNNEL is not set | ||
| 334 | # CONFIG_IPCALC is not set | ||
| 335 | # CONFIG_IPADDR is not set | ||
| 336 | # CONFIG_IPLINK is not set | ||
| 337 | # CONFIG_IPROUTE is not set | ||
| 338 | # CONFIG_IPTUNNEL is not set | ||
| 339 | # CONFIG_NAMEIF is not set | ||
| 340 | CONFIG_NC=y | ||
| 341 | CONFIG_NETSTAT=y | ||
| 342 | CONFIG_NSLOOKUP=y | ||
| 343 | CONFIG_PING=y | ||
| 344 | CONFIG_FEATURE_FANCY_PING=y | ||
| 345 | CONFIG_ROUTE=y | ||
| 346 | CONFIG_TELNET=y | ||
| 347 | # CONFIG_FEATURE_TELNET_TTYPE is not set | ||
| 348 | # CONFIG_FEATURE_TELNET_AUTOLOGIN is not set | ||
| 349 | # CONFIG_TELNETD is not set | ||
| 350 | # CONFIG_TFTP is not set | ||
| 351 | CONFIG_TRACEROUTE=y | ||
| 352 | # CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set | ||
| 353 | # CONFIG_VCONFIG is not set | ||
| 354 | CONFIG_WGET=y | ||
| 355 | # CONFIG_FEATURE_WGET_STATUSBAR is not set | ||
| 356 | CONFIG_FEATURE_WGET_AUTHENTICATION=y | ||
| 357 | # CONFIG_FEATURE_WGET_IP6_LITERAL is not set | ||
| 358 | |||
| 359 | # | ||
| 360 | # udhcp Server/Client | ||
| 361 | # | ||
| 362 | # CONFIG_UDHCPD is not set | ||
| 363 | CONFIG_UDHCPC=y | ||
| 364 | CONFIG_FEATURE_UDHCP_SYSLOG=y | ||
| 365 | # CONFIG_FEATURE_UDHCP_DEBUG is not set | ||
| 366 | |||
| 367 | # | ||
| 368 | # Process Utilities | ||
| 369 | # | ||
| 370 | CONFIG_FREE=y | ||
| 371 | CONFIG_KILL=y | ||
| 372 | CONFIG_KILLALL=y | ||
| 373 | # CONFIG_PIDOF is not set | ||
| 374 | CONFIG_PS=y | ||
| 375 | CONFIG_RENICE=y | ||
| 376 | CONFIG_TOP=y | ||
| 377 | FEATURE_CPU_USAGE_PERCENTAGE=y | ||
| 378 | CONFIG_UPTIME=y | ||
| 379 | # CONFIG_SYSCTL is not set | ||
| 380 | |||
| 381 | # | ||
| 382 | # Another Bourne-like Shell | ||
| 383 | # | ||
| 384 | CONFIG_FEATURE_SH_IS_ASH=y | ||
| 385 | # CONFIG_FEATURE_SH_IS_HUSH is not set | ||
| 386 | # CONFIG_FEATURE_SH_IS_LASH is not set | ||
| 387 | # CONFIG_FEATURE_SH_IS_MSH is not set | ||
| 388 | # CONFIG_FEATURE_SH_IS_NONE is not set | ||
| 389 | CONFIG_ASH=y | ||
| 390 | |||
| 391 | # | ||
| 392 | # Ash Shell Options | ||
| 393 | # | ||
| 394 | CONFIG_ASH_JOB_CONTROL=y | ||
| 395 | CONFIG_ASH_ALIAS=y | ||
| 396 | CONFIG_ASH_MATH_SUPPORT=y | ||
| 397 | # CONFIG_ASH_MATH_SUPPORT_64 is not set | ||
| 398 | CONFIG_ASH_GETOPTS=y | ||
| 399 | # CONFIG_ASH_CMDCMD is not set | ||
| 400 | # CONFIG_ASH_MAIL is not set | ||
| 401 | # CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set | ||
| 402 | # CONFIG_ASH_RANDOM_SUPPORT is not set | ||
| 403 | # CONFIG_HUSH is not set | ||
| 404 | # CONFIG_LASH is not set | ||
| 405 | # CONFIG_MSH is not set | ||
| 406 | |||
| 407 | # | ||
| 408 | # Bourne Shell Options | ||
| 409 | # | ||
| 410 | CONFIG_FEATURE_SH_EXTRA_QUIET=y | ||
| 411 | # CONFIG_FEATURE_SH_STANDALONE_SHELL is not set | ||
| 412 | CONFIG_FEATURE_COMMAND_EDITING=y | ||
| 413 | CONFIG_FEATURE_COMMAND_HISTORY=31 | ||
| 414 | # CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set | ||
| 415 | CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y | ||
| 416 | # CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set | ||
| 417 | CONFIG_FEATURE_SH_FANCY_PROMPT=y | ||
| 418 | |||
| 419 | # | ||
| 420 | # System Logging Utilities | ||
| 421 | # | ||
| 422 | CONFIG_SYSLOGD=y | ||
| 423 | # CONFIG_FEATURE_ROTATE_LOGFILE is not set | ||
| 424 | # CONFIG_FEATURE_REMOTE_LOG is not set | ||
| 425 | CONFIG_FEATURE_IPC_SYSLOG=y | ||
| 426 | CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 | ||
| 427 | CONFIG_LOGREAD=y | ||
| 428 | # CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set | ||
| 429 | CONFIG_KLOGD=y | ||
| 430 | CONFIG_LOGGER=y | ||
| 431 | |||
| 432 | # | ||
| 433 | # Linux System Utilities | ||
| 434 | # | ||
| 435 | CONFIG_DMESG=y | ||
| 436 | # CONFIG_FBSET is not set | ||
| 437 | # CONFIG_FDFLUSH is not set | ||
| 438 | # CONFIG_FDFORMAT is not set | ||
| 439 | CONFIG_FDISK=y | ||
| 440 | # FDISK_SUPPORT_LARGE_DISKS is not set | ||
| 441 | CONFIG_FEATURE_FDISK_WRITABLE=y | ||
| 442 | # CONFIG_FEATURE_AIX_LABEL is not set | ||
| 443 | # CONFIG_FEATURE_SGI_LABEL is not set | ||
| 444 | # CONFIG_FEATURE_SUN_LABEL is not set | ||
| 445 | # CONFIG_FEATURE_OSF_LABEL is not set | ||
| 446 | # CONFIG_FEATURE_FDISK_ADVANCED is not set | ||
| 447 | # CONFIG_FREERAMDISK is not set | ||
| 448 | # CONFIG_FSCK_MINIX is not set | ||
| 449 | # CONFIG_MKFS_MINIX is not set | ||
| 450 | CONFIG_GETOPT=y | ||
| 451 | CONFIG_HEXDUMP=y | ||
| 452 | CONFIG_HWCLOCK=y | ||
| 453 | CONFIG_FEATURE_HWCLOCK_LONGOPTIONS=y | ||
| 454 | CONFIG_LOSETUP=y | ||
| 455 | CONFIG_MKSWAP=y | ||
| 456 | CONFIG_MORE=y | ||
| 457 | CONFIG_FEATURE_USE_TERMIOS=y | ||
| 458 | CONFIG_PIVOT_ROOT=y | ||
| 459 | # CONFIG_RDATE is not set | ||
| 460 | # CONFIG_SWAPONOFF is not set | ||
| 461 | CONFIG_MOUNT=y | ||
| 462 | CONFIG_NFSMOUNT=y | ||
| 463 | CONFIG_UMOUNT=y | ||
| 464 | CONFIG_FEATURE_MOUNT_FORCE=y | ||
| 465 | |||
| 466 | # | ||
| 467 | # Common options for mount/umount | ||
| 468 | # | ||
| 469 | CONFIG_FEATURE_MOUNT_LOOP=y | ||
| 470 | # CONFIG_FEATURE_MTAB_SUPPORT is not set | ||
| 471 | |||
| 472 | # | ||
| 473 | # Debugging Options | ||
| 474 | # | ||
| 475 | # CONFIG_DEBUG is not set | ||
diff --git a/meta/packages/busybox/busybox-1.01/openzaurus/defconfig b/meta/packages/busybox/busybox-1.01/openzaurus/defconfig deleted file mode 100644 index 34a5804a4d..0000000000 --- a/meta/packages/busybox/busybox-1.01/openzaurus/defconfig +++ /dev/null | |||
| @@ -1,475 +0,0 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # | ||
| 4 | HAVE_DOT_CONFIG=y | ||
| 5 | |||
| 6 | # | ||
| 7 | # General Configuration | ||
| 8 | # | ||
| 9 | # CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set | ||
| 10 | CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y | ||
| 11 | # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set | ||
| 12 | # CONFIG_FEATURE_VERBOSE_USAGE is not set | ||
| 13 | # CONFIG_FEATURE_INSTALLER is not set | ||
| 14 | # CONFIG_LOCALE_SUPPORT is not set | ||
| 15 | # CONFIG_FEATURE_DEVFS is not set | ||
| 16 | CONFIG_FEATURE_DEVPTS=y | ||
| 17 | # CONFIG_FEATURE_CLEAN_UP is not set | ||
| 18 | # CONFIG_FEATURE_SUID is not set | ||
| 19 | # CONFIG_SELINUX is not set | ||
| 20 | |||
| 21 | # | ||
| 22 | # Build Options | ||
| 23 | # | ||
| 24 | # CONFIG_STATIC is not set | ||
| 25 | CONFIG_LFS=y | ||
| 26 | # USING_CROSS_COMPILER is not set | ||
| 27 | EXTRA_CFLAGS_OPTIONS="" | ||
| 28 | |||
| 29 | # | ||
| 30 | # Installation Options | ||
| 31 | # | ||
| 32 | # CONFIG_INSTALL_NO_USR is not set | ||
| 33 | PREFIX="./_install" | ||
| 34 | |||
| 35 | # | ||
| 36 | # Archival Utilities | ||
| 37 | # | ||
| 38 | CONFIG_AR=y | ||
| 39 | # CONFIG_FEATURE_AR_LONG_FILENAMES is not set | ||
| 40 | CONFIG_BUNZIP2=y | ||
| 41 | CONFIG_CPIO=y | ||
| 42 | # CONFIG_DPKG is not set | ||
| 43 | # CONFIG_DPKG_DEB is not set | ||
| 44 | CONFIG_GUNZIP=y | ||
| 45 | # CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set | ||
| 46 | CONFIG_GZIP=y | ||
| 47 | # CONFIG_RPM2CPIO is not set | ||
| 48 | # CONFIG_RPM is not set | ||
| 49 | CONFIG_TAR=y | ||
| 50 | CONFIG_FEATURE_TAR_CREATE=y | ||
| 51 | CONFIG_FEATURE_TAR_BZIP2=y | ||
| 52 | CONFIG_FEATURE_TAR_FROM=y | ||
| 53 | CONFIG_FEATURE_TAR_GZIP=y | ||
| 54 | # CONFIG_FEATURE_TAR_COMPRESS is not set | ||
| 55 | CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY=y | ||
| 56 | CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y | ||
| 57 | # CONFIG_FEATURE_TAR_LONG_OPTIONS is not set | ||
| 58 | # CONFIG_UNCOMPRESS is not set | ||
| 59 | # CONFIG_UNZIP is not set | ||
| 60 | |||
| 61 | # | ||
| 62 | # Common options for cpio and tar | ||
| 63 | # | ||
| 64 | # CONFIG_FEATURE_UNARCHIVE_TAPE is not set | ||
| 65 | |||
| 66 | # | ||
| 67 | # Coreutils | ||
| 68 | # | ||
| 69 | CONFIG_BASENAME=y | ||
| 70 | # CONFIG_CAL is not set | ||
| 71 | CONFIG_CAT=y | ||
| 72 | CONFIG_CHGRP=y | ||
| 73 | CONFIG_CHMOD=y | ||
| 74 | CONFIG_CHOWN=y | ||
| 75 | CONFIG_CHROOT=y | ||
| 76 | # CONFIG_CMP is not set | ||
| 77 | CONFIG_CP=y | ||
| 78 | CONFIG_CUT=y | ||
| 79 | CONFIG_DATE=y | ||
| 80 | |||
| 81 | # | ||
| 82 | # date (forced enabled for use with watch) | ||
| 83 | # | ||
| 84 | # CONFIG_FEATURE_DATE_ISOFMT is not set | ||
| 85 | CONFIG_DD=y | ||
| 86 | CONFIG_DF=y | ||
| 87 | CONFIG_DIRNAME=y | ||
| 88 | # CONFIG_DOS2UNIX is not set | ||
| 89 | CONFIG_DU=y | ||
| 90 | CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y | ||
| 91 | CONFIG_ECHO=y | ||
| 92 | CONFIG_FEATURE_FANCY_ECHO=y | ||
| 93 | CONFIG_ENV=y | ||
| 94 | CONFIG_EXPR=y | ||
| 95 | CONFIG_FALSE=y | ||
| 96 | # CONFIG_FOLD is not set | ||
| 97 | CONFIG_HEAD=y | ||
| 98 | # CONFIG_FEATURE_FANCY_HEAD is not set | ||
| 99 | # CONFIG_HOSTID is not set | ||
| 100 | CONFIG_ID=y | ||
| 101 | # CONFIG_INSTALL is not set | ||
| 102 | # CONFIG_LENGTH is not set | ||
| 103 | CONFIG_LN=y | ||
| 104 | CONFIG_LOGNAME=y | ||
| 105 | CONFIG_LS=y | ||
| 106 | CONFIG_FEATURE_LS_FILETYPES=y | ||
| 107 | CONFIG_FEATURE_LS_FOLLOWLINKS=y | ||
| 108 | # CONFIG_FEATURE_LS_RECURSIVE is not set | ||
| 109 | CONFIG_FEATURE_LS_SORTFILES=y | ||
| 110 | CONFIG_FEATURE_LS_TIMESTAMPS=y | ||
| 111 | CONFIG_FEATURE_LS_USERNAME=y | ||
| 112 | CONFIG_FEATURE_LS_COLOR=y | ||
| 113 | CONFIG_MD5SUM=y | ||
| 114 | CONFIG_MKDIR=y | ||
| 115 | CONFIG_MKFIFO=y | ||
| 116 | CONFIG_MKNOD=y | ||
| 117 | CONFIG_MV=y | ||
| 118 | CONFIG_OD=y | ||
| 119 | CONFIG_PRINTF=y | ||
| 120 | CONFIG_PWD=y | ||
| 121 | # CONFIG_REALPATH is not set | ||
| 122 | CONFIG_RM=y | ||
| 123 | CONFIG_RMDIR=y | ||
| 124 | CONFIG_SEQ=y | ||
| 125 | # CONFIG_SHA1SUM is not set | ||
| 126 | CONFIG_SLEEP=y | ||
| 127 | # CONFIG_FEATURE_FANCY_SLEEP is not set | ||
| 128 | CONFIG_SORT=y | ||
| 129 | CONFIG_STTY=y | ||
| 130 | CONFIG_SYNC=y | ||
| 131 | CONFIG_TAIL=y | ||
| 132 | CONFIG_FEATURE_FANCY_TAIL=y | ||
| 133 | CONFIG_TEE=y | ||
| 134 | # CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set | ||
| 135 | CONFIG_TEST=y | ||
| 136 | |||
| 137 | # | ||
| 138 | # test (forced enabled for use with shell) | ||
| 139 | # | ||
| 140 | # CONFIG_FEATURE_TEST_64 is not set | ||
| 141 | CONFIG_TOUCH=y | ||
| 142 | CONFIG_TR=y | ||
| 143 | CONFIG_TRUE=y | ||
| 144 | CONFIG_TTY=y | ||
| 145 | CONFIG_UNAME=y | ||
| 146 | CONFIG_UNIQ=y | ||
| 147 | # CONFIG_USLEEP is not set | ||
| 148 | # CONFIG_UUDECODE is not set | ||
| 149 | # CONFIG_UUENCODE is not set | ||
| 150 | CONFIG_WATCH=y | ||
| 151 | CONFIG_WC=y | ||
| 152 | CONFIG_WHO=y | ||
| 153 | CONFIG_WHOAMI=y | ||
| 154 | CONFIG_YES=y | ||
| 155 | |||
| 156 | # | ||
| 157 | # Common options for cp and mv | ||
| 158 | # | ||
| 159 | # CONFIG_FEATURE_PRESERVE_HARDLINKS is not set | ||
| 160 | |||
| 161 | # | ||
| 162 | # Common options for ls and more | ||
| 163 | # | ||
| 164 | CONFIG_FEATURE_AUTOWIDTH=y | ||
| 165 | |||
| 166 | # | ||
| 167 | # Common options for df, du, ls | ||
| 168 | # | ||
| 169 | CONFIG_FEATURE_HUMAN_READABLE=y | ||
| 170 | |||
| 171 | # | ||
| 172 | # Common options for md5sum, sha1sum | ||
| 173 | # | ||
| 174 | # CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set | ||
| 175 | |||
| 176 | # | ||
| 177 | # Console Utilities | ||
| 178 | # | ||
| 179 | CONFIG_CHVT=y | ||
| 180 | CONFIG_CLEAR=y | ||
| 181 | CONFIG_DEALLOCVT=y | ||
| 182 | # CONFIG_DUMPKMAP is not set | ||
| 183 | CONFIG_GETKEY=y | ||
| 184 | # CONFIG_LOADFONT is not set | ||
| 185 | # CONFIG_LOADKMAP is not set | ||
| 186 | CONFIG_OPENVT=y | ||
| 187 | CONFIG_RESET=y | ||
| 188 | # CONFIG_SETKEYCODES is not set | ||
| 189 | |||
| 190 | # | ||
| 191 | # Debian Utilities | ||
| 192 | # | ||
| 193 | CONFIG_MKTEMP=y | ||
| 194 | # CONFIG_PIPE_PROGRESS is not set | ||
| 195 | CONFIG_READLINK=y | ||
| 196 | CONFIG_FEATURE_READLINK_FOLLOW=y | ||
| 197 | CONFIG_RUN_PARTS=y | ||
| 198 | CONFIG_START_STOP_DAEMON=y | ||
| 199 | CONFIG_WHICH=y | ||
| 200 | |||
| 201 | # | ||
| 202 | # Editors | ||
| 203 | # | ||
| 204 | CONFIG_AWK=y | ||
| 205 | CONFIG_FEATURE_AWK_MATH=y | ||
| 206 | # CONFIG_PATCH is not set | ||
| 207 | CONFIG_SED=y | ||
| 208 | CONFIG_VI=y | ||
| 209 | CONFIG_FEATURE_VI_COLON=y | ||
| 210 | CONFIG_FEATURE_VI_YANKMARK=y | ||
| 211 | CONFIG_FEATURE_VI_SEARCH=y | ||
| 212 | CONFIG_FEATURE_VI_USE_SIGNALS=y | ||
| 213 | # CONFIG_FEATURE_VI_DOT_CMD is not set | ||
| 214 | # CONFIG_FEATURE_VI_READONLY is not set | ||
| 215 | # CONFIG_FEATURE_VI_SETOPTS is not set | ||
| 216 | # CONFIG_FEATURE_VI_SET is not set | ||
| 217 | CONFIG_FEATURE_VI_WIN_RESIZE=y | ||
| 218 | CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y | ||
| 219 | |||
| 220 | # | ||
| 221 | # Finding Utilities | ||
| 222 | # | ||
| 223 | CONFIG_FIND=y | ||
| 224 | CONFIG_FEATURE_FIND_MTIME=y | ||
| 225 | CONFIG_FEATURE_FIND_PERM=y | ||
| 226 | CONFIG_FEATURE_FIND_TYPE=y | ||
| 227 | CONFIG_FEATURE_FIND_XDEV=y | ||
| 228 | CONFIG_FEATURE_FIND_NEWER=y | ||
| 229 | # CONFIG_FEATURE_FIND_INUM is not set | ||
| 230 | CONFIG_GREP=y | ||
| 231 | CONFIG_FEATURE_GREP_EGREP_ALIAS=y | ||
| 232 | CONFIG_FEATURE_GREP_FGREP_ALIAS=y | ||
| 233 | CONFIG_FEATURE_GREP_CONTEXT=y | ||
| 234 | CONFIG_XARGS=y | ||
| 235 | # CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set | ||
| 236 | # CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set | ||
| 237 | # CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set | ||
| 238 | # CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set | ||
| 239 | |||
| 240 | # | ||
| 241 | # Init Utilities | ||
| 242 | # | ||
| 243 | # CONFIG_INIT is not set | ||
| 244 | # CONFIG_HALT is not set | ||
| 245 | # CONFIG_POWEROFF is not set | ||
| 246 | # CONFIG_REBOOT is not set | ||
| 247 | # CONFIG_MESG is not set | ||
| 248 | |||
| 249 | # | ||
| 250 | # Login/Password Management Utilities | ||
| 251 | # | ||
| 252 | # CONFIG_USE_BB_PWD_GRP is not set | ||
| 253 | # CONFIG_ADDGROUP is not set | ||
| 254 | # CONFIG_DELGROUP is not set | ||
| 255 | # CONFIG_ADDUSER is not set | ||
| 256 | # CONFIG_DELUSER is not set | ||
| 257 | # CONFIG_GETTY is not set | ||
| 258 | CONFIG_FEATURE_U_W_TMP=y | ||
| 259 | # CONFIG_LOGIN is not set | ||
| 260 | # CONFIG_PASSWD is not set | ||
| 261 | # CONFIG_SU is not set | ||
| 262 | # CONFIG_SULOGIN is not set | ||
| 263 | # CONFIG_VLOCK is not set | ||
| 264 | |||
| 265 | # | ||
| 266 | # Miscellaneous Utilities | ||
| 267 | # | ||
| 268 | # CONFIG_ADJTIMEX is not set | ||
| 269 | # CONFIG_CROND is not set | ||
| 270 | # CONFIG_CRONTAB is not set | ||
| 271 | CONFIG_DC=y | ||
| 272 | # CONFIG_DEVFSD is not set | ||
| 273 | # CONFIG_LAST is not set | ||
| 274 | # CONFIG_HDPARM is not set | ||
| 275 | # CONFIG_MAKEDEVS is not set | ||
| 276 | # CONFIG_MT is not set | ||
| 277 | # CONFIG_RX is not set | ||
| 278 | CONFIG_STRINGS=y | ||
| 279 | # CONFIG_TIME is not set | ||
| 280 | # CONFIG_WATCHDOG is not set | ||
| 281 | |||
| 282 | # | ||
| 283 | # Linux Module Utilities | ||
| 284 | # | ||
| 285 | CONFIG_INSMOD=y | ||
| 286 | CONFIG_FEATURE_2_4_MODULES=y | ||
| 287 | CONFIG_FEATURE_2_6_MODULES=y | ||
| 288 | # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set | ||
| 289 | CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y | ||
| 290 | # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set | ||
| 291 | CONFIG_FEATURE_INSMOD_LOAD_MAP=y | ||
| 292 | CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL=y | ||
| 293 | CONFIG_LSMOD=y | ||
| 294 | CONFIG_MODPROBE=y | ||
| 295 | CONFIG_RMMOD=y | ||
| 296 | CONFIG_FEATURE_CHECK_TAINTED_MODULE=y | ||
| 297 | |||
| 298 | # | ||
| 299 | # Networking Utilities | ||
| 300 | # | ||
| 301 | CONFIG_FEATURE_IPV6=y | ||
| 302 | # CONFIG_ARPING is not set | ||
| 303 | # CONFIG_FTPGET is not set | ||
| 304 | # CONFIG_FTPPUT is not set | ||
| 305 | CONFIG_HOSTNAME=y | ||
| 306 | # CONFIG_HTTPD is not set | ||
| 307 | CONFIG_IFCONFIG=y | ||
| 308 | CONFIG_FEATURE_IFCONFIG_STATUS=y | ||
| 309 | # CONFIG_FEATURE_IFCONFIG_SLIP is not set | ||
| 310 | # CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set | ||
| 311 | CONFIG_FEATURE_IFCONFIG_HW=y | ||
| 312 | # CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set | ||
| 313 | CONFIG_IFUPDOWN=y | ||
| 314 | # CONFIG_FEATURE_IFUPDOWN_IP is not set | ||
| 315 | CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y | ||
| 316 | CONFIG_FEATURE_IFUPDOWN_IPV4=y | ||
| 317 | CONFIG_FEATURE_IFUPDOWN_IPV6=y | ||
| 318 | # CONFIG_FEATURE_IFUPDOWN_IPX is not set | ||
| 319 | CONFIG_FEATURE_IFUPDOWN_MAPPING=y | ||
| 320 | # CONFIG_INETD is not set | ||
| 321 | CONFIG_IP=y | ||
| 322 | CONFIG_FEATURE_IP_ADDRESS=y | ||
| 323 | CONFIG_FEATURE_IP_LINK=y | ||
| 324 | CONFIG_FEATURE_IP_ROUTE=y | ||
| 325 | CONFIG_FEATURE_IP_TUNNEL=y | ||
| 326 | # CONFIG_IPCALC is not set | ||
| 327 | # CONFIG_IPADDR is not set | ||
| 328 | # CONFIG_IPLINK is not set | ||
| 329 | # CONFIG_IPROUTE is not set | ||
| 330 | # CONFIG_IPTUNNEL is not set | ||
| 331 | # CONFIG_NAMEIF is not set | ||
| 332 | CONFIG_NC=y | ||
| 333 | CONFIG_NETSTAT=y | ||
| 334 | CONFIG_NSLOOKUP=y | ||
| 335 | CONFIG_PING=y | ||
| 336 | CONFIG_FEATURE_FANCY_PING=y | ||
| 337 | CONFIG_PING6=y | ||
| 338 | CONFIG_FEATURE_FANCY_PING6=y | ||
| 339 | CONFIG_ROUTE=y | ||
| 340 | CONFIG_TELNET=y | ||
| 341 | # CONFIG_FEATURE_TELNET_TTYPE is not set | ||
| 342 | CONFIG_FEATURE_TELNET_AUTOLOGIN=y | ||
| 343 | # CONFIG_TELNETD is not set | ||
| 344 | CONFIG_TFTP=y | ||
| 345 | CONFIG_FEATURE_TFTP_GET=y | ||
| 346 | CONFIG_FEATURE_TFTP_PUT=y | ||
| 347 | # CONFIG_FEATURE_TFTP_BLOCKSIZE is not set | ||
| 348 | # CONFIG_FEATURE_TFTP_DEBUG is not set | ||
| 349 | CONFIG_TRACEROUTE=y | ||
| 350 | # CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set | ||
| 351 | # CONFIG_VCONFIG is not set | ||
| 352 | CONFIG_WGET=y | ||
| 353 | CONFIG_FEATURE_WGET_STATUSBAR=y | ||
| 354 | CONFIG_FEATURE_WGET_AUTHENTICATION=y | ||
| 355 | CONFIG_FEATURE_WGET_IP6_LITERAL=y | ||
| 356 | |||
| 357 | # | ||
| 358 | # udhcp Server/Client | ||
| 359 | # | ||
| 360 | # CONFIG_UDHCPD is not set | ||
| 361 | CONFIG_UDHCPC=y | ||
| 362 | CONFIG_FEATURE_UDHCP_SYSLOG=y | ||
| 363 | # CONFIG_FEATURE_UDHCP_DEBUG is not set | ||
| 364 | |||
| 365 | # | ||
| 366 | # Process Utilities | ||
| 367 | # | ||
| 368 | CONFIG_FREE=y | ||
| 369 | CONFIG_KILL=y | ||
| 370 | CONFIG_KILLALL=y | ||
| 371 | # CONFIG_PIDOF is not set | ||
| 372 | CONFIG_PS=y | ||
| 373 | CONFIG_RENICE=y | ||
| 374 | CONFIG_TOP=y | ||
| 375 | FEATURE_CPU_USAGE_PERCENTAGE=y | ||
| 376 | CONFIG_UPTIME=y | ||
| 377 | # CONFIG_SYSCTL is not set | ||
| 378 | |||
| 379 | # | ||
| 380 | # Another Bourne-like Shell | ||
| 381 | # | ||
| 382 | CONFIG_FEATURE_SH_IS_ASH=y | ||
| 383 | # CONFIG_FEATURE_SH_IS_HUSH is not set | ||
| 384 | # CONFIG_FEATURE_SH_IS_LASH is not set | ||
| 385 | # CONFIG_FEATURE_SH_IS_MSH is not set | ||
| 386 | # CONFIG_FEATURE_SH_IS_NONE is not set | ||
| 387 | CONFIG_ASH=y | ||
| 388 | |||
| 389 | # | ||
| 390 | # Ash Shell Options | ||
| 391 | # | ||
| 392 | CONFIG_ASH_JOB_CONTROL=y | ||
| 393 | CONFIG_ASH_ALIAS=y | ||
| 394 | CONFIG_ASH_MATH_SUPPORT=y | ||
| 395 | # CONFIG_ASH_MATH_SUPPORT_64 is not set | ||
| 396 | CONFIG_ASH_GETOPTS=y | ||
| 397 | # CONFIG_ASH_CMDCMD is not set | ||
| 398 | # CONFIG_ASH_MAIL is not set | ||
| 399 | CONFIG_ASH_OPTIMIZE_FOR_SIZE=y | ||
| 400 | # CONFIG_ASH_RANDOM_SUPPORT is not set | ||
| 401 | # CONFIG_HUSH is not set | ||
| 402 | # CONFIG_LASH is not set | ||
| 403 | # CONFIG_MSH is not set | ||
| 404 | |||
| 405 | # | ||
| 406 | # Bourne Shell Options | ||
| 407 | # | ||
| 408 | CONFIG_FEATURE_SH_EXTRA_QUIET=y | ||
| 409 | # CONFIG_FEATURE_SH_STANDALONE_SHELL is not set | ||
| 410 | CONFIG_FEATURE_COMMAND_EDITING=y | ||
| 411 | CONFIG_FEATURE_COMMAND_HISTORY=63 | ||
| 412 | # CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set | ||
| 413 | CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y | ||
| 414 | # CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set | ||
| 415 | CONFIG_FEATURE_SH_FANCY_PROMPT=y | ||
| 416 | |||
| 417 | # | ||
| 418 | # System Logging Utilities | ||
| 419 | # | ||
| 420 | CONFIG_SYSLOGD=y | ||
| 421 | # CONFIG_FEATURE_ROTATE_LOGFILE is not set | ||
| 422 | CONFIG_FEATURE_REMOTE_LOG=y | ||
| 423 | CONFIG_FEATURE_IPC_SYSLOG=y | ||
| 424 | CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 | ||
| 425 | CONFIG_LOGREAD=y | ||
| 426 | # CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set | ||
| 427 | CONFIG_KLOGD=y | ||
| 428 | CONFIG_LOGGER=y | ||
| 429 | |||
| 430 | # | ||
| 431 | # Linux System Utilities | ||
| 432 | # | ||
| 433 | CONFIG_DMESG=y | ||
| 434 | CONFIG_FBSET=y | ||
| 435 | CONFIG_FEATURE_FBSET_FANCY=y | ||
| 436 | # CONFIG_FEATURE_FBSET_READMODE is not set | ||
| 437 | # CONFIG_FDFLUSH is not set | ||
| 438 | # CONFIG_FDFORMAT is not set | ||
| 439 | CONFIG_FDISK=y | ||
| 440 | FDISK_SUPPORT_LARGE_DISKS=y | ||
| 441 | CONFIG_FEATURE_FDISK_WRITABLE=y | ||
| 442 | # CONFIG_FEATURE_AIX_LABEL is not set | ||
| 443 | # CONFIG_FEATURE_SGI_LABEL is not set | ||
| 444 | # CONFIG_FEATURE_SUN_LABEL is not set | ||
| 445 | # CONFIG_FEATURE_OSF_LABEL is not set | ||
| 446 | # CONFIG_FEATURE_FDISK_ADVANCED is not set | ||
| 447 | # CONFIG_FREERAMDISK is not set | ||
| 448 | # CONFIG_FSCK_MINIX is not set | ||
| 449 | # CONFIG_MKFS_MINIX is not set | ||
| 450 | # CONFIG_GETOPT is not set | ||
| 451 | CONFIG_HEXDUMP=y | ||
| 452 | CONFIG_HWCLOCK=y | ||
| 453 | CONFIG_FEATURE_HWCLOCK_LONGOPTIONS=y | ||
| 454 | CONFIG_LOSETUP=y | ||
| 455 | CONFIG_MKSWAP=y | ||
| 456 | CONFIG_MORE=y | ||
| 457 | CONFIG_FEATURE_USE_TERMIOS=y | ||
| 458 | CONFIG_PIVOT_ROOT=y | ||
| 459 | # CONFIG_RDATE is not set | ||
| 460 | CONFIG_SWAPONOFF=y | ||
| 461 | CONFIG_MOUNT=y | ||
| 462 | CONFIG_NFSMOUNT=y | ||
| 463 | CONFIG_UMOUNT=y | ||
| 464 | CONFIG_FEATURE_MOUNT_FORCE=y | ||
| 465 | |||
| 466 | # | ||
| 467 | # Common options for mount/umount | ||
| 468 | # | ||
| 469 | CONFIG_FEATURE_MOUNT_LOOP=y | ||
| 470 | # CONFIG_FEATURE_MTAB_SUPPORT is not set | ||
| 471 | |||
| 472 | # | ||
| 473 | # Debugging Options | ||
| 474 | # | ||
| 475 | # CONFIG_DEBUG is not set | ||
diff --git a/meta/packages/busybox/busybox-1.01/readlink.patch b/meta/packages/busybox/busybox-1.01/readlink.patch deleted file mode 100644 index 0c5431085a..0000000000 --- a/meta/packages/busybox/busybox-1.01/readlink.patch +++ /dev/null | |||
| @@ -1,85 +0,0 @@ | |||
| 1 | diff -p -u -r1.7 Config.in | ||
| 2 | --- busybox-1.00/debianutils/Config.in 15 Mar 2004 08:28:24 -0000 1.7 | ||
| 3 | +++ busybox-1.00-patched/debianutils/Config.in 16 Nov 2004 11:46:41 -0000 | ||
| 4 | @@ -24,6 +24,13 @@ config CONFIG_READLINK | ||
| 5 | This program reads a symbolic link and returns the name | ||
| 6 | of the file it points to | ||
| 7 | |||
| 8 | +config CONFIG_FEATURE_READLINK_FOLLOW | ||
| 9 | + bool " Enable canonicalization by following all symlinks (-f)" | ||
| 10 | + default n | ||
| 11 | + depends on CONFIG_READLINK | ||
| 12 | + help | ||
| 13 | + Enable the readlink option (-f). | ||
| 14 | + | ||
| 15 | config CONFIG_RUN_PARTS | ||
| 16 | bool "run-parts" | ||
| 17 | default n | ||
| 18 | diff -p -u -r1.2 readlink.c | ||
| 19 | --- busybox-1.00/debianutils/readlink.c 19 Mar 2003 09:11:41 -0000 1.2 | ||
| 20 | +++ busybox-1.00-patched/debianutils/readlink.c 16 Nov 2004 11:46:41 -0000 | ||
| 21 | @@ -23,18 +23,38 @@ | ||
| 22 | #include <errno.h> | ||
| 23 | #include <unistd.h> | ||
| 24 | #include <stdlib.h> | ||
| 25 | +#include <getopt.h> | ||
| 26 | #include "busybox.h" | ||
| 27 | |||
| 28 | +#ifdef CONFIG_FEATURE_READLINK_FOLLOW | ||
| 29 | +# define READLINK_FOLLOW "f" | ||
| 30 | +# define READLINK_FLAG_f (1 << 0) | ||
| 31 | +#else | ||
| 32 | +# define READLINK_FOLLOW "" | ||
| 33 | +#endif | ||
| 34 | + | ||
| 35 | +static const char readlink_options[] = READLINK_FOLLOW; | ||
| 36 | + | ||
| 37 | int readlink_main(int argc, char **argv) | ||
| 38 | { | ||
| 39 | char *buf = NULL; | ||
| 40 | + unsigned long opt = bb_getopt_ulflags(argc, argv, readlink_options); | ||
| 41 | +#ifdef CONFIG_FEATURE_READLINK_FOLLOW | ||
| 42 | + RESERVE_CONFIG_BUFFER(resolved_path, PATH_MAX); | ||
| 43 | +#endif | ||
| 44 | |||
| 45 | /* no options, no getopt */ | ||
| 46 | |||
| 47 | - if (argc != 2) | ||
| 48 | + if (optind + 1 != argc) | ||
| 49 | bb_show_usage(); | ||
| 50 | |||
| 51 | - buf = xreadlink(argv[1]); | ||
| 52 | +#ifdef CONFIG_FEATURE_READLINK_FOLLOW | ||
| 53 | + if (opt & READLINK_FLAG_f) { | ||
| 54 | + buf = realpath(argv[optind], resolved_path); | ||
| 55 | + } else | ||
| 56 | +#endif | ||
| 57 | + buf = xreadlink(argv[optind]); | ||
| 58 | + | ||
| 59 | if (!buf) | ||
| 60 | return EXIT_FAILURE; | ||
| 61 | puts(buf); | ||
| 62 | diff -p -u -r1.222 usage.h | ||
| 63 | --- busybox-1.00/include/usage.h 14 Sep 2004 16:23:56 -0000 1.222 | ||
| 64 | +++ busybox-1.00-patched/include/usage.h 16 Nov 2004 11:46:42 -0000 | ||
| 65 | @@ -1985,10 +1985,18 @@ | ||
| 66 | "\t-s\tSet the system date and time (default).\n" \ | ||
| 67 | "\t-p\tPrint the date and time." | ||
| 68 | |||
| 69 | +#ifdef CONFIG_FEATURE_READLINK_FOLLOW | ||
| 70 | +#define USAGE_READLINK_FOLLOW(a) a | ||
| 71 | +#else | ||
| 72 | +#define USAGE_READLINK_FOLLOW(a) | ||
| 73 | +#endif | ||
| 74 | + | ||
| 75 | #define readlink_trivial_usage \ | ||
| 76 | - "" | ||
| 77 | + USAGE_READLINK_FOLLOW("[-f] ") "FILE" | ||
| 78 | #define readlink_full_usage \ | ||
| 79 | - "Displays the value of a symbolic link." | ||
| 80 | + "Displays the value of a symbolic link." \ | ||
| 81 | + USAGE_READLINK_FOLLOW("\n\nOptions:\n" \ | ||
| 82 | + "\t-f\tcanonicalize by following all symlinks") | ||
| 83 | |||
| 84 | #define realpath_trivial_usage \ | ||
| 85 | "pathname ..." | ||
diff --git a/meta/packages/busybox/busybox-1.01/rmmod.patch b/meta/packages/busybox/busybox-1.01/rmmod.patch deleted file mode 100644 index 5a557ef35d..0000000000 --- a/meta/packages/busybox/busybox-1.01/rmmod.patch +++ /dev/null | |||
| @@ -1,44 +0,0 @@ | |||
| 1 | Index: modutils/rmmod.c | ||
| 2 | =================================================================== | ||
| 3 | RCS file: /var/cvs/busybox/modutils/rmmod.c,v | ||
| 4 | retrieving revision 1.31 | ||
| 5 | diff -u -r1.31 rmmod.c | ||
| 6 | --- busybox/modutils/rmmod.c 20 Jul 2004 18:36:51 -0000 1.31 | ||
| 7 | +++ busybox/modutils/rmmod.c 10 Dec 2004 22:56:36 -0000 | ||
| 8 | @@ -28,6 +28,7 @@ | ||
| 9 | #include <fcntl.h> | ||
| 10 | #include <string.h> | ||
| 11 | #include <sys/syscall.h> | ||
| 12 | +#include <sys/utsname.h> | ||
| 13 | #include "busybox.h" | ||
| 14 | |||
| 15 | #ifdef CONFIG_FEATURE_2_6_MODULES | ||
| 16 | @@ -63,6 +64,16 @@ | ||
| 17 | void *buf; /* hold the module names which we ignore but must get */ | ||
| 18 | size_t bufsize = 0; | ||
| 19 | #endif | ||
| 20 | +#ifdef CONFIG_FEATURE_2_6_MODULES | ||
| 21 | + int k_version = 0; | ||
| 22 | + struct utsname myuname; | ||
| 23 | + | ||
| 24 | + if (uname(&myuname) == 0) { | ||
| 25 | + if (myuname.release[0] == '2') { | ||
| 26 | + k_version = myuname.release[2] - '0'; | ||
| 27 | + } | ||
| 28 | + } | ||
| 29 | +#endif | ||
| 30 | |||
| 31 | /* Parse command line. */ | ||
| 32 | while ((n = getopt(argc, argv, "a")) != EOF) { | ||
| 33 | @@ -109,7 +120,10 @@ | ||
| 34 | for (n = optind; n < argc; n++) { | ||
| 35 | #ifdef CONFIG_FEATURE_2_6_MODULES | ||
| 36 | char module_name[strlen(argv[n]) + 1]; | ||
| 37 | - filename2modname(module_name, argv[n]); | ||
| 38 | + if (k_version != 4) | ||
| 39 | + filename2modname(module_name, argv[n]); | ||
| 40 | + else | ||
| 41 | + strcpy(module_name, argv[n]); | ||
| 42 | #else | ||
| 43 | #define module_name argv[n] | ||
| 44 | #endif | ||
diff --git a/meta/packages/busybox/busybox-1.01/slugos/defconfig b/meta/packages/busybox/busybox-1.01/slugos/defconfig deleted file mode 100644 index 55aa5f3b5e..0000000000 --- a/meta/packages/busybox/busybox-1.01/slugos/defconfig +++ /dev/null | |||
| @@ -1,444 +0,0 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # | ||
| 4 | HAVE_DOT_CONFIG=y | ||
| 5 | |||
| 6 | # | ||
| 7 | # General Configuration | ||
| 8 | # | ||
| 9 | # CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set | ||
| 10 | CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y | ||
| 11 | # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set | ||
| 12 | CONFIG_FEATURE_VERBOSE_USAGE=y | ||
| 13 | # CONFIG_FEATURE_INSTALLER is not set | ||
| 14 | # CONFIG_LOCALE_SUPPORT is not set | ||
| 15 | # CONFIG_FEATURE_DEVFS is not set | ||
| 16 | CONFIG_FEATURE_DEVPTS=y | ||
| 17 | # CONFIG_FEATURE_CLEAN_UP is not set | ||
| 18 | CONFIG_FEATURE_SUID=y | ||
| 19 | # CONFIG_FEATURE_SUID_CONFIG is not set | ||
| 20 | # CONFIG_SELINUX is not set | ||
| 21 | |||
| 22 | # | ||
| 23 | # Build Options | ||
| 24 | # | ||
| 25 | # CONFIG_STATIC is not set | ||
| 26 | CONFIG_LFS=y | ||
| 27 | # USING_CROSS_COMPILER is not set | ||
| 28 | EXTRA_CFLAGS_OPTIONS="" | ||
| 29 | |||
| 30 | # | ||
| 31 | # Installation Options | ||
| 32 | # | ||
| 33 | # CONFIG_INSTALL_NO_USR is not set | ||
| 34 | PREFIX="./_install" | ||
| 35 | |||
| 36 | # | ||
| 37 | # Archival Utilities | ||
| 38 | # | ||
| 39 | CONFIG_AR=y | ||
| 40 | # CONFIG_FEATURE_AR_LONG_FILENAMES is not set | ||
| 41 | CONFIG_BUNZIP2=y | ||
| 42 | # CONFIG_CPIO is not set | ||
| 43 | # CONFIG_DPKG is not set | ||
| 44 | # CONFIG_DPKG_DEB is not set | ||
| 45 | CONFIG_GUNZIP=y | ||
| 46 | # CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set | ||
| 47 | CONFIG_GZIP=y | ||
| 48 | # CONFIG_RPM2CPIO is not set | ||
| 49 | # CONFIG_RPM is not set | ||
| 50 | CONFIG_TAR=y | ||
| 51 | CONFIG_FEATURE_TAR_CREATE=y | ||
| 52 | CONFIG_FEATURE_TAR_BZIP2=y | ||
| 53 | CONFIG_FEATURE_TAR_FROM=y | ||
| 54 | CONFIG_FEATURE_TAR_GZIP=y | ||
| 55 | # CONFIG_FEATURE_TAR_COMPRESS is not set | ||
| 56 | CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY=y | ||
| 57 | CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y | ||
| 58 | # CONFIG_FEATURE_TAR_LONG_OPTIONS is not set | ||
| 59 | # CONFIG_UNCOMPRESS is not set | ||
| 60 | CONFIG_UNZIP=y | ||
| 61 | |||
| 62 | # | ||
| 63 | # Common options for cpio and tar | ||
| 64 | # | ||
| 65 | # CONFIG_FEATURE_UNARCHIVE_TAPE is not set | ||
| 66 | |||
| 67 | # | ||
| 68 | # Coreutils | ||
| 69 | # | ||
| 70 | CONFIG_BASENAME=y | ||
| 71 | # CONFIG_CAL is not set | ||
| 72 | CONFIG_CAT=y | ||
| 73 | CONFIG_CHGRP=y | ||
| 74 | CONFIG_CHMOD=y | ||
| 75 | CONFIG_CHOWN=y | ||
| 76 | CONFIG_CHROOT=y | ||
| 77 | # CONFIG_CMP is not set | ||
| 78 | CONFIG_CP=y | ||
| 79 | CONFIG_CUT=y | ||
| 80 | CONFIG_DATE=y | ||
| 81 | |||
| 82 | # | ||
| 83 | # date (forced enabled for use with watch) | ||
| 84 | # | ||
| 85 | # CONFIG_FEATURE_DATE_ISOFMT is not set | ||
| 86 | CONFIG_DD=y | ||
| 87 | CONFIG_DF=y | ||
| 88 | CONFIG_DIRNAME=y | ||
| 89 | # CONFIG_DOS2UNIX is not set | ||
| 90 | CONFIG_DU=y | ||
| 91 | CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y | ||
| 92 | CONFIG_ECHO=y | ||
| 93 | CONFIG_FEATURE_FANCY_ECHO=y | ||
| 94 | CONFIG_ENV=y | ||
| 95 | CONFIG_EXPR=y | ||
| 96 | CONFIG_FALSE=y | ||
| 97 | # CONFIG_FOLD is not set | ||
| 98 | CONFIG_HEAD=y | ||
| 99 | CONFIG_FEATURE_FANCY_HEAD=y | ||
| 100 | # CONFIG_HOSTID is not set | ||
| 101 | CONFIG_ID=y | ||
| 102 | # CONFIG_INSTALL is not set | ||
| 103 | # CONFIG_LENGTH is not set | ||
| 104 | CONFIG_LN=y | ||
| 105 | CONFIG_LOGNAME=y | ||
| 106 | CONFIG_LS=y | ||
| 107 | CONFIG_FEATURE_LS_FILETYPES=y | ||
| 108 | CONFIG_FEATURE_LS_FOLLOWLINKS=y | ||
| 109 | CONFIG_FEATURE_LS_RECURSIVE=y | ||
| 110 | CONFIG_FEATURE_LS_SORTFILES=y | ||
| 111 | CONFIG_FEATURE_LS_TIMESTAMPS=y | ||
| 112 | CONFIG_FEATURE_LS_USERNAME=y | ||
| 113 | CONFIG_FEATURE_LS_COLOR=y | ||
| 114 | CONFIG_MD5SUM=y | ||
| 115 | CONFIG_MKDIR=y | ||
| 116 | CONFIG_MKFIFO=y | ||
| 117 | CONFIG_MKNOD=y | ||
| 118 | CONFIG_MV=y | ||
| 119 | CONFIG_OD=y | ||
| 120 | CONFIG_PRINTF=y | ||
| 121 | CONFIG_PWD=y | ||
| 122 | # CONFIG_REALPATH is not set | ||
| 123 | CONFIG_RM=y | ||
| 124 | CONFIG_RMDIR=y | ||
| 125 | CONFIG_SEQ=y | ||
| 126 | # CONFIG_SHA1SUM is not set | ||
| 127 | CONFIG_SLEEP=y | ||
| 128 | # CONFIG_FEATURE_FANCY_SLEEP is not set | ||
| 129 | CONFIG_SORT=y | ||
| 130 | CONFIG_STTY=y | ||
| 131 | CONFIG_SYNC=y | ||
| 132 | CONFIG_TAIL=y | ||
| 133 | CONFIG_FEATURE_FANCY_TAIL=y | ||
| 134 | CONFIG_TEE=y | ||
| 135 | # CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set | ||
| 136 | CONFIG_TEST=y | ||
| 137 | |||
| 138 | # | ||
| 139 | # test (forced enabled for use with shell) | ||
| 140 | # | ||
| 141 | # CONFIG_FEATURE_TEST_64 is not set | ||
| 142 | CONFIG_TOUCH=y | ||
| 143 | CONFIG_TR=y | ||
| 144 | CONFIG_TRUE=y | ||
| 145 | CONFIG_TTY=y | ||
| 146 | CONFIG_UNAME=y | ||
| 147 | CONFIG_UNIQ=y | ||
| 148 | # CONFIG_USLEEP is not set | ||
| 149 | # CONFIG_UUDECODE is not set | ||
| 150 | # CONFIG_UUENCODE is not set | ||
| 151 | CONFIG_WATCH=y | ||
| 152 | CONFIG_WC=y | ||
| 153 | CONFIG_WHO=y | ||
| 154 | CONFIG_WHOAMI=y | ||
| 155 | CONFIG_YES=y | ||
| 156 | |||
| 157 | # | ||
| 158 | # Common options for cp and mv | ||
| 159 | # | ||
| 160 | # CONFIG_FEATURE_PRESERVE_HARDLINKS is not set | ||
| 161 | |||
| 162 | # | ||
| 163 | # Common options for ls and more | ||
| 164 | # | ||
| 165 | CONFIG_FEATURE_AUTOWIDTH=y | ||
| 166 | |||
| 167 | # | ||
| 168 | # Common options for df, du, ls | ||
| 169 | # | ||
| 170 | CONFIG_FEATURE_HUMAN_READABLE=y | ||
| 171 | |||
| 172 | # | ||
| 173 | # Common options for md5sum, sha1sum | ||
| 174 | # | ||
| 175 | # CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set | ||
| 176 | |||
| 177 | # | ||
| 178 | # Console Utilities | ||
| 179 | # | ||
| 180 | # CONFIG_CHVT is not set | ||
| 181 | CONFIG_CLEAR=y | ||
| 182 | # CONFIG_DEALLOCVT is not set | ||
| 183 | # CONFIG_DUMPKMAP is not set | ||
| 184 | CONFIG_GETKEY=y | ||
| 185 | # CONFIG_LOADFONT is not set | ||
| 186 | # CONFIG_LOADKMAP is not set | ||
| 187 | # CONFIG_OPENVT is not set | ||
| 188 | CONFIG_RESET=y | ||
| 189 | # CONFIG_SETKEYCODES is not set | ||
| 190 | |||
| 191 | # | ||
| 192 | # Debian Utilities | ||
| 193 | # | ||
| 194 | CONFIG_MKTEMP=y | ||
| 195 | # CONFIG_PIPE_PROGRESS is not set | ||
| 196 | CONFIG_READLINK=y | ||
| 197 | CONFIG_FEATURE_READLINK_FOLLOW=y | ||
| 198 | CONFIG_RUN_PARTS=y | ||
| 199 | CONFIG_START_STOP_DAEMON=y | ||
| 200 | CONFIG_WHICH=y | ||
| 201 | |||
| 202 | # | ||
| 203 | # Editors | ||
| 204 | # | ||
| 205 | CONFIG_AWK=y | ||
| 206 | CONFIG_FEATURE_AWK_MATH=y | ||
| 207 | # CONFIG_PATCH is not set | ||
| 208 | CONFIG_SED=y | ||
| 209 | CONFIG_VI=y | ||
| 210 | CONFIG_FEATURE_VI_COLON=y | ||
| 211 | CONFIG_FEATURE_VI_YANKMARK=y | ||
| 212 | CONFIG_FEATURE_VI_SEARCH=y | ||
| 213 | CONFIG_FEATURE_VI_USE_SIGNALS=y | ||
| 214 | CONFIG_FEATURE_VI_DOT_CMD=y | ||
| 215 | CONFIG_FEATURE_VI_READONLY=y | ||
| 216 | CONFIG_FEATURE_VI_SETOPTS=y | ||
| 217 | CONFIG_FEATURE_VI_SET=y | ||
| 218 | CONFIG_FEATURE_VI_WIN_RESIZE=y | ||
| 219 | CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y | ||
| 220 | |||
| 221 | # | ||
| 222 | # Finding Utilities | ||
| 223 | # | ||
| 224 | # CONFIG_FIND is not set | ||
| 225 | CONFIG_GREP=y | ||
| 226 | CONFIG_FEATURE_GREP_EGREP_ALIAS=y | ||
| 227 | CONFIG_FEATURE_GREP_FGREP_ALIAS=y | ||
| 228 | CONFIG_FEATURE_GREP_CONTEXT=y | ||
| 229 | # CONFIG_XARGS is not set | ||
| 230 | |||
| 231 | # | ||
| 232 | # Init Utilities | ||
| 233 | # | ||
| 234 | # CONFIG_INIT is not set | ||
| 235 | # CONFIG_HALT is not set | ||
| 236 | # CONFIG_POWEROFF is not set | ||
| 237 | # CONFIG_REBOOT is not set | ||
| 238 | # CONFIG_MESG is not set | ||
| 239 | |||
| 240 | # | ||
| 241 | # Login/Password Management Utilities | ||
| 242 | # | ||
| 243 | # CONFIG_USE_BB_PWD_GRP is not set | ||
| 244 | # CONFIG_ADDGROUP is not set | ||
| 245 | # CONFIG_DELGROUP is not set | ||
| 246 | # CONFIG_ADDUSER is not set | ||
| 247 | # CONFIG_DELUSER is not set | ||
| 248 | # CONFIG_GETTY is not set | ||
| 249 | CONFIG_FEATURE_UTMP=y | ||
| 250 | # CONFIG_LOGIN is not set | ||
| 251 | # CONFIG_PASSWD is not set | ||
| 252 | # CONFIG_SU is not set | ||
| 253 | # CONFIG_SULOGIN is not set | ||
| 254 | # CONFIG_VLOCK is not set | ||
| 255 | |||
| 256 | # | ||
| 257 | # Miscellaneous Utilities | ||
| 258 | # | ||
| 259 | # CONFIG_ADJTIMEX is not set | ||
| 260 | # CONFIG_CROND is not set | ||
| 261 | # CONFIG_CRONTAB is not set | ||
| 262 | # CONFIG_DC is not set | ||
| 263 | # CONFIG_DEVFSD is not set | ||
| 264 | # CONFIG_LAST is not set | ||
| 265 | # CONFIG_HDPARM is not set | ||
| 266 | # CONFIG_MAKEDEVS is not set | ||
| 267 | # CONFIG_MT is not set | ||
| 268 | # CONFIG_RX is not set | ||
| 269 | CONFIG_STRINGS=y | ||
| 270 | CONFIG_TIME=y | ||
| 271 | # CONFIG_WATCHDOG is not set | ||
| 272 | |||
| 273 | # | ||
| 274 | # Linux Module Utilities | ||
| 275 | # | ||
| 276 | # CONFIG_INSMOD is not set | ||
| 277 | # CONFIG_LSMOD is not set | ||
| 278 | # CONFIG_MODPROBE is not set | ||
| 279 | # CONFIG_RMMOD is not set | ||
| 280 | |||
| 281 | # | ||
| 282 | # Networking Utilities | ||
| 283 | # | ||
| 284 | CONFIG_FEATURE_IPV6=y | ||
| 285 | # CONFIG_ARPING is not set | ||
| 286 | # CONFIG_FTPGET is not set | ||
| 287 | # CONFIG_FTPPUT is not set | ||
| 288 | CONFIG_HOSTNAME=y | ||
| 289 | # CONFIG_HTTPD is not set | ||
| 290 | CONFIG_IFCONFIG=y | ||
| 291 | CONFIG_FEATURE_IFCONFIG_STATUS=y | ||
| 292 | # CONFIG_FEATURE_IFCONFIG_SLIP is not set | ||
| 293 | # CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set | ||
| 294 | CONFIG_FEATURE_IFCONFIG_HW=y | ||
| 295 | # CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set | ||
| 296 | CONFIG_IFUPDOWN=y | ||
| 297 | # CONFIG_FEATURE_IFUPDOWN_IP is not set | ||
| 298 | CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y | ||
| 299 | CONFIG_FEATURE_IFUPDOWN_IPV4=y | ||
| 300 | CONFIG_FEATURE_IFUPDOWN_IPV6=y | ||
| 301 | # CONFIG_FEATURE_IFUPDOWN_IPX is not set | ||
| 302 | # CONFIG_FEATURE_IFUPDOWN_MAPPING is not set | ||
| 303 | # CONFIG_INETD is not set | ||
| 304 | # CONFIG_IP is not set | ||
| 305 | # CONFIG_IPCALC is not set | ||
| 306 | # CONFIG_IPADDR is not set | ||
| 307 | # CONFIG_IPLINK is not set | ||
| 308 | # CONFIG_IPROUTE is not set | ||
| 309 | # CONFIG_IPTUNNEL is not set | ||
| 310 | # CONFIG_NAMEIF is not set | ||
| 311 | CONFIG_NC=y | ||
| 312 | CONFIG_NETSTAT=y | ||
| 313 | CONFIG_NSLOOKUP=y | ||
| 314 | CONFIG_PING=y | ||
| 315 | CONFIG_FEATURE_FANCY_PING=y | ||
| 316 | CONFIG_PING6=y | ||
| 317 | CONFIG_FEATURE_FANCY_PING6=y | ||
| 318 | CONFIG_ROUTE=y | ||
| 319 | CONFIG_TELNET=y | ||
| 320 | CONFIG_FEATURE_TELNET_TTYPE=y | ||
| 321 | CONFIG_FEATURE_TELNET_AUTOLOGIN=y | ||
| 322 | # CONFIG_TELNETD is not set | ||
| 323 | CONFIG_TFTP=y | ||
| 324 | CONFIG_FEATURE_TFTP_GET=y | ||
| 325 | CONFIG_FEATURE_TFTP_PUT=y | ||
| 326 | # CONFIG_FEATURE_TFTP_BLOCKSIZE is not set | ||
| 327 | # CONFIG_FEATURE_TFTP_DEBUG is not set | ||
| 328 | CONFIG_TRACEROUTE=y | ||
| 329 | # CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set | ||
| 330 | # CONFIG_VCONFIG is not set | ||
| 331 | CONFIG_WGET=y | ||
| 332 | CONFIG_FEATURE_WGET_STATUSBAR=y | ||
| 333 | CONFIG_FEATURE_WGET_AUTHENTICATION=y | ||
| 334 | CONFIG_FEATURE_WGET_IP6_LITERAL=y | ||
| 335 | |||
| 336 | # | ||
| 337 | # udhcp Server/Client | ||
| 338 | # | ||
| 339 | # CONFIG_UDHCPD is not set | ||
| 340 | CONFIG_UDHCPC=y | ||
| 341 | CONFIG_FEATURE_UDHCP_SYSLOG=y | ||
| 342 | # CONFIG_FEATURE_UDHCP_DEBUG is not set | ||
| 343 | |||
| 344 | # | ||
| 345 | # Process Utilities | ||
| 346 | # | ||
| 347 | CONFIG_FREE=y | ||
| 348 | CONFIG_KILL=y | ||
| 349 | CONFIG_KILLALL=y | ||
| 350 | CONFIG_PIDOF=y | ||
| 351 | CONFIG_PS=y | ||
| 352 | CONFIG_RENICE=y | ||
| 353 | CONFIG_TOP=y | ||
| 354 | FEATURE_CPU_USAGE_PERCENTAGE=y | ||
| 355 | CONFIG_UPTIME=y | ||
| 356 | CONFIG_SYSCTL=y | ||
| 357 | |||
| 358 | # | ||
| 359 | # Another Bourne-like Shell | ||
| 360 | # | ||
| 361 | CONFIG_FEATURE_SH_IS_ASH=y | ||
| 362 | # CONFIG_FEATURE_SH_IS_HUSH is not set | ||
| 363 | # CONFIG_FEATURE_SH_IS_LASH is not set | ||
| 364 | # CONFIG_FEATURE_SH_IS_MSH is not set | ||
| 365 | # CONFIG_FEATURE_SH_IS_NONE is not set | ||
| 366 | CONFIG_ASH=y | ||
| 367 | |||
| 368 | # | ||
| 369 | # Ash Shell Options | ||
| 370 | # | ||
| 371 | CONFIG_ASH_JOB_CONTROL=y | ||
| 372 | CONFIG_ASH_ALIAS=y | ||
| 373 | CONFIG_ASH_MATH_SUPPORT=y | ||
| 374 | # CONFIG_ASH_MATH_SUPPORT_64 is not set | ||
| 375 | CONFIG_ASH_GETOPTS=y | ||
| 376 | # CONFIG_ASH_CMDCMD is not set | ||
| 377 | # CONFIG_ASH_MAIL is not set | ||
| 378 | CONFIG_ASH_OPTIMIZE_FOR_SIZE=y | ||
| 379 | # CONFIG_ASH_RANDOM_SUPPORT is not set | ||
| 380 | # CONFIG_HUSH is not set | ||
| 381 | # CONFIG_LASH is not set | ||
| 382 | # CONFIG_MSH is not set | ||
| 383 | |||
| 384 | # | ||
| 385 | # Bourne Shell Options | ||
| 386 | # | ||
| 387 | CONFIG_FEATURE_SH_EXTRA_QUIET=y | ||
| 388 | # CONFIG_FEATURE_SH_STANDALONE_SHELL is not set | ||
| 389 | CONFIG_FEATURE_COMMAND_EDITING=y | ||
| 390 | CONFIG_FEATURE_COMMAND_HISTORY=63 | ||
| 391 | # CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set | ||
| 392 | CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y | ||
| 393 | # CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set | ||
| 394 | CONFIG_FEATURE_SH_FANCY_PROMPT=y | ||
| 395 | |||
| 396 | # | ||
| 397 | # System Logging Utilities | ||
| 398 | # | ||
| 399 | CONFIG_SYSLOGD=y | ||
| 400 | # CONFIG_FEATURE_ROTATE_LOGFILE is not set | ||
| 401 | CONFIG_FEATURE_REMOTE_LOG=y | ||
| 402 | CONFIG_FEATURE_IPC_SYSLOG=y | ||
| 403 | CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 | ||
| 404 | CONFIG_LOGREAD=y | ||
| 405 | # CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set | ||
| 406 | CONFIG_KLOGD=y | ||
| 407 | CONFIG_LOGGER=y | ||
| 408 | |||
| 409 | # | ||
| 410 | # Linux System Utilities | ||
| 411 | # | ||
| 412 | CONFIG_DMESG=y | ||
| 413 | # CONFIG_FBSET is not set | ||
| 414 | # CONFIG_FDFLUSH is not set | ||
| 415 | # CONFIG_FDFORMAT is not set | ||
| 416 | CONFIG_FDISK=y | ||
| 417 | FDISK_SUPPORT_LARGE_DISKS=y | ||
| 418 | CONFIG_FEATURE_FDISK_WRITABLE=y | ||
| 419 | # CONFIG_FEATURE_AIX_LABEL is not set | ||
| 420 | # CONFIG_FEATURE_SGI_LABEL is not set | ||
| 421 | # CONFIG_FEATURE_SUN_LABEL is not set | ||
| 422 | CONFIG_FEATURE_OSF_LABEL=y | ||
| 423 | # CONFIG_FEATURE_FDISK_ADVANCED is not set | ||
| 424 | # CONFIG_FREERAMDISK is not set | ||
| 425 | # CONFIG_FSCK_MINIX is not set | ||
| 426 | # CONFIG_MKFS_MINIX is not set | ||
| 427 | # CONFIG_GETOPT is not set | ||
| 428 | CONFIG_HEXDUMP=y | ||
| 429 | CONFIG_HWCLOCK=y | ||
| 430 | CONFIG_FEATURE_HWCLOCK_LONGOPTIONS=y | ||
| 431 | # CONFIG_LOSETUP is not set | ||
| 432 | CONFIG_MKSWAP=y | ||
| 433 | CONFIG_MORE=y | ||
| 434 | CONFIG_FEATURE_USE_TERMIOS=y | ||
| 435 | CONFIG_PIVOT_ROOT=y | ||
| 436 | # CONFIG_RDATE is not set | ||
| 437 | # CONFIG_SWAPONOFF is not set | ||
| 438 | # CONFIG_MOUNT is not set | ||
| 439 | # CONFIG_UMOUNT is not set | ||
| 440 | |||
| 441 | # | ||
| 442 | # Debugging Options | ||
| 443 | # | ||
| 444 | # CONFIG_DEBUG is not set | ||
diff --git a/meta/packages/busybox/busybox-1.01/slugos/sysctl.conf b/meta/packages/busybox/busybox-1.01/slugos/sysctl.conf deleted file mode 100644 index cfaa3c7f92..0000000000 --- a/meta/packages/busybox/busybox-1.01/slugos/sysctl.conf +++ /dev/null | |||
| @@ -1,32 +0,0 @@ | |||
| 1 | # | ||
| 2 | # /etc/sysctl.conf - Configuration file for setting system variables | ||
| 3 | # See sysctl.conf (5) for information. | ||
| 4 | # | ||
| 5 | |||
| 6 | #kernel.domainname = example.com | ||
| 7 | |||
| 8 | # This flag allows the machine to respond to broadcast pings. | ||
| 9 | # Very useful on embedded machines | ||
| 10 | net/ipv4/icmp_echo_ignore_broadcasts=0 | ||
| 11 | |||
| 12 | # Uncomment the following to stop low-level messages on console | ||
| 13 | #kernel/printk = 4 4 1 7 | ||
| 14 | |||
| 15 | ##############################################################3 | ||
| 16 | # Functions previously found in netbase | ||
| 17 | # | ||
| 18 | |||
| 19 | # Uncomment the next line to enable Spoof protection (reverse-path filter) | ||
| 20 | #net/ipv4/conf/all/rp_filter=1 | ||
| 21 | |||
| 22 | # Uncomment the next line to enable TCP/IP SYN cookies | ||
| 23 | #net/ipv4/tcp_syncookies=1 | ||
| 24 | |||
| 25 | # Uncomment the next line to enable packet forwarding for IPv4 | ||
| 26 | #net/ipv4/ip_forward=1 | ||
| 27 | |||
| 28 | # Uncomment the next line to enable packet forwarding for IPv6 | ||
| 29 | #net/ipv6/ip_forward=1 | ||
| 30 | |||
| 31 | # This sets the app to run on a hotplug event | ||
| 32 | kernel/hotplug=/sbin/udevsend | ||
diff --git a/meta/packages/busybox/busybox-1.01/slugos/udhcpscript.patch b/meta/packages/busybox/busybox-1.01/slugos/udhcpscript.patch deleted file mode 100644 index 277a22cddb..0000000000 --- a/meta/packages/busybox/busybox-1.01/slugos/udhcpscript.patch +++ /dev/null | |||
| @@ -1,162 +0,0 @@ | |||
| 1 | diff -rup busybox-1.01/.pc/udhcpscript.patch/examples/udhcp/simple.script busybox-1.01/examples/udhcp/simple.script | ||
| 2 | --- busybox-1.01/examples/udhcp/simple.script 1970-01-01 00:00:00.000000000 +0000 | ||
| 3 | +++ busybox-1.01/examples/udhcp/simple.script 1970-01-01 00:00:00.000000000 +0000 | ||
| 4 | @@ -1,40 +1,129 @@ | ||
| 5 | #!/bin/sh | ||
| 6 | +# slugos UDHCP client script | ||
| 7 | +# | ||
| 8 | +. /etc/default/functions | ||
| 9 | + | ||
| 10 | +echodns(){ | ||
| 11 | + local dns | ||
| 12 | + if test $# -gt 0 | ||
| 13 | + then | ||
| 14 | + for dns in "$@" | ||
| 15 | + do | ||
| 16 | + echo "nameserver $dns #dhcp:$interface" | ||
| 17 | + done | ||
| 18 | + fi | ||
| 19 | +} | ||
| 20 | |||
| 21 | -# udhcpc script edited by Tim Riker <Tim@Rikers.org> | ||
| 22 | +# Output the correct contents for resolv.conf based on | ||
| 23 | +# the current one and any new information | ||
| 24 | +mkresolv() { | ||
| 25 | + local rmdomain | ||
| 26 | + rmdomain= | ||
| 27 | + # last search takes precedence, so a user | ||
| 28 | + # specified search in resolv.conf is retained | ||
| 29 | + test -n "$domain" && { | ||
| 30 | + echo "search $domain #dhcp" | ||
| 31 | + rmdomain='|search [^ ]* #dhcp' | ||
| 32 | + } | ||
| 33 | + # first nameserver takes precedence, use a user | ||
| 34 | + # specified nameserver in preference then the | ||
| 35 | + # new ones | ||
| 36 | + egrep -v '^(nameserver [^ ]* #dhcp:.*'"$rmdomain"')$' "$1" | ||
| 37 | + echodns $dns | ||
| 38 | + egrep '^nameserver [^ ]* #dhcp:.*$' "$1" | egrep -v :"$interface"'$' | ||
| 39 | +} | ||
| 40 | + | ||
| 41 | +# checksum of a file (or stdin if -) | ||
| 42 | +md5strm() { | ||
| 43 | + md5sum $1 2>/dev/null | sed -n 's/^\([0-9A-Za-z]*\).*$/\1/p' | ||
| 44 | +} | ||
| 45 | + | ||
| 46 | +# update resolv.conf for $interface using $domain and $dns | ||
| 47 | +updresolv() { | ||
| 48 | + local md5old md5new resolv | ||
| 49 | + md5old="$(md5strm /etc/resolv.conf)" | ||
| 50 | + resolv="$(mkresolv /etc/resolv.conf)" | ||
| 51 | + md5new="$(echo "$resolv" | md5strm -)" | ||
| 52 | + test "$md5old" != "$md5new" && echo "$resolv" >/etc/resolv.conf | ||
| 53 | +} | ||
| 54 | + | ||
| 55 | +unroute() { | ||
| 56 | + # called to deconfig the interface | ||
| 57 | + while route del default gw 0.0.0.0 dev $interface 2>/dev/null | ||
| 58 | + do | ||
| 59 | + : | ||
| 60 | + done | ||
| 61 | +} | ||
| 62 | + | ||
| 63 | +bind() { | ||
| 64 | + local B N metric i olddomain resolv | ||
| 65 | + B= | ||
| 66 | + test -n "$broadcast" && B="broadcast $broadcast" | ||
| 67 | + N= | ||
| 68 | + test -n "$subnet" && N="netmask $subnet" | ||
| 69 | + ifconfig "$interface" "$ip" $B $N up | ||
| 70 | + | ||
| 71 | + # If given router information delete the old information and | ||
| 72 | + # enter new stuff, routers get metrics incremented by 1 | ||
| 73 | + # between each (this is somewhat arbitrary) | ||
| 74 | + if test -n "$router" | ||
| 75 | + then | ||
| 76 | + unroute | ||
| 77 | + metric=0 | ||
| 78 | + for i in $router | ||
| 79 | + do | ||
| 80 | + route add default gw "$i" dev "$interface" metric $((metric++)) | ||
| 81 | + done | ||
| 82 | + fi | ||
| 83 | |||
| 84 | -[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1 | ||
| 85 | + olddomain= | ||
| 86 | + test -r /etc/defaultdomain && olddomain="$(cat /etc/defaultdomain)" | ||
| 87 | + if test -n "$domain" -a "$domain" != "$olddomain" | ||
| 88 | + then | ||
| 89 | + echo "$domain" >/etc/defaultdomain | ||
| 90 | + # and update the kernel view too | ||
| 91 | + echo "$domain" >/proc/sys/kernel/domainname | ||
| 92 | + fi | ||
| 93 | |||
| 94 | -RESOLV_CONF="/etc/resolv.conf" | ||
| 95 | -[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast" | ||
| 96 | -[ -n "$subnet" ] && NETMASK="netmask $subnet" | ||
| 97 | + updresolv | ||
| 98 | +} | ||
| 99 | |||
| 100 | case "$1" in | ||
| 101 | - deconfig) | ||
| 102 | - /sbin/ifconfig $interface 0.0.0.0 | ||
| 103 | - ;; | ||
| 104 | - | ||
| 105 | - renew|bound) | ||
| 106 | - /sbin/ifconfig $interface $ip $BROADCAST $NETMASK | ||
| 107 | - | ||
| 108 | - if [ -n "$router" ] ; then | ||
| 109 | - echo "deleting routers" | ||
| 110 | - while route del default gw 0.0.0.0 dev $interface ; do | ||
| 111 | - : | ||
| 112 | - done | ||
| 113 | - | ||
| 114 | - metric=0 | ||
| 115 | - for i in $router ; do | ||
| 116 | - route add default gw $i dev $interface metric $((metric++)) | ||
| 117 | - done | ||
| 118 | +deconfig) | ||
| 119 | + # Bring the interface up (without inet at this point) | ||
| 120 | + # Remove the resolver information because deconfig is called | ||
| 121 | + # on leasefail and we need to remove this interface at that | ||
| 122 | + # point to ensure the machine remains visible on another | ||
| 123 | + # interface! | ||
| 124 | + domain= | ||
| 125 | + dns= | ||
| 126 | + unroute | ||
| 127 | + updresolv | ||
| 128 | + ifconfig "$interface" up;; | ||
| 129 | + | ||
| 130 | +renew|bound) | ||
| 131 | + bind;; | ||
| 132 | + | ||
| 133 | +leasefail) | ||
| 134 | + # Pull the values from the config data if (only only if) this | ||
| 135 | + # is the config interface | ||
| 136 | + if test "$interface" = "$(config iface)" | ||
| 137 | + then | ||
| 138 | + ip="$(config ip)" | ||
| 139 | + if test -n "$ip" | ||
| 140 | + then | ||
| 141 | + router="$(config gateway)" | ||
| 142 | + subnet="$(config netmask)" | ||
| 143 | + broadcast="$(config broadcast)" | ||
| 144 | + domain="$(config domain)" | ||
| 145 | + dns="$(config dns)" | ||
| 146 | + | ||
| 147 | + bind | ||
| 148 | fi | ||
| 149 | + fi;; | ||
| 150 | |||
| 151 | - echo -n > $RESOLV_CONF | ||
| 152 | - [ -n "$domain" ] && echo search $domain >> $RESOLV_CONF | ||
| 153 | - for i in $dns ; do | ||
| 154 | - echo adding dns $i | ||
| 155 | - echo nameserver $i >> $RESOLV_CONF | ||
| 156 | - done | ||
| 157 | - ;; | ||
| 158 | +*) echo "udhcpc: $*: unknown command" >&2 | ||
| 159 | + exit 1;; | ||
| 160 | esac | ||
| 161 | |||
| 162 | exit 0 | ||
diff --git a/meta/packages/busybox/busybox-1.01/sparc/defconfig b/meta/packages/busybox/busybox-1.01/sparc/defconfig deleted file mode 100644 index 8b8cbfc839..0000000000 --- a/meta/packages/busybox/busybox-1.01/sparc/defconfig +++ /dev/null | |||
| @@ -1,467 +0,0 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # | ||
| 4 | HAVE_DOT_CONFIG=y | ||
| 5 | |||
| 6 | # | ||
| 7 | # General Configuration | ||
| 8 | # | ||
| 9 | CONFIG_FEATURE_BUFFERS_USE_MALLOC=y | ||
| 10 | # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set | ||
| 11 | # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set | ||
| 12 | # CONFIG_FEATURE_VERBOSE_USAGE is not set | ||
| 13 | # CONFIG_FEATURE_INSTALLER is not set | ||
| 14 | # CONFIG_LOCALE_SUPPORT is not set | ||
| 15 | CONFIG_FEATURE_DEVFS=y | ||
| 16 | CONFIG_FEATURE_DEVPTS=y | ||
| 17 | # CONFIG_FEATURE_CLEAN_UP is not set | ||
| 18 | # CONFIG_FEATURE_SUID is not set | ||
| 19 | # CONFIG_SELINUX is not set | ||
| 20 | |||
| 21 | # | ||
| 22 | # Build Options | ||
| 23 | # | ||
| 24 | # CONFIG_STATIC is not set | ||
| 25 | # CONFIG_LFS is not set | ||
| 26 | # USING_CROSS_COMPILER is not set | ||
| 27 | EXTRA_CFLAGS_OPTIONS="" | ||
| 28 | |||
| 29 | # | ||
| 30 | # Installation Options | ||
| 31 | # | ||
| 32 | # CONFIG_INSTALL_NO_USR is not set | ||
| 33 | PREFIX="./_install" | ||
| 34 | |||
| 35 | # | ||
| 36 | # Archival Utilities | ||
| 37 | # | ||
| 38 | CONFIG_AR=y | ||
| 39 | # CONFIG_FEATURE_AR_LONG_FILENAMES is not set | ||
| 40 | CONFIG_BUNZIP2=y | ||
| 41 | CONFIG_CPIO=y | ||
| 42 | # CONFIG_DPKG is not set | ||
| 43 | # CONFIG_DPKG_DEB is not set | ||
| 44 | CONFIG_GUNZIP=y | ||
| 45 | # CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set | ||
| 46 | CONFIG_GZIP=y | ||
| 47 | # CONFIG_RPM2CPIO is not set | ||
| 48 | # CONFIG_RPM is not set | ||
| 49 | CONFIG_TAR=y | ||
| 50 | CONFIG_FEATURE_TAR_CREATE=y | ||
| 51 | CONFIG_FEATURE_TAR_BZIP2=y | ||
| 52 | CONFIG_FEATURE_TAR_FROM=y | ||
| 53 | CONFIG_FEATURE_TAR_GZIP=y | ||
| 54 | # CONFIG_FEATURE_TAR_COMPRESS is not set | ||
| 55 | CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY=y | ||
| 56 | CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y | ||
| 57 | # CONFIG_FEATURE_TAR_LONG_OPTIONS is not set | ||
| 58 | # CONFIG_UNCOMPRESS is not set | ||
| 59 | CONFIG_UNZIP=y | ||
| 60 | |||
| 61 | # | ||
| 62 | # Common options for cpio and tar | ||
| 63 | # | ||
| 64 | # CONFIG_FEATURE_UNARCHIVE_TAPE is not set | ||
| 65 | |||
| 66 | # | ||
| 67 | # Coreutils | ||
| 68 | # | ||
| 69 | CONFIG_BASENAME=y | ||
| 70 | # CONFIG_CAL is not set | ||
| 71 | CONFIG_CAT=y | ||
| 72 | CONFIG_CHGRP=y | ||
| 73 | CONFIG_CHMOD=y | ||
| 74 | CONFIG_CHOWN=y | ||
| 75 | CONFIG_CHROOT=y | ||
| 76 | # CONFIG_CMP is not set | ||
| 77 | CONFIG_CP=y | ||
| 78 | CONFIG_CUT=y | ||
| 79 | CONFIG_DATE=y | ||
| 80 | |||
| 81 | # | ||
| 82 | # date (forced enabled for use with watch) | ||
| 83 | # | ||
| 84 | # CONFIG_FEATURE_DATE_ISOFMT is not set | ||
| 85 | CONFIG_DD=y | ||
| 86 | CONFIG_DF=y | ||
| 87 | CONFIG_DIRNAME=y | ||
| 88 | # CONFIG_DOS2UNIX is not set | ||
| 89 | CONFIG_DU=y | ||
| 90 | CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y | ||
| 91 | CONFIG_ECHO=y | ||
| 92 | CONFIG_FEATURE_FANCY_ECHO=y | ||
| 93 | CONFIG_ENV=y | ||
| 94 | CONFIG_EXPR=y | ||
| 95 | CONFIG_FALSE=y | ||
| 96 | # CONFIG_FOLD is not set | ||
| 97 | CONFIG_HEAD=y | ||
| 98 | # CONFIG_FEATURE_FANCY_HEAD is not set | ||
| 99 | # CONFIG_HOSTID is not set | ||
| 100 | CONFIG_ID=y | ||
| 101 | # CONFIG_INSTALL is not set | ||
| 102 | # CONFIG_LENGTH is not set | ||
| 103 | CONFIG_LN=y | ||
| 104 | CONFIG_LOGNAME=y | ||
| 105 | CONFIG_LS=y | ||
| 106 | CONFIG_FEATURE_LS_FILETYPES=y | ||
| 107 | CONFIG_FEATURE_LS_FOLLOWLINKS=y | ||
| 108 | # CONFIG_FEATURE_LS_RECURSIVE is not set | ||
| 109 | CONFIG_FEATURE_LS_SORTFILES=y | ||
| 110 | CONFIG_FEATURE_LS_TIMESTAMPS=y | ||
| 111 | CONFIG_FEATURE_LS_USERNAME=y | ||
| 112 | CONFIG_FEATURE_LS_COLOR=y | ||
| 113 | CONFIG_MD5SUM=y | ||
| 114 | CONFIG_MKDIR=y | ||
| 115 | CONFIG_MKFIFO=y | ||
| 116 | CONFIG_MKNOD=y | ||
| 117 | CONFIG_MV=y | ||
| 118 | CONFIG_OD=y | ||
| 119 | CONFIG_PRINTF=y | ||
| 120 | CONFIG_PWD=y | ||
| 121 | # CONFIG_REALPATH is not set | ||
| 122 | CONFIG_RM=y | ||
| 123 | CONFIG_RMDIR=y | ||
| 124 | CONFIG_SEQ=y | ||
| 125 | # CONFIG_SHA1SUM is not set | ||
| 126 | CONFIG_SLEEP=y | ||
| 127 | # CONFIG_FEATURE_FANCY_SLEEP is not set | ||
| 128 | CONFIG_SORT=y | ||
| 129 | CONFIG_STTY=y | ||
| 130 | CONFIG_SYNC=y | ||
| 131 | CONFIG_TAIL=y | ||
| 132 | CONFIG_FEATURE_FANCY_TAIL=y | ||
| 133 | CONFIG_TEE=y | ||
| 134 | # CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set | ||
| 135 | CONFIG_TEST=y | ||
| 136 | |||
| 137 | # | ||
| 138 | # test (forced enabled for use with shell) | ||
| 139 | # | ||
| 140 | # CONFIG_FEATURE_TEST_64 is not set | ||
| 141 | CONFIG_TOUCH=y | ||
| 142 | CONFIG_TR=y | ||
| 143 | CONFIG_TRUE=y | ||
| 144 | CONFIG_TTY=y | ||
| 145 | CONFIG_UNAME=y | ||
| 146 | CONFIG_UNIQ=y | ||
| 147 | # CONFIG_USLEEP is not set | ||
| 148 | # CONFIG_UUDECODE is not set | ||
| 149 | # CONFIG_UUENCODE is not set | ||
| 150 | CONFIG_WATCH=y | ||
| 151 | CONFIG_WC=y | ||
| 152 | CONFIG_WHO=y | ||
| 153 | CONFIG_WHOAMI=y | ||
| 154 | CONFIG_YES=y | ||
| 155 | |||
| 156 | # | ||
| 157 | # Common options for cp and mv | ||
| 158 | # | ||
| 159 | # CONFIG_FEATURE_PRESERVE_HARDLINKS is not set | ||
| 160 | |||
| 161 | # | ||
| 162 | # Common options for ls and more | ||
| 163 | # | ||
| 164 | CONFIG_FEATURE_AUTOWIDTH=y | ||
| 165 | |||
| 166 | # | ||
| 167 | # Common options for df, du, ls | ||
| 168 | # | ||
| 169 | CONFIG_FEATURE_HUMAN_READABLE=y | ||
| 170 | |||
| 171 | # | ||
| 172 | # Common options for md5sum, sha1sum | ||
| 173 | # | ||
| 174 | # CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set | ||
| 175 | |||
| 176 | # | ||
| 177 | # Console Utilities | ||
| 178 | # | ||
| 179 | CONFIG_CHVT=y | ||
| 180 | CONFIG_CLEAR=y | ||
| 181 | CONFIG_DEALLOCVT=y | ||
| 182 | CONFIG_DUMPKMAP=y | ||
| 183 | CONFIG_GETKEY=y | ||
| 184 | CONFIG_LOADFONT=y | ||
| 185 | CONFIG_LOADKMAP=y | ||
| 186 | CONFIG_OPENVT=y | ||
| 187 | CONFIG_RESET=y | ||
| 188 | # CONFIG_SETKEYCODES is not set | ||
| 189 | |||
| 190 | # | ||
| 191 | # Debian Utilities | ||
| 192 | # | ||
| 193 | CONFIG_MKTEMP=y | ||
| 194 | # CONFIG_PIPE_PROGRESS is not set | ||
| 195 | CONFIG_READLINK=y | ||
| 196 | CONFIG_RUN_PARTS=y | ||
| 197 | CONFIG_START_STOP_DAEMON=y | ||
| 198 | CONFIG_WHICH=y | ||
| 199 | |||
| 200 | # | ||
| 201 | # Editors | ||
| 202 | # | ||
| 203 | CONFIG_AWK=y | ||
| 204 | CONFIG_FEATURE_AWK_MATH=y | ||
| 205 | # CONFIG_PATCH is not set | ||
| 206 | CONFIG_SED=y | ||
| 207 | CONFIG_VI=y | ||
| 208 | CONFIG_FEATURE_VI_COLON=y | ||
| 209 | CONFIG_FEATURE_VI_YANKMARK=y | ||
| 210 | CONFIG_FEATURE_VI_SEARCH=y | ||
| 211 | CONFIG_FEATURE_VI_USE_SIGNALS=y | ||
| 212 | # CONFIG_FEATURE_VI_DOT_CMD is not set | ||
| 213 | # CONFIG_FEATURE_VI_READONLY is not set | ||
| 214 | # CONFIG_FEATURE_VI_SETOPTS is not set | ||
| 215 | # CONFIG_FEATURE_VI_SET is not set | ||
| 216 | CONFIG_FEATURE_VI_WIN_RESIZE=y | ||
| 217 | CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y | ||
| 218 | |||
| 219 | # | ||
| 220 | # Finding Utilities | ||
| 221 | # | ||
| 222 | CONFIG_FIND=y | ||
| 223 | CONFIG_FEATURE_FIND_MTIME=y | ||
| 224 | CONFIG_FEATURE_FIND_PERM=y | ||
| 225 | CONFIG_FEATURE_FIND_TYPE=y | ||
| 226 | CONFIG_FEATURE_FIND_XDEV=y | ||
| 227 | CONFIG_FEATURE_FIND_NEWER=y | ||
| 228 | # CONFIG_FEATURE_FIND_INUM is not set | ||
| 229 | CONFIG_GREP=y | ||
| 230 | CONFIG_FEATURE_GREP_EGREP_ALIAS=y | ||
| 231 | CONFIG_FEATURE_GREP_FGREP_ALIAS=y | ||
| 232 | CONFIG_FEATURE_GREP_CONTEXT=y | ||
| 233 | CONFIG_XARGS=y | ||
| 234 | # CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set | ||
| 235 | # CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set | ||
| 236 | # CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set | ||
| 237 | # CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set | ||
| 238 | |||
| 239 | # | ||
| 240 | # Init Utilities | ||
| 241 | # | ||
| 242 | # CONFIG_INIT is not set | ||
| 243 | # CONFIG_HALT is not set | ||
| 244 | # CONFIG_POWEROFF is not set | ||
| 245 | # CONFIG_REBOOT is not set | ||
| 246 | # CONFIG_MESG is not set | ||
| 247 | |||
| 248 | # | ||
| 249 | # Login/Password Management Utilities | ||
| 250 | # | ||
| 251 | # CONFIG_USE_BB_PWD_GRP is not set | ||
| 252 | # CONFIG_ADDGROUP is not set | ||
| 253 | # CONFIG_DELGROUP is not set | ||
| 254 | # CONFIG_ADDUSER is not set | ||
| 255 | # CONFIG_DELUSER is not set | ||
| 256 | # CONFIG_GETTY is not set | ||
| 257 | CONFIG_FEATURE_U_W_TMP=y | ||
| 258 | # CONFIG_LOGIN is not set | ||
| 259 | # CONFIG_PASSWD is not set | ||
| 260 | # CONFIG_SU is not set | ||
| 261 | # CONFIG_SULOGIN is not set | ||
| 262 | # CONFIG_VLOCK is not set | ||
| 263 | |||
| 264 | # | ||
| 265 | # Miscellaneous Utilities | ||
| 266 | # | ||
| 267 | # CONFIG_ADJTIMEX is not set | ||
| 268 | # CONFIG_CROND is not set | ||
| 269 | # CONFIG_CRONTAB is not set | ||
| 270 | CONFIG_DC=y | ||
| 271 | # CONFIG_DEVFSD is not set | ||
| 272 | # CONFIG_LAST is not set | ||
| 273 | # CONFIG_HDPARM is not set | ||
| 274 | CONFIG_MAKEDEVS=y | ||
| 275 | # CONFIG_MT is not set | ||
| 276 | # CONFIG_RX is not set | ||
| 277 | CONFIG_STRINGS=y | ||
| 278 | # CONFIG_TIME is not set | ||
| 279 | # CONFIG_WATCHDOG is not set | ||
| 280 | |||
| 281 | # | ||
| 282 | # Linux Module Utilities | ||
| 283 | # | ||
| 284 | # CONFIG_INSMOD is not set | ||
| 285 | # CONFIG_LSMOD is not set | ||
| 286 | # CONFIG_MODPROBE is not set | ||
| 287 | # CONFIG_RMMOD is not set | ||
| 288 | |||
| 289 | # | ||
| 290 | # Networking Utilities | ||
| 291 | # | ||
| 292 | CONFIG_FEATURE_IPV6=y | ||
| 293 | # CONFIG_ARPING is not set | ||
| 294 | # CONFIG_FTPGET is not set | ||
| 295 | # CONFIG_FTPPUT is not set | ||
| 296 | CONFIG_HOSTNAME=y | ||
| 297 | # CONFIG_HTTPD is not set | ||
| 298 | CONFIG_IFCONFIG=y | ||
| 299 | CONFIG_FEATURE_IFCONFIG_STATUS=y | ||
| 300 | # CONFIG_FEATURE_IFCONFIG_SLIP is not set | ||
| 301 | # CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set | ||
| 302 | CONFIG_FEATURE_IFCONFIG_HW=y | ||
| 303 | # CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set | ||
| 304 | CONFIG_IFUPDOWN=y | ||
| 305 | # CONFIG_FEATURE_IFUPDOWN_IP is not set | ||
| 306 | CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y | ||
| 307 | CONFIG_FEATURE_IFUPDOWN_IPV4=y | ||
| 308 | CONFIG_FEATURE_IFUPDOWN_IPV6=y | ||
| 309 | # CONFIG_FEATURE_IFUPDOWN_IPX is not set | ||
| 310 | # CONFIG_FEATURE_IFUPDOWN_MAPPING is not set | ||
| 311 | # CONFIG_INETD is not set | ||
| 312 | CONFIG_IP=y | ||
| 313 | CONFIG_FEATURE_IP_ADDRESS=y | ||
| 314 | CONFIG_FEATURE_IP_LINK=y | ||
| 315 | CONFIG_FEATURE_IP_ROUTE=y | ||
| 316 | CONFIG_FEATURE_IP_TUNNEL=y | ||
| 317 | # CONFIG_IPCALC is not set | ||
| 318 | # CONFIG_IPADDR is not set | ||
| 319 | # CONFIG_IPLINK is not set | ||
| 320 | # CONFIG_IPROUTE is not set | ||
| 321 | # CONFIG_IPTUNNEL is not set | ||
| 322 | # CONFIG_NAMEIF is not set | ||
| 323 | CONFIG_NC=y | ||
| 324 | CONFIG_NETSTAT=y | ||
| 325 | CONFIG_NSLOOKUP=y | ||
| 326 | CONFIG_PING=y | ||
| 327 | CONFIG_FEATURE_FANCY_PING=y | ||
| 328 | CONFIG_PING6=y | ||
| 329 | CONFIG_FEATURE_FANCY_PING6=y | ||
| 330 | CONFIG_ROUTE=y | ||
| 331 | CONFIG_TELNET=y | ||
| 332 | # CONFIG_FEATURE_TELNET_TTYPE is not set | ||
| 333 | CONFIG_FEATURE_TELNET_AUTOLOGIN=y | ||
| 334 | # CONFIG_TELNETD is not set | ||
| 335 | # CONFIG_TFTP is not set | ||
| 336 | CONFIG_TRACEROUTE=y | ||
| 337 | # CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set | ||
| 338 | # CONFIG_VCONFIG is not set | ||
| 339 | CONFIG_WGET=y | ||
| 340 | CONFIG_FEATURE_WGET_STATUSBAR=y | ||
| 341 | CONFIG_FEATURE_WGET_AUTHENTICATION=y | ||
| 342 | CONFIG_FEATURE_WGET_IP6_LITERAL=y | ||
| 343 | |||
| 344 | # | ||
| 345 | # udhcp Server/Client | ||
| 346 | # | ||
| 347 | # CONFIG_UDHCPD is not set | ||
| 348 | CONFIG_UDHCPC=y | ||
| 349 | CONFIG_FEATURE_UDHCP_SYSLOG=y | ||
| 350 | # CONFIG_FEATURE_UDHCP_DEBUG is not set | ||
| 351 | |||
| 352 | # | ||
| 353 | # Process Utilities | ||
| 354 | # | ||
| 355 | CONFIG_FREE=y | ||
| 356 | CONFIG_KILL=y | ||
| 357 | CONFIG_KILLALL=y | ||
| 358 | CONFIG_PIDOF=y | ||
| 359 | CONFIG_PS=y | ||
| 360 | CONFIG_RENICE=y | ||
| 361 | CONFIG_TOP=y | ||
| 362 | FEATURE_CPU_USAGE_PERCENTAGE=y | ||
| 363 | CONFIG_UPTIME=y | ||
| 364 | # CONFIG_SYSCTL is not set | ||
| 365 | |||
| 366 | # | ||
| 367 | # Another Bourne-like Shell | ||
| 368 | # | ||
| 369 | CONFIG_FEATURE_SH_IS_ASH=y | ||
| 370 | # CONFIG_FEATURE_SH_IS_HUSH is not set | ||
| 371 | # CONFIG_FEATURE_SH_IS_LASH is not set | ||
| 372 | # CONFIG_FEATURE_SH_IS_MSH is not set | ||
| 373 | # CONFIG_FEATURE_SH_IS_NONE is not set | ||
| 374 | CONFIG_ASH=y | ||
| 375 | |||
| 376 | # | ||
| 377 | # Ash Shell Options | ||
| 378 | # | ||
| 379 | CONFIG_ASH_JOB_CONTROL=y | ||
| 380 | CONFIG_ASH_ALIAS=y | ||
| 381 | CONFIG_ASH_MATH_SUPPORT=y | ||
| 382 | # CONFIG_ASH_MATH_SUPPORT_64 is not set | ||
| 383 | CONFIG_ASH_GETOPTS=y | ||
| 384 | # CONFIG_ASH_CMDCMD is not set | ||
| 385 | # CONFIG_ASH_MAIL is not set | ||
| 386 | CONFIG_ASH_OPTIMIZE_FOR_SIZE=y | ||
| 387 | # CONFIG_ASH_RANDOM_SUPPORT is not set | ||
| 388 | # CONFIG_HUSH is not set | ||
| 389 | # CONFIG_LASH is not set | ||
| 390 | # CONFIG_MSH is not set | ||
| 391 | |||
| 392 | # | ||
| 393 | # Bourne Shell Options | ||
| 394 | # | ||
| 395 | CONFIG_FEATURE_SH_EXTRA_QUIET=y | ||
| 396 | # CONFIG_FEATURE_SH_STANDALONE_SHELL is not set | ||
| 397 | CONFIG_FEATURE_COMMAND_EDITING=y | ||
| 398 | CONFIG_FEATURE_COMMAND_HISTORY=63 | ||
| 399 | # CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set | ||
| 400 | CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y | ||
| 401 | # CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set | ||
| 402 | CONFIG_FEATURE_SH_FANCY_PROMPT=y | ||
| 403 | |||
| 404 | # | ||
| 405 | # System Logging Utilities | ||
| 406 | # | ||
| 407 | CONFIG_SYSLOGD=y | ||
| 408 | # CONFIG_FEATURE_ROTATE_LOGFILE is not set | ||
| 409 | CONFIG_FEATURE_REMOTE_LOG=y | ||
| 410 | CONFIG_FEATURE_IPC_SYSLOG=y | ||
| 411 | CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 | ||
| 412 | CONFIG_LOGREAD=y | ||
| 413 | # CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set | ||
| 414 | CONFIG_KLOGD=y | ||
| 415 | CONFIG_LOGGER=y | ||
| 416 | |||
| 417 | # | ||
| 418 | # Linux System Utilities | ||
| 419 | # | ||
| 420 | CONFIG_DMESG=y | ||
| 421 | CONFIG_FBSET=y | ||
| 422 | CONFIG_FEATURE_FBSET_FANCY=y | ||
| 423 | # CONFIG_FEATURE_FBSET_READMODE is not set | ||
| 424 | # CONFIG_FDFLUSH is not set | ||
| 425 | # CONFIG_FDFORMAT is not set | ||
| 426 | CONFIG_FDISK=y | ||
| 427 | FDISK_SUPPORT_LARGE_DISKS=y | ||
| 428 | CONFIG_FEATURE_FDISK_WRITABLE=y | ||
| 429 | # CONFIG_FEATURE_AIX_LABEL is not set | ||
| 430 | # CONFIG_FEATURE_SGI_LABEL is not set | ||
| 431 | # CONFIG_FEATURE_SUN_LABEL is not set | ||
| 432 | # CONFIG_FEATURE_OSF_LABEL is not set | ||
| 433 | # CONFIG_FEATURE_FDISK_ADVANCED is not set | ||
| 434 | # CONFIG_FREERAMDISK is not set | ||
| 435 | CONFIG_FSCK_MINIX=y | ||
| 436 | CONFIG_MKFS_MINIX=y | ||
| 437 | |||
| 438 | # | ||
| 439 | # Minix filesystem support | ||
| 440 | # | ||
| 441 | CONFIG_FEATURE_MINIX2=y | ||
| 442 | # CONFIG_GETOPT is not set | ||
| 443 | CONFIG_HEXDUMP=y | ||
| 444 | CONFIG_HWCLOCK=y | ||
| 445 | CONFIG_FEATURE_HWCLOCK_LONGOPTIONS=y | ||
| 446 | # CONFIG_LOSETUP is not set | ||
| 447 | CONFIG_MKSWAP=y | ||
| 448 | CONFIG_MORE=y | ||
| 449 | CONFIG_FEATURE_USE_TERMIOS=y | ||
| 450 | CONFIG_PIVOT_ROOT=y | ||
| 451 | # CONFIG_RDATE is not set | ||
| 452 | CONFIG_SWAPONOFF=y | ||
| 453 | CONFIG_MOUNT=y | ||
| 454 | CONFIG_NFSMOUNT=y | ||
| 455 | CONFIG_UMOUNT=y | ||
| 456 | CONFIG_FEATURE_MOUNT_FORCE=y | ||
| 457 | |||
| 458 | # | ||
| 459 | # Common options for mount/umount | ||
| 460 | # | ||
| 461 | # CONFIG_FEATURE_MOUNT_LOOP is not set | ||
| 462 | # CONFIG_FEATURE_MTAB_SUPPORT is not set | ||
| 463 | |||
| 464 | # | ||
| 465 | # Debugging Options | ||
| 466 | # | ||
| 467 | # CONFIG_DEBUG is not set | ||
diff --git a/meta/packages/busybox/busybox-1.01/thumb-bsdlabel.patch b/meta/packages/busybox/busybox-1.01/thumb-bsdlabel.patch deleted file mode 100644 index dc3eb7c552..0000000000 --- a/meta/packages/busybox/busybox-1.01/thumb-bsdlabel.patch +++ /dev/null | |||
| @@ -1,11 +0,0 @@ | |||
| 1 | --- busybox-1.01/util-linux/fdisk.c 1970-01-01 00:00:00.000000000 +0000 | ||
| 2 | +++ busybox-1.01/util-linux/fdisk.c 1970-01-01 00:00:00.000000000 +0000 | ||
| 3 | @@ -507,7 +507,7 @@ check_aix_label( void ) | ||
| 4 | |||
| 5 | #define BSD_LINUX_BOOTDIR "/usr/ucb/mdec" | ||
| 6 | |||
| 7 | -#if defined (i386) || defined (__sparc__) || defined (__arm__) || defined (__mips__) || defined (__s390__) || defined (__sh__) || defined(__x86_64__) | ||
| 8 | +#if defined (i386) || defined (__sparc__) || defined (__arm__) || defined (__thumb__) || defined (__mips__) || defined (__s390__) || defined (__sh__) || defined(__x86_64__) | ||
| 9 | #define BSD_LABELSECTOR 1 | ||
| 10 | #define BSD_LABELOFFSET 0 | ||
| 11 | #elif defined (__alpha__) || defined (__powerpc__) || defined (__ia64__) || defined (__hppa__) | ||
diff --git a/meta/packages/busybox/busybox-1.01/uclibc_posix.patch b/meta/packages/busybox/busybox-1.01/uclibc_posix.patch deleted file mode 100644 index 186f3f9c3a..0000000000 --- a/meta/packages/busybox/busybox-1.01/uclibc_posix.patch +++ /dev/null | |||
| @@ -1,21 +0,0 @@ | |||
| 1 | see http://www.busybox.net/lists/busybox/2004-December/013276.html | ||
| 2 | and http://bugs.openembedded.org/show_bug.cgi?id=657 | ||
| 3 | |||
| 4 | --- busybox-1.01/libbb/loop.c 2006/03/13 22:18:47 1.1 | ||
| 5 | +++ busybox-1.01/libbb/loop.c 2006/03/13 22:19:57 | ||
| 6 | @@ -19,6 +19,7 @@ | ||
| 7 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
| 8 | */ | ||
| 9 | |||
| 10 | +#include <linux/types.h> | ||
| 11 | #include <stdio.h> | ||
| 12 | #include <errno.h> | ||
| 13 | #include <fcntl.h> | ||
| 14 | @@ -30,7 +31,6 @@ | ||
| 15 | /* Grumble... The 2.6.x kernel breaks asm/posix_types.h | ||
| 16 | * so we get to try and cope as best we can... */ | ||
| 17 | #include <linux/version.h> | ||
| 18 | -#include <asm/posix_types.h> | ||
| 19 | |||
| 20 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) | ||
| 21 | #define __bb_kernel_dev_t __kernel_old_dev_t | ||
diff --git a/meta/packages/busybox/busybox-1.01/udhcppidfile-breakage.patch b/meta/packages/busybox/busybox-1.01/udhcppidfile-breakage.patch deleted file mode 100644 index 031274908b..0000000000 --- a/meta/packages/busybox/busybox-1.01/udhcppidfile-breakage.patch +++ /dev/null | |||
| @@ -1,57 +0,0 @@ | |||
| 1 | --- busybox-1.00/networking/udhcp/common.c~udhcppidfile2 | ||
| 2 | +++ busybox-1.00/networking/udhcp/common.c | ||
| 3 | @@ -74,7 +74,7 @@ | ||
| 4 | |||
| 5 | if (pid > 0) { | ||
| 6 | /* parent */ | ||
| 7 | - if (pidfile_reassign(pidfile, pid) < 0) { | ||
| 8 | + if (pidfile != NULL && pidfile_reassign(pidfile, pid) < 0) { | ||
| 9 | (void)kill(pid, SIGKILL); | ||
| 10 | exit(1); | ||
| 11 | } else | ||
| 12 | @@ -119,7 +119,7 @@ | ||
| 13 | sanitize_fds(); | ||
| 14 | |||
| 15 | /* do some other misc startup stuff while we are here to save bytes */ | ||
| 16 | - if (pidfile_acquire(pidfile) < 0) | ||
| 17 | + if (pidfile != NULL && pidfile_acquire(pidfile) < 0) | ||
| 18 | exit(1); | ||
| 19 | |||
| 20 | /* equivelent of doing a fflush after every \n */ | ||
| 21 | @@ -166,7 +166,7 @@ | ||
| 22 | sanitize_fds(); | ||
| 23 | |||
| 24 | /* do some other misc startup stuff while we are here to save bytes */ | ||
| 25 | - if (pidfile_acquire(pidfile) < 0) | ||
| 26 | + if (pidfile != NULL && pidfile_acquire(pidfile) < 0) | ||
| 27 | exit(1); | ||
| 28 | |||
| 29 | /* equivelent of doing a fflush after every \n */ | ||
| 30 | --- busybox-1.00/networking/udhcp/pidfile.c~udhcppidfile2 | ||
| 31 | +++ busybox-1.00/networking/udhcp/pidfile.c | ||
| 32 | @@ -141,7 +141,11 @@ | ||
| 33 | int pidfile_acquire(const char *pidfile) | ||
| 34 | { | ||
| 35 | int fd, result; | ||
| 36 | - if (!pidfile) return (-1); | ||
| 37 | + | ||
| 38 | + if (pidfile == NULL) { | ||
| 39 | + LOG(LOG_ERR, "pidfile_acquire: filename is NULL\n"); | ||
| 40 | + return (-1); | ||
| 41 | + } | ||
| 42 | |||
| 43 | if ((fd = pidfile_open(pidfile)) < 0) | ||
| 44 | return (-1); | ||
| 45 | @@ -170,7 +174,11 @@ | ||
| 46 | int pidfile_reassign(const char *pidfile, int pid) | ||
| 47 | { | ||
| 48 | int fd, result; | ||
| 49 | - if (!pidfile) return (-1); | ||
| 50 | + | ||
| 51 | + if (pidfile == NULL) { | ||
| 52 | + LOG(LOG_ERR, "pidfile_reassign: filename is NULL\n"); | ||
| 53 | + return (-1); | ||
| 54 | + } | ||
| 55 | |||
| 56 | if ((fd = pidfile_open(pidfile)) < 0) | ||
| 57 | return (-1); | ||
diff --git a/meta/packages/busybox/busybox-1.01/udhcppidfile.patch b/meta/packages/busybox/busybox-1.01/udhcppidfile.patch deleted file mode 100644 index fb2b2ec19a..0000000000 --- a/meta/packages/busybox/busybox-1.01/udhcppidfile.patch +++ /dev/null | |||
| @@ -1,276 +0,0 @@ | |||
| 1 | --- busybox-1.00/networking/udhcp/pidfile.h-dist 2004-04-15 03:51:26.000000000 +1000 | ||
| 2 | +++ busybox-1.00/networking/udhcp/pidfile.h 2004-10-27 15:46:38.000000000 +1000 | ||
| 3 | @@ -21,5 +21,5 @@ | ||
| 4 | |||
| 5 | |||
| 6 | int pidfile_acquire(const char *pidfile); | ||
| 7 | -void pidfile_write_release(int pid_fd); | ||
| 8 | +int pidfile_reassign(const char *pidfile, int newpid); | ||
| 9 | |||
| 10 | --- busybox-1.00/networking/udhcp/pidfile.c-dist 2004-04-15 03:51:25.000000000 +1000 | ||
| 11 | +++ busybox-1.00/networking/udhcp/pidfile.c 2004-10-27 19:43:40.000000000 +1000 | ||
| 12 | @@ -25,6 +25,7 @@ | ||
| 13 | #include <unistd.h> | ||
| 14 | #include <stdio.h> | ||
| 15 | #include <stdlib.h> | ||
| 16 | +#include <errno.h> | ||
| 17 | |||
| 18 | #include "pidfile.h" | ||
| 19 | #include "common.h" | ||
| 20 | @@ -37,39 +38,146 @@ | ||
| 21 | } | ||
| 22 | |||
| 23 | |||
| 24 | -int pidfile_acquire(const char *pidfile) | ||
| 25 | +static int pidfile_open(const char *pidfile) | ||
| 26 | { | ||
| 27 | - int pid_fd; | ||
| 28 | - if (!pidfile) return -1; | ||
| 29 | + int fd; | ||
| 30 | |||
| 31 | - pid_fd = open(pidfile, O_CREAT | O_WRONLY, 0644); | ||
| 32 | - if (pid_fd < 0) { | ||
| 33 | - LOG(LOG_ERR, "Unable to open pidfile %s: %m\n", pidfile); | ||
| 34 | - } else { | ||
| 35 | - lockf(pid_fd, F_LOCK, 0); | ||
| 36 | - if (!saved_pidfile) | ||
| 37 | - atexit(pidfile_delete); | ||
| 38 | - saved_pidfile = (char *) pidfile; | ||
| 39 | + if ((fd = open(pidfile, O_CREAT | O_RDWR, 0644)) < 0) { | ||
| 40 | + LOG(LOG_ERR, "pidfile_open: open %s failed: %m\n", pidfile); | ||
| 41 | + return (-1); | ||
| 42 | + } | ||
| 43 | + | ||
| 44 | + /* NOTE: lockf is not inherited by child after fork */ | ||
| 45 | + if (lockf(fd, F_LOCK, 0) < 0) { | ||
| 46 | + LOG(LOG_ERR, "pidfile_open: lock %s failed: %m\n", pidfile); | ||
| 47 | + close(fd); | ||
| 48 | + return (-1); | ||
| 49 | + } | ||
| 50 | + | ||
| 51 | + return (fd); | ||
| 52 | +} | ||
| 53 | + | ||
| 54 | + | ||
| 55 | +static int pidfile_check(int fd, const char *pidfile) | ||
| 56 | +{ | ||
| 57 | + int len, pid; | ||
| 58 | + char buf[20]; | ||
| 59 | + | ||
| 60 | + if (lseek(fd, 0L, SEEK_SET) < 0) { | ||
| 61 | + LOG(LOG_ERR, "pidfile_check: lseek %s failed: %m\n", pidfile); | ||
| 62 | + return (-1); | ||
| 63 | + } | ||
| 64 | + | ||
| 65 | + if ((len = read(fd, buf, sizeof buf - 1)) < 0) { | ||
| 66 | + LOG(LOG_ERR, "pidfile_check: read %s failed: %m\n", pidfile); | ||
| 67 | + return (-1); | ||
| 68 | + } | ||
| 69 | + | ||
| 70 | + if (len == 0) | ||
| 71 | + return (0); | ||
| 72 | + | ||
| 73 | + buf[len] = '\0'; | ||
| 74 | + | ||
| 75 | + if ((pid = atoi(buf)) <= 1) { | ||
| 76 | + LOG(LOG_WARNING, | ||
| 77 | + "pidfile_check: ignoring bogus pid (%s) in %s\n", | ||
| 78 | + buf, pidfile); | ||
| 79 | + return (0); | ||
| 80 | + } | ||
| 81 | + | ||
| 82 | + if (kill((pid_t)pid, 0) == 0) { | ||
| 83 | + LOG(LOG_ERR, "pidfile_check: process %d exists (%s)\n", | ||
| 84 | + pid, pidfile); | ||
| 85 | + return (-1); | ||
| 86 | + } | ||
| 87 | + | ||
| 88 | + if (errno != ESRCH) { | ||
| 89 | + LOG(LOG_ERR, "pidfile_check: kill %d failed (%s): %m\n", | ||
| 90 | + pid, pidfile); | ||
| 91 | + return (-1); | ||
| 92 | + } | ||
| 93 | + | ||
| 94 | + return (0); | ||
| 95 | +} | ||
| 96 | + | ||
| 97 | + | ||
| 98 | +static int pidfile_store(int fd, const char *pidfile, int pid) | ||
| 99 | +{ | ||
| 100 | + int len; | ||
| 101 | + char buf[20]; | ||
| 102 | + | ||
| 103 | + if (lseek(fd, 0L, SEEK_SET) < 0) { | ||
| 104 | + LOG(LOG_ERR, "pidfile_store: lseek %s failed: %m\n", pidfile); | ||
| 105 | + return (-1); | ||
| 106 | + } | ||
| 107 | + | ||
| 108 | + len = snprintf(buf, sizeof buf - 1, "%d\n", pid); | ||
| 109 | + buf[len] = '\0'; | ||
| 110 | + | ||
| 111 | + if (write(fd, buf, len) < 0) { | ||
| 112 | + LOG(LOG_ERR, "pidfile_store: write %s failed: %m\n", | ||
| 113 | + pidfile); | ||
| 114 | + return (-1); | ||
| 115 | + } | ||
| 116 | + | ||
| 117 | + if (ftruncate(fd, len) < 0) { | ||
| 118 | + LOG(LOG_ERR, "pidfile_store: ftruncate %d failed (%s): %m\n", | ||
| 119 | + len, pidfile); | ||
| 120 | + return (-1); | ||
| 121 | } | ||
| 122 | |||
| 123 | - return pid_fd; | ||
| 124 | + return (0); | ||
| 125 | } | ||
| 126 | |||
| 127 | |||
| 128 | -void pidfile_write_release(int pid_fd) | ||
| 129 | +static void pidfile_close(int fd) | ||
| 130 | { | ||
| 131 | - FILE *out; | ||
| 132 | + (void)lseek(fd, 0L, SEEK_SET); | ||
| 133 | + (void)lockf(fd, F_ULOCK, 0); | ||
| 134 | + (void)close(fd); | ||
| 135 | +} | ||
| 136 | |||
| 137 | - if (pid_fd < 0) return; | ||
| 138 | |||
| 139 | - if ((out = fdopen(pid_fd, "w")) != NULL) { | ||
| 140 | - fprintf(out, "%d\n", getpid()); | ||
| 141 | - fclose(out); | ||
| 142 | +int pidfile_acquire(const char *pidfile) | ||
| 143 | +{ | ||
| 144 | + int fd, result; | ||
| 145 | + if (!pidfile) return (-1); | ||
| 146 | + | ||
| 147 | + if ((fd = pidfile_open(pidfile)) < 0) | ||
| 148 | + return (-1); | ||
| 149 | + | ||
| 150 | + if ((result = pidfile_check(fd, pidfile)) == 0) | ||
| 151 | + result = pidfile_store(fd, pidfile, getpid()); | ||
| 152 | + | ||
| 153 | + pidfile_close(fd); | ||
| 154 | + | ||
| 155 | + if (result == 0) { | ||
| 156 | + saved_pidfile = (char *) pidfile; | ||
| 157 | + atexit(pidfile_delete); | ||
| 158 | } | ||
| 159 | - lockf(pid_fd, F_UNLCK, 0); | ||
| 160 | - close(pid_fd); | ||
| 161 | + | ||
| 162 | + return (result); | ||
| 163 | } | ||
| 164 | |||
| 165 | |||
| 166 | +/* | ||
| 167 | + * reassign the pid in a pidfile - used just after a fork so a parent | ||
| 168 | + * can store the pid of its child into the file without any window | ||
| 169 | + * where the pid in the file is a dead process (which might let another | ||
| 170 | + * instance of the program start). Note the parent must use _exit() to | ||
| 171 | + * avoid triggering the unlink scheduled above in pidfile_acquire() | ||
| 172 | + */ | ||
| 173 | +int pidfile_reassign(const char *pidfile, int pid) | ||
| 174 | +{ | ||
| 175 | + int fd, result; | ||
| 176 | + if (!pidfile) return (-1); | ||
| 177 | + | ||
| 178 | + if ((fd = pidfile_open(pidfile)) < 0) | ||
| 179 | + return (-1); | ||
| 180 | |||
| 181 | + result = pidfile_store(fd, pidfile, pid); | ||
| 182 | |||
| 183 | + pidfile_close(fd); | ||
| 184 | + | ||
| 185 | + return (result); | ||
| 186 | +} | ||
| 187 | --- busybox-1.00/networking/udhcp/common.c-dist 2004-05-19 19:18:04.000000000 +1000 | ||
| 188 | +++ busybox-1.00/networking/udhcp/common.c 2004-10-27 19:58:10.000000000 +1000 | ||
| 189 | @@ -64,16 +64,34 @@ | ||
| 190 | #ifdef __uClinux__ | ||
| 191 | LOG(LOG_ERR, "Cannot background in uclinux (yet)"); | ||
| 192 | #else /* __uClinux__ */ | ||
| 193 | - int pid_fd; | ||
| 194 | + int pid, fd; | ||
| 195 | |||
| 196 | - /* hold lock during fork. */ | ||
| 197 | - pid_fd = pidfile_acquire(pidfile); | ||
| 198 | - if (daemon(0, 0) == -1) { | ||
| 199 | + /* NOTE: lockf is not inherited by the child after fork */ | ||
| 200 | + if ((pid = fork()) < 0) { | ||
| 201 | perror("fork"); | ||
| 202 | exit(1); | ||
| 203 | } | ||
| 204 | + | ||
| 205 | + if (pid > 0) { | ||
| 206 | + /* parent */ | ||
| 207 | + if (pidfile_reassign(pidfile, pid) < 0) { | ||
| 208 | + (void)kill(pid, SIGKILL); | ||
| 209 | + exit(1); | ||
| 210 | + } else | ||
| 211 | + _exit(0); | ||
| 212 | + } | ||
| 213 | + | ||
| 214 | + /* child */ | ||
| 215 | + (void)chdir("/"); | ||
| 216 | + if ((fd = open("/dev/null", O_RDWR)) >= 0) { | ||
| 217 | + (void)dup2(fd, 0); | ||
| 218 | + (void)dup2(fd, 1); | ||
| 219 | + (void)dup2(fd, 2); | ||
| 220 | + (void)close(fd); | ||
| 221 | + } | ||
| 222 | + (void)setsid(); | ||
| 223 | + | ||
| 224 | daemonized++; | ||
| 225 | - pidfile_write_release(pid_fd); | ||
| 226 | #endif /* __uClinux__ */ | ||
| 227 | } | ||
| 228 | |||
| 229 | @@ -97,14 +115,12 @@ | ||
| 230 | |||
| 231 | void start_log_and_pid(const char *client_server, const char *pidfile) | ||
| 232 | { | ||
| 233 | - int pid_fd; | ||
| 234 | - | ||
| 235 | /* Make sure our syslog fd isn't overwritten */ | ||
| 236 | sanitize_fds(); | ||
| 237 | |||
| 238 | /* do some other misc startup stuff while we are here to save bytes */ | ||
| 239 | - pid_fd = pidfile_acquire(pidfile); | ||
| 240 | - pidfile_write_release(pid_fd); | ||
| 241 | + if (pidfile_acquire(pidfile) < 0) | ||
| 242 | + exit(1); | ||
| 243 | |||
| 244 | /* equivelent of doing a fflush after every \n */ | ||
| 245 | setlinebuf(stdout); | ||
| 246 | @@ -150,8 +166,8 @@ | ||
| 247 | sanitize_fds(); | ||
| 248 | |||
| 249 | /* do some other misc startup stuff while we are here to save bytes */ | ||
| 250 | - pid_fd = pidfile_acquire(pidfile); | ||
| 251 | - pidfile_write_release(pid_fd); | ||
| 252 | + if (pidfile_acquire(pidfile) < 0) | ||
| 253 | + exit(1); | ||
| 254 | |||
| 255 | /* equivelent of doing a fflush after every \n */ | ||
| 256 | setlinebuf(stdout); | ||
| 257 | --- busybox-1.00/networking/udhcp/common.h-dist 2004-05-19 18:29:05.000000000 +1000 | ||
| 258 | +++ busybox-1.00/networking/udhcp/common.h 2004-10-27 15:10:16.000000000 +1000 | ||
| 259 | @@ -42,7 +42,6 @@ | ||
| 260 | long uptime(void); | ||
| 261 | void background(const char *pidfile); | ||
| 262 | void start_log_and_pid(const char *client_server, const char *pidfile); | ||
| 263 | -void background(const char *pidfile); | ||
| 264 | void udhcp_logging(int level, const char *fmt, ...); | ||
| 265 | |||
| 266 | #define LOG(level, str, args...) udhcp_logging(level, str, ## args) | ||
| 267 | --- busybox-1.00/networking/udhcp/script.c-dist 2004-05-19 17:45:47.000000000 +1000 | ||
| 268 | +++ busybox-1.00/networking/udhcp/script.c 2004-10-27 15:54:04.000000000 +1000 | ||
| 269 | @@ -228,6 +228,6 @@ | ||
| 270 | execle(client_config.script, client_config.script, | ||
| 271 | name, NULL, envp); | ||
| 272 | LOG(LOG_ERR, "script %s failed: %m", client_config.script); | ||
| 273 | - exit(1); | ||
| 274 | + _exit(1); | ||
| 275 | } | ||
| 276 | } | ||
diff --git a/meta/packages/busybox/busybox-1.01/udhcpscript.patch b/meta/packages/busybox/busybox-1.01/udhcpscript.patch deleted file mode 100644 index fc21d440cd..0000000000 --- a/meta/packages/busybox/busybox-1.01/udhcpscript.patch +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | |||
| 2 | # | ||
| 3 | # Patch managed by http://www.holgerschurig.de/patcher.html | ||
| 4 | # | ||
| 5 | |||
| 6 | --- busybox-1.00-rc3/examples/udhcp/simple.script~udhcpscript | ||
| 7 | +++ busybox-1.00-rc3/examples/udhcp/simple.script | ||
| 8 | @@ -17,8 +17,7 @@ | ||
| 9 | /sbin/ifconfig $interface $ip $BROADCAST $NETMASK | ||
| 10 | |||
| 11 | if [ -n "$router" ] ; then | ||
| 12 | - echo "deleting routers" | ||
| 13 | - while route del default gw 0.0.0.0 dev $interface ; do | ||
| 14 | + while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do | ||
| 15 | : | ||
| 16 | done | ||
| 17 | |||
diff --git a/meta/packages/busybox/busybox-1.01/wrt54/defconfig b/meta/packages/busybox/busybox-1.01/wrt54/defconfig deleted file mode 100644 index 7f1aef4ef9..0000000000 --- a/meta/packages/busybox/busybox-1.01/wrt54/defconfig +++ /dev/null | |||
| @@ -1,476 +0,0 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # | ||
| 4 | HAVE_DOT_CONFIG=y | ||
| 5 | |||
| 6 | # | ||
| 7 | # General Configuration | ||
| 8 | # | ||
| 9 | # CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set | ||
| 10 | CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y | ||
| 11 | # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set | ||
| 12 | CONFIG_FEATURE_VERBOSE_USAGE=y | ||
| 13 | # CONFIG_FEATURE_INSTALLER is not set | ||
| 14 | # CONFIG_LOCALE_SUPPORT is not set | ||
| 15 | CONFIG_FEATURE_DEVFS=y | ||
| 16 | CONFIG_FEATURE_DEVPTS=y | ||
| 17 | # CONFIG_FEATURE_CLEAN_UP is not set | ||
| 18 | CONFIG_FEATURE_SUID=y | ||
| 19 | # CONFIG_FEATURE_SUID_CONFIG is not set | ||
| 20 | # CONFIG_SELINUX is not set | ||
| 21 | |||
| 22 | # | ||
| 23 | # Build Options | ||
| 24 | # | ||
| 25 | # CONFIG_STATIC is not set | ||
| 26 | CONFIG_LFS=y | ||
| 27 | USING_CROSS_COMPILER=y | ||
| 28 | CROSS_COMPILER_PREFIX="mipsel-uclibc-" | ||
| 29 | EXTRA_CFLAGS_OPTIONS="-Os " | ||
| 30 | |||
| 31 | # | ||
| 32 | # Installation Options | ||
| 33 | # | ||
| 34 | # CONFIG_INSTALL_NO_USR is not set | ||
| 35 | PREFIX="./_install" | ||
| 36 | |||
| 37 | # | ||
| 38 | # Archival Utilities | ||
| 39 | # | ||
| 40 | # CONFIG_AR is not set | ||
| 41 | CONFIG_BUNZIP2=y | ||
| 42 | # CONFIG_CPIO is not set | ||
| 43 | # CONFIG_DPKG is not set | ||
| 44 | # CONFIG_DPKG_DEB is not set | ||
| 45 | CONFIG_GUNZIP=y | ||
| 46 | CONFIG_FEATURE_GUNZIP_UNCOMPRESS=y | ||
| 47 | CONFIG_GZIP=y | ||
| 48 | # CONFIG_RPM2CPIO is not set | ||
| 49 | # CONFIG_RPM is not set | ||
| 50 | CONFIG_TAR=y | ||
| 51 | CONFIG_FEATURE_TAR_CREATE=y | ||
| 52 | CONFIG_FEATURE_TAR_BZIP2=y | ||
| 53 | CONFIG_FEATURE_TAR_FROM=y | ||
| 54 | CONFIG_FEATURE_TAR_GZIP=y | ||
| 55 | # CONFIG_FEATURE_TAR_COMPRESS is not set | ||
| 56 | # CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY is not set | ||
| 57 | CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y | ||
| 58 | # CONFIG_FEATURE_TAR_LONG_OPTIONS is not set | ||
| 59 | # CONFIG_UNCOMPRESS is not set | ||
| 60 | # CONFIG_UNZIP is not set | ||
| 61 | |||
| 62 | # | ||
| 63 | # Common options for cpio and tar | ||
| 64 | # | ||
| 65 | # CONFIG_FEATURE_UNARCHIVE_TAPE is not set | ||
| 66 | |||
| 67 | # | ||
| 68 | # Coreutils | ||
| 69 | # | ||
| 70 | CONFIG_BASENAME=y | ||
| 71 | # CONFIG_CAL is not set | ||
| 72 | CONFIG_CAT=y | ||
| 73 | CONFIG_CHGRP=y | ||
| 74 | CONFIG_CHMOD=y | ||
| 75 | CONFIG_CHOWN=y | ||
| 76 | CONFIG_CHROOT=y | ||
| 77 | # CONFIG_CMP is not set | ||
| 78 | CONFIG_CP=y | ||
| 79 | CONFIG_CUT=y | ||
| 80 | CONFIG_DATE=y | ||
| 81 | CONFIG_FEATURE_DATE_ISOFMT=y | ||
| 82 | CONFIG_DD=y | ||
| 83 | CONFIG_DF=y | ||
| 84 | CONFIG_DIRNAME=y | ||
| 85 | # CONFIG_DOS2UNIX is not set | ||
| 86 | CONFIG_DU=y | ||
| 87 | CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y | ||
| 88 | CONFIG_ECHO=y | ||
| 89 | CONFIG_FEATURE_FANCY_ECHO=y | ||
| 90 | CONFIG_ENV=y | ||
| 91 | CONFIG_EXPR=y | ||
| 92 | CONFIG_FALSE=y | ||
| 93 | # CONFIG_FOLD is not set | ||
| 94 | CONFIG_HEAD=y | ||
| 95 | CONFIG_FEATURE_FANCY_HEAD=y | ||
| 96 | CONFIG_HOSTID=y | ||
| 97 | CONFIG_ID=y | ||
| 98 | # CONFIG_INSTALL is not set | ||
| 99 | CONFIG_LENGTH=y | ||
| 100 | CONFIG_LN=y | ||
| 101 | # CONFIG_LOGNAME is not set | ||
| 102 | CONFIG_LS=y | ||
| 103 | CONFIG_FEATURE_LS_FILETYPES=y | ||
| 104 | CONFIG_FEATURE_LS_FOLLOWLINKS=y | ||
| 105 | CONFIG_FEATURE_LS_RECURSIVE=y | ||
| 106 | CONFIG_FEATURE_LS_SORTFILES=y | ||
| 107 | CONFIG_FEATURE_LS_TIMESTAMPS=y | ||
| 108 | CONFIG_FEATURE_LS_USERNAME=y | ||
| 109 | CONFIG_FEATURE_LS_COLOR=y | ||
| 110 | CONFIG_MD5SUM=y | ||
| 111 | CONFIG_MKDIR=y | ||
| 112 | CONFIG_MKFIFO=y | ||
| 113 | # CONFIG_MKNOD is not set | ||
| 114 | CONFIG_MV=y | ||
| 115 | # CONFIG_OD is not set | ||
| 116 | # CONFIG_PRINTF is not set | ||
| 117 | CONFIG_PWD=y | ||
| 118 | # CONFIG_REALPATH is not set | ||
| 119 | CONFIG_RM=y | ||
| 120 | CONFIG_RMDIR=y | ||
| 121 | # CONFIG_SEQ is not set | ||
| 122 | # CONFIG_SHA1SUM is not set | ||
| 123 | CONFIG_SLEEP=y | ||
| 124 | CONFIG_FEATURE_FANCY_SLEEP=y | ||
| 125 | CONFIG_SORT=y | ||
| 126 | # CONFIG_STTY is not set | ||
| 127 | CONFIG_SYNC=y | ||
| 128 | CONFIG_TAIL=y | ||
| 129 | CONFIG_FEATURE_FANCY_TAIL=y | ||
| 130 | CONFIG_TEE=y | ||
| 131 | CONFIG_FEATURE_TEE_USE_BLOCK_IO=y | ||
| 132 | CONFIG_TEST=y | ||
| 133 | |||
| 134 | # | ||
| 135 | # test (forced enabled for use with shell) | ||
| 136 | # | ||
| 137 | # CONFIG_FEATURE_TEST_64 is not set | ||
| 138 | CONFIG_TOUCH=y | ||
| 139 | CONFIG_TR=y | ||
| 140 | CONFIG_TRUE=y | ||
| 141 | # CONFIG_TTY is not set | ||
| 142 | CONFIG_UNAME=y | ||
| 143 | CONFIG_UNIQ=y | ||
| 144 | # CONFIG_USLEEP is not set | ||
| 145 | # CONFIG_UUDECODE is not set | ||
| 146 | # CONFIG_UUENCODE is not set | ||
| 147 | # CONFIG_WATCH is not set | ||
| 148 | CONFIG_WC=y | ||
| 149 | # CONFIG_WHO is not set | ||
| 150 | # CONFIG_WHOAMI is not set | ||
| 151 | CONFIG_YES=y | ||
| 152 | |||
| 153 | # | ||
| 154 | # Common options for cp and mv | ||
| 155 | # | ||
| 156 | CONFIG_FEATURE_PRESERVE_HARDLINKS=y | ||
| 157 | |||
| 158 | # | ||
| 159 | # Common options for ls and more | ||
| 160 | # | ||
| 161 | CONFIG_FEATURE_AUTOWIDTH=y | ||
| 162 | |||
| 163 | # | ||
| 164 | # Common options for df, du, ls | ||
| 165 | # | ||
| 166 | CONFIG_FEATURE_HUMAN_READABLE=y | ||
| 167 | |||
| 168 | # | ||
| 169 | # Common options for md5sum, sha1sum | ||
| 170 | # | ||
| 171 | CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y | ||
| 172 | |||
| 173 | # | ||
| 174 | # Console Utilities | ||
| 175 | # | ||
| 176 | # CONFIG_CHVT is not set | ||
| 177 | CONFIG_CLEAR=y | ||
| 178 | # CONFIG_DEALLOCVT is not set | ||
| 179 | # CONFIG_DUMPKMAP is not set | ||
| 180 | # CONFIG_GETKEY is not set | ||
| 181 | # CONFIG_LOADFONT is not set | ||
| 182 | # CONFIG_LOADKMAP is not set | ||
| 183 | # CONFIG_OPENVT is not set | ||
| 184 | CONFIG_RESET=y | ||
| 185 | # CONFIG_SETKEYCODES is not set | ||
| 186 | |||
| 187 | # | ||
| 188 | # Debian Utilities | ||
| 189 | # | ||
| 190 | CONFIG_MKTEMP=y | ||
| 191 | # CONFIG_PIPE_PROGRESS is not set | ||
| 192 | # CONFIG_READLINK is not set | ||
| 193 | CONFIG_RUN_PARTS=y | ||
| 194 | CONFIG_START_STOP_DAEMON=y | ||
| 195 | CONFIG_WHICH=y | ||
| 196 | |||
| 197 | # | ||
| 198 | # Editors | ||
| 199 | # | ||
| 200 | CONFIG_AWK=y | ||
| 201 | CONFIG_FEATURE_AWK_MATH=y | ||
| 202 | # CONFIG_PATCH is not set | ||
| 203 | CONFIG_SED=y | ||
| 204 | CONFIG_VI=y | ||
| 205 | CONFIG_FEATURE_VI_COLON=y | ||
| 206 | CONFIG_FEATURE_VI_YANKMARK=y | ||
| 207 | CONFIG_FEATURE_VI_SEARCH=y | ||
| 208 | CONFIG_FEATURE_VI_USE_SIGNALS=y | ||
| 209 | CONFIG_FEATURE_VI_DOT_CMD=y | ||
| 210 | CONFIG_FEATURE_VI_READONLY=y | ||
| 211 | CONFIG_FEATURE_VI_SETOPTS=y | ||
| 212 | CONFIG_FEATURE_VI_SET=y | ||
| 213 | CONFIG_FEATURE_VI_WIN_RESIZE=y | ||
| 214 | CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y | ||
| 215 | |||
| 216 | # | ||
| 217 | # Finding Utilities | ||
| 218 | # | ||
| 219 | CONFIG_FIND=y | ||
| 220 | # CONFIG_FEATURE_FIND_MTIME is not set | ||
| 221 | CONFIG_FEATURE_FIND_PERM=y | ||
| 222 | CONFIG_FEATURE_FIND_TYPE=y | ||
| 223 | CONFIG_FEATURE_FIND_XDEV=y | ||
| 224 | # CONFIG_FEATURE_FIND_NEWER is not set | ||
| 225 | # CONFIG_FEATURE_FIND_INUM is not set | ||
| 226 | CONFIG_GREP=y | ||
| 227 | CONFIG_FEATURE_GREP_EGREP_ALIAS=y | ||
| 228 | CONFIG_FEATURE_GREP_FGREP_ALIAS=y | ||
| 229 | CONFIG_FEATURE_GREP_CONTEXT=y | ||
| 230 | CONFIG_XARGS=y | ||
| 231 | CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y | ||
| 232 | CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y | ||
| 233 | CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y | ||
| 234 | CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y | ||
| 235 | |||
| 236 | # | ||
| 237 | # Init Utilities | ||
| 238 | # | ||
| 239 | CONFIG_INIT=y | ||
| 240 | CONFIG_FEATURE_USE_INITTAB=y | ||
| 241 | # CONFIG_FEATURE_INITRD is not set | ||
| 242 | # CONFIG_FEATURE_INIT_COREDUMPS is not set | ||
| 243 | # CONFIG_FEATURE_EXTRA_QUIET is not set | ||
| 244 | # CONFIG_HALT is not set | ||
| 245 | # CONFIG_POWEROFF is not set | ||
| 246 | CONFIG_REBOOT=y | ||
| 247 | CONFIG_MESG=y | ||
| 248 | |||
| 249 | # | ||
| 250 | # Login/Password Management Utilities | ||
| 251 | # | ||
| 252 | # CONFIG_USE_BB_PWD_GRP is not set | ||
| 253 | # CONFIG_ADDGROUP is not set | ||
| 254 | # CONFIG_DELGROUP is not set | ||
| 255 | # CONFIG_ADDUSER is not set | ||
| 256 | # CONFIG_DELUSER is not set | ||
| 257 | # CONFIG_GETTY is not set | ||
| 258 | # CONFIG_FEATURE_U_W_TMP is not set | ||
| 259 | CONFIG_LOGIN=y | ||
| 260 | CONFIG_FEATURE_SECURETTY=y | ||
| 261 | CONFIG_PASSWD=y | ||
| 262 | # CONFIG_SU is not set | ||
| 263 | # CONFIG_SULOGIN is not set | ||
| 264 | # CONFIG_VLOCK is not set | ||
| 265 | |||
| 266 | # | ||
| 267 | # Common options for adduser, deluser, login, su | ||
| 268 | # | ||
| 269 | # CONFIG_FEATURE_SHADOWPASSWDS is not set | ||
| 270 | |||
| 271 | # | ||
| 272 | # Miscellaneous Utilities | ||
| 273 | # | ||
| 274 | # CONFIG_ADJTIMEX is not set | ||
| 275 | CONFIG_CROND=y | ||
| 276 | # CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set | ||
| 277 | CONFIG_CRONTAB=y | ||
| 278 | # CONFIG_DC is not set | ||
| 279 | # CONFIG_DEVFSD is not set | ||
| 280 | # CONFIG_LAST is not set | ||
| 281 | # CONFIG_HDPARM is not set | ||
| 282 | # CONFIG_MAKEDEVS is not set | ||
| 283 | # CONFIG_MT is not set | ||
| 284 | # CONFIG_RX is not set | ||
| 285 | CONFIG_STRINGS=y | ||
| 286 | CONFIG_TIME=y | ||
| 287 | # CONFIG_WATCHDOG is not set | ||
| 288 | |||
| 289 | # | ||
| 290 | # Linux Module Utilities | ||
| 291 | # | ||
| 292 | CONFIG_INSMOD=y | ||
| 293 | CONFIG_FEATURE_2_4_MODULES=y | ||
| 294 | # CONFIG_FEATURE_2_6_MODULES is not set | ||
| 295 | # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set | ||
| 296 | # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set | ||
| 297 | # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set | ||
| 298 | # CONFIG_FEATURE_INSMOD_LOAD_MAP is not set | ||
| 299 | CONFIG_LSMOD=y | ||
| 300 | CONFIG_FEATURE_QUERY_MODULE_INTERFACE=y | ||
| 301 | # CONFIG_MODPROBE is not set | ||
| 302 | CONFIG_RMMOD=y | ||
| 303 | CONFIG_FEATURE_CHECK_TAINTED_MODULE=y | ||
| 304 | |||
| 305 | # | ||
| 306 | # Networking Utilities | ||
| 307 | # | ||
| 308 | CONFIG_FEATURE_IPV6=y | ||
| 309 | CONFIG_ARPING=y | ||
| 310 | # CONFIG_FTPGET is not set | ||
| 311 | # CONFIG_FTPPUT is not set | ||
| 312 | # CONFIG_HOSTNAME is not set | ||
| 313 | CONFIG_HTTPD=y | ||
| 314 | # CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY is not set | ||
| 315 | CONFIG_FEATURE_HTTPD_BASIC_AUTH=y | ||
| 316 | CONFIG_FEATURE_HTTPD_AUTH_MD5=y | ||
| 317 | CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP=y | ||
| 318 | # CONFIG_FEATURE_HTTPD_SETUID is not set | ||
| 319 | CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES=y | ||
| 320 | CONFIG_FEATURE_HTTPD_CGI=y | ||
| 321 | CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y | ||
| 322 | CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y | ||
| 323 | CONFIG_IFCONFIG=y | ||
| 324 | CONFIG_FEATURE_IFCONFIG_STATUS=y | ||
| 325 | # CONFIG_FEATURE_IFCONFIG_SLIP is not set | ||
| 326 | # CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set | ||
| 327 | CONFIG_FEATURE_IFCONFIG_HW=y | ||
| 328 | CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y | ||
| 329 | CONFIG_IFUPDOWN=y | ||
| 330 | # CONFIG_FEATURE_IFUPDOWN_IP is not set | ||
| 331 | CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y | ||
| 332 | CONFIG_FEATURE_IFUPDOWN_IPV4=y | ||
| 333 | # CONFIG_FEATURE_IFUPDOWN_IPV6 is not set | ||
| 334 | # CONFIG_FEATURE_IFUPDOWN_IPX is not set | ||
| 335 | # CONFIG_FEATURE_IFUPDOWN_MAPPING is not set | ||
| 336 | # CONFIG_INETD is not set | ||
| 337 | # CONFIG_IP is not set | ||
| 338 | CONFIG_IPCALC=y | ||
| 339 | CONFIG_FEATURE_IPCALC_FANCY=y | ||
| 340 | # CONFIG_IPADDR is not set | ||
| 341 | # CONFIG_IPLINK is not set | ||
| 342 | # CONFIG_IPROUTE is not set | ||
| 343 | # CONFIG_IPTUNNEL is not set | ||
| 344 | # CONFIG_NAMEIF is not set | ||
| 345 | CONFIG_NC=y | ||
| 346 | CONFIG_NETSTAT=y | ||
| 347 | CONFIG_NSLOOKUP=y | ||
| 348 | CONFIG_PING=y | ||
| 349 | CONFIG_FEATURE_FANCY_PING=y | ||
| 350 | CONFIG_PING6=y | ||
| 351 | CONFIG_FEATURE_FANCY_PING6=y | ||
| 352 | CONFIG_ROUTE=y | ||
| 353 | # CONFIG_TELNET is not set | ||
| 354 | # CONFIG_TELNETD is not set | ||
| 355 | # CONFIG_TFTP is not set | ||
| 356 | CONFIG_TRACEROUTE=y | ||
| 357 | CONFIG_FEATURE_TRACEROUTE_VERBOSE=y | ||
| 358 | CONFIG_VCONFIG=y | ||
| 359 | CONFIG_WGET=y | ||
| 360 | CONFIG_FEATURE_WGET_STATUSBAR=y | ||
| 361 | CONFIG_FEATURE_WGET_AUTHENTICATION=y | ||
| 362 | CONFIG_FEATURE_WGET_IP6_LITERAL=y | ||
| 363 | |||
| 364 | # | ||
| 365 | # udhcp Server/Client | ||
| 366 | # | ||
| 367 | # CONFIG_UDHCPD is not set | ||
| 368 | CONFIG_UDHCPC=y | ||
| 369 | # CONFIG_FEATURE_UDHCP_SYSLOG is not set | ||
| 370 | # CONFIG_FEATURE_UDHCP_DEBUG is not set | ||
| 371 | |||
| 372 | # | ||
| 373 | # Process Utilities | ||
| 374 | # | ||
| 375 | CONFIG_FREE=y | ||
| 376 | CONFIG_KILL=y | ||
| 377 | CONFIG_KILLALL=y | ||
| 378 | CONFIG_PIDOF=y | ||
| 379 | CONFIG_PS=y | ||
| 380 | # CONFIG_RENICE is not set | ||
| 381 | CONFIG_TOP=y | ||
| 382 | FEATURE_CPU_USAGE_PERCENTAGE=y | ||
| 383 | CONFIG_UPTIME=y | ||
| 384 | CONFIG_SYSCTL=y | ||
| 385 | |||
| 386 | # | ||
| 387 | # Another Bourne-like Shell | ||
| 388 | # | ||
| 389 | CONFIG_FEATURE_SH_IS_ASH=y | ||
| 390 | # CONFIG_FEATURE_SH_IS_HUSH is not set | ||
| 391 | # CONFIG_FEATURE_SH_IS_LASH is not set | ||
| 392 | # CONFIG_FEATURE_SH_IS_MSH is not set | ||
| 393 | # CONFIG_FEATURE_SH_IS_NONE is not set | ||
| 394 | CONFIG_ASH=y | ||
| 395 | |||
| 396 | # | ||
| 397 | # Ash Shell Options | ||
| 398 | # | ||
| 399 | CONFIG_ASH_PIPE_OPTIMIZATION=y | ||
| 400 | CONFIG_FEATURE_BUILTIN_TEST=y | ||
| 401 | CONFIG_FEATURE_BUILTIN_ECHO=y | ||
| 402 | CONFIG_FEATURE_BUILTIN_PIDOF=y | ||
| 403 | CONFIG_ASH_ALIAS=y | ||
| 404 | CONFIG_ASH_MATH_SUPPORT=y | ||
| 405 | # CONFIG_ASH_MATH_SUPPORT_64 is not set | ||
| 406 | CONFIG_ASH_GETOPTS=y | ||
| 407 | # CONFIG_ASH_CMDCMD is not set | ||
| 408 | # CONFIG_ASH_MAIL is not set | ||
| 409 | CONFIG_ASH_OPTIMIZE_FOR_SIZE=y | ||
| 410 | # CONFIG_ASH_RANDOM_SUPPORT is not set | ||
| 411 | # CONFIG_HUSH is not set | ||
| 412 | # CONFIG_LASH is not set | ||
| 413 | # CONFIG_MSH is not set | ||
| 414 | |||
| 415 | # | ||
| 416 | # Bourne Shell Options | ||
| 417 | # | ||
| 418 | # CONFIG_FEATURE_SH_EXTRA_QUIET is not set | ||
| 419 | # CONFIG_FEATURE_SH_STANDALONE_SHELL is not set | ||
| 420 | CONFIG_FEATURE_COMMAND_EDITING=y | ||
| 421 | CONFIG_FEATURE_COMMAND_HISTORY=15 | ||
| 422 | # CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set | ||
| 423 | CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y | ||
| 424 | # CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set | ||
| 425 | CONFIG_FEATURE_SH_FANCY_PROMPT=y | ||
| 426 | |||
| 427 | # | ||
| 428 | # System Logging Utilities | ||
| 429 | # | ||
| 430 | CONFIG_SYSLOGD=y | ||
| 431 | CONFIG_FEATURE_ROTATE_LOGFILE=y | ||
| 432 | CONFIG_FEATURE_REMOTE_LOG=y | ||
| 433 | CONFIG_FEATURE_IPC_SYSLOG=y | ||
| 434 | CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 | ||
| 435 | CONFIG_LOGREAD=y | ||
| 436 | # CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set | ||
| 437 | CONFIG_KLOGD=y | ||
| 438 | CONFIG_LOGGER=y | ||
| 439 | |||
| 440 | # | ||
| 441 | # Linux System Utilities | ||
| 442 | # | ||
| 443 | CONFIG_DMESG=y | ||
| 444 | # CONFIG_FBSET is not set | ||
| 445 | # CONFIG_FDFLUSH is not set | ||
| 446 | # CONFIG_FDFORMAT is not set | ||
| 447 | # CONFIG_FDISK is not set | ||
| 448 | FDISK_SUPPORT_LARGE_DISKS=y | ||
| 449 | # CONFIG_FREERAMDISK is not set | ||
| 450 | # CONFIG_FSCK_MINIX is not set | ||
| 451 | # CONFIG_MKFS_MINIX is not set | ||
| 452 | # CONFIG_GETOPT is not set | ||
| 453 | CONFIG_HEXDUMP=y | ||
| 454 | # CONFIG_HWCLOCK is not set | ||
| 455 | # CONFIG_LOSETUP is not set | ||
| 456 | # CONFIG_MKSWAP is not set | ||
| 457 | CONFIG_MORE=y | ||
| 458 | CONFIG_FEATURE_USE_TERMIOS=y | ||
| 459 | CONFIG_PIVOT_ROOT=y | ||
| 460 | CONFIG_RDATE=y | ||
| 461 | # CONFIG_SWAPONOFF is not set | ||
| 462 | CONFIG_MOUNT=y | ||
| 463 | CONFIG_NFSMOUNT=y | ||
| 464 | CONFIG_UMOUNT=y | ||
| 465 | CONFIG_FEATURE_MOUNT_FORCE=y | ||
| 466 | |||
| 467 | # | ||
| 468 | # Common options for mount/umount | ||
| 469 | # | ||
| 470 | CONFIG_FEATURE_MOUNT_LOOP=y | ||
| 471 | # CONFIG_FEATURE_MTAB_SUPPORT is not set | ||
| 472 | |||
| 473 | # | ||
| 474 | # Debugging Options | ||
| 475 | # | ||
| 476 | # CONFIG_DEBUG is not set | ||
diff --git a/meta/packages/busybox/busybox-1.01/xargs-double-size.patch b/meta/packages/busybox/busybox-1.01/xargs-double-size.patch deleted file mode 100644 index 218d6c0d1c..0000000000 --- a/meta/packages/busybox/busybox-1.01/xargs-double-size.patch +++ /dev/null | |||
| @@ -1,13 +0,0 @@ | |||
| 1 | --- busybox-1.01/findutils/xargs.c.org 2006-09-19 18:18:17.084592997 +0200 | ||
| 2 | +++ busybox-1.01/findutils/xargs.c 2006-09-19 18:18:09.820275793 +0200 | ||
| 3 | @@ -466,8 +466,8 @@ | ||
| 4 | have it at 1 meg). Things will work fine with a large ARG_MAX but it | ||
| 5 | will probably hurt the system more than it needs to; an array of this | ||
| 6 | size is allocated. */ | ||
| 7 | - if (orig_arg_max > 20 * 1024) | ||
| 8 | - orig_arg_max = 20 * 1024; | ||
| 9 | + if (orig_arg_max > 40 * 1024) | ||
| 10 | + orig_arg_max = 40 * 1024; | ||
| 11 | n_max_chars = orig_arg_max; | ||
| 12 | } | ||
| 13 | max_chars = xmalloc(n_max_chars); | ||
diff --git a/meta/packages/busybox/busybox_1.01.bb b/meta/packages/busybox/busybox_1.01.bb deleted file mode 100644 index c4968ab6e6..0000000000 --- a/meta/packages/busybox/busybox_1.01.bb +++ /dev/null | |||
| @@ -1,172 +0,0 @@ | |||
| 1 | DESCRIPTION = "BusyBox combines tiny versions of many common UNIX utilities into a single \ | ||
| 2 | small executable. It provides minimalist replacements for most of the \ | ||
| 3 | utilities you usually find in GNU fileutils, shellutils, etc. The utilities \ | ||
| 4 | in BusyBox generally have fewer options than their full-featured GNU \ | ||
| 5 | cousins; however, the options that are included provide the expected \ | ||
| 6 | functionality and behave very much like their GNU counterparts. BusyBox \ | ||
| 7 | provides a fairly complete POSIX environment for any small or embedded \ | ||
| 8 | system." | ||
| 9 | HOMEPAGE = "http://www.busybox.net" | ||
| 10 | LICENSE = "GPL" | ||
| 11 | SECTION = "base" | ||
| 12 | PRIORITY = "required" | ||
| 13 | PR = "r16" | ||
| 14 | |||
| 15 | SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ | ||
| 16 | file://no_strip.patch;patch=1 \ | ||
| 17 | file://udhcppidfile.patch;patch=1 \ | ||
| 18 | file://udhcppidfile-breakage.patch;patch=1 \ | ||
| 19 | file://add-getkey-applet.patch;patch=1 \ | ||
| 20 | file://below.patch;patch=1 \ | ||
| 21 | file://dhcp-hostname.patch;patch=1 \ | ||
| 22 | file://dhcpretrytime.patch;patch=1 \ | ||
| 23 | file://fbset.patch;patch=1 \ | ||
| 24 | file://hdparm_M.patch;patch=1 \ | ||
| 25 | file://ifupdown-spurious-environ.patch;patch=1 \ | ||
| 26 | file://iproute-flush-cache.patch;patch=1;pnum=0 \ | ||
| 27 | file://mount-all-type.patch;patch=1 \ | ||
| 28 | file://readlink.patch;patch=1 \ | ||
| 29 | file://rmmod.patch;patch=1 \ | ||
| 30 | file://udhcpscript.patch;patch=1 \ | ||
| 31 | file://thumb-bsdlabel.patch;patch=1 \ | ||
| 32 | file://glibc2.4-icmp6.patch;patch=1 \ | ||
| 33 | file://defconfig \ | ||
| 34 | file://busybox-cron \ | ||
| 35 | file://busybox-httpd \ | ||
| 36 | file://busybox-udhcpd \ | ||
| 37 | file://syslog \ | ||
| 38 | file://hwclock.sh \ | ||
| 39 | file://default.script \ | ||
| 40 | file://syslog.conf \ | ||
| 41 | file://mount.busybox \ | ||
| 42 | file://umount.busybox" | ||
| 43 | # file://uclibc_posix.patch;patch=1 \ | ||
| 44 | |||
| 45 | SRC_URI_append_slugos += " file://sysctl.conf " | ||
| 46 | SRC_URI_append_nylon = " file://xargs-double-size.patch;patch=1" | ||
| 47 | |||
| 48 | S = "${WORKDIR}/busybox-${PV}" | ||
| 49 | |||
| 50 | export EXTRA_CFLAGS = "${CFLAGS}" | ||
| 51 | EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}" | ||
| 52 | PACKAGES =+ "${PN}-httpd ${PN}-udhcpd" | ||
| 53 | |||
| 54 | FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www" | ||
| 55 | FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd" | ||
| 56 | |||
| 57 | FILES_${PN} += " ${datadir}/udhcpc" | ||
| 58 | |||
| 59 | INITSCRIPT_PACKAGES = "${PN} ${PN}-httpd ${PN}-udhcpd" | ||
| 60 | INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd" | ||
| 61 | INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" | ||
| 62 | INITSCRIPT_NAME_${PN} = "syslog" | ||
| 63 | CONFFILES_${PN} = "${sysconfdir}/syslog.conf" | ||
| 64 | |||
| 65 | # This disables the syslog startup links in slugos (see slugos-init) | ||
| 66 | INITSCRIPT_PARAMS_${PN}_slugos = "start 20 ." | ||
| 67 | |||
| 68 | inherit cml1 update-rc.d | ||
| 69 | |||
| 70 | do_configure () { | ||
| 71 | install -m 0644 ${WORKDIR}/defconfig ${S}/.config | ||
| 72 | cml1_do_configure | ||
| 73 | } | ||
| 74 | |||
| 75 | do_compile () { | ||
| 76 | unset CFLAGS | ||
| 77 | base_do_compile | ||
| 78 | } | ||
| 79 | |||
| 80 | do_install () { | ||
| 81 | install -d ${D}${sysconfdir}/init.d | ||
| 82 | oe_runmake 'PREFIX=${D}' install | ||
| 83 | |||
| 84 | # Move everything to /busybox (not supposed to end up in any package) | ||
| 85 | install -d ${D}/busybox | ||
| 86 | mv ${D}${base_bindir} ${D}${base_sbindir} ${D}${prefix} ${D}/busybox/ | ||
| 87 | # Move the busybox binary back to /bin | ||
| 88 | install -d ${D}${base_bindir} | ||
| 89 | mv ${D}/busybox${base_bindir}/busybox ${D}${base_bindir}/ | ||
| 90 | # Move back the sh symlink | ||
| 91 | test -h ${D}/busybox${base_bindir}/sh && mv ${D}/busybox${base_bindir}/sh ${D}${base_bindir}/ | ||
| 92 | |||
| 93 | install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/ | ||
| 94 | install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/ | ||
| 95 | if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then | ||
| 96 | # Move crond back to /usr/sbin/crond | ||
| 97 | install -d ${D}${sbindir} | ||
| 98 | mv ${D}/busybox${sbindir}/crond ${D}${sbindir}/ | ||
| 99 | |||
| 100 | install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/ | ||
| 101 | fi | ||
| 102 | if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then | ||
| 103 | # Move httpd back to /usr/sbin/httpd | ||
| 104 | install -d ${D}${sbindir} | ||
| 105 | mv ${D}/busybox${sbindir}/httpd ${D}${sbindir}/ | ||
| 106 | |||
| 107 | install -m 0755 ${WORKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/ | ||
| 108 | install -d ${D}/srv/www | ||
| 109 | fi | ||
| 110 | if grep "CONFIG_UDHCPD=y" ${WORKDIR}/defconfig; then | ||
| 111 | # Move udhcpd back to /usr/sbin/udhcpd | ||
| 112 | install -d ${D}${sbindir} | ||
| 113 | mv ${D}/busybox${sbindir}/udhcpd ${D}${sbindir}/ | ||
| 114 | |||
| 115 | install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/ | ||
| 116 | fi | ||
| 117 | if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then | ||
| 118 | # Move hwclock back to /sbin/hwclock | ||
| 119 | install -d ${D}${base_sbindir} | ||
| 120 | mv ${D}/busybox${base_sbindir}/hwclock ${D}${base_sbindir}/ | ||
| 121 | |||
| 122 | install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/ | ||
| 123 | fi | ||
| 124 | if grep "CONFIG_UDHCPC=y" ${WORKDIR}/defconfig; then | ||
| 125 | # Move dhcpc back to /usr/sbin/udhcpc | ||
| 126 | install -d ${D}${base_sbindir} | ||
| 127 | mv ${D}/busybox${base_sbindir}/udhcpc ${D}${base_sbindir}/ | ||
| 128 | |||
| 129 | install -d ${D}${sysconfdir}/udhcpc.d | ||
| 130 | install -d ${D}${datadir}/udhcpc | ||
| 131 | install -m 0755 ${S}/examples/udhcp/simple.script ${D}${sysconfdir}/udhcpc.d/50default | ||
| 132 | install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script | ||
| 133 | fi | ||
| 134 | |||
| 135 | install -m 0644 ${S}/busybox.links ${D}${sysconfdir} | ||
| 136 | } | ||
| 137 | |||
| 138 | do_install_append_slugos() { | ||
| 139 | install -m 0644 ${WORKDIR}/sysctl.conf ${D}${sysconfdir} | ||
| 140 | } | ||
| 141 | |||
| 142 | pkg_postinst_${PN} () { | ||
| 143 | # If we are not making an image we create links for the utilities that doesn't exist | ||
| 144 | # so the update-alternatives script will get the utilities it needs | ||
| 145 | # (update-alternatives have no problem replacing links later anyway) | ||
| 146 | test -n 2> /dev/null || alias test='busybox test' | ||
| 147 | if test "x$D" = "x"; then while read link; do if test ! -h "$link"; then case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; busybox ln -s $to $link; fi; done </etc/busybox.links; fi | ||
| 148 | |||
| 149 | # This adds the links, remember that this has to work when building an image too, hence the $D | ||
| 150 | while read link; do case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; bn=`basename $link`; update-alternatives --install $link $bn $to 50; done <$D/etc/busybox.links | ||
| 151 | } | ||
| 152 | |||
| 153 | pkg_prerm_${PN} () { | ||
| 154 | # This is so you can make busybox commit suicide - removing busybox with no other packages | ||
| 155 | # providing its files, this will make update-alternatives work, but the update-rc.d part | ||
| 156 | # for syslog, httpd and/or udhcpd will fail if there is no other package providing sh | ||
| 157 | tmpdir=`mktemp -d /tmp/busyboxrm-XXXXXX` | ||
| 158 | ln -s /bin/busybox $tmpdir/[ | ||
| 159 | ln -s /bin/busybox $tmpdir/test | ||
| 160 | ln -s /bin/busybox $tmpdir/head | ||
| 161 | ln -s /bin/busybox $tmpdir/sh | ||
| 162 | ln -s /bin/busybox $tmpdir/basename | ||
| 163 | ln -s /bin/busybox $tmpdir/echo | ||
| 164 | ln -s /bin/busybox $tmpdir/mv | ||
| 165 | ln -s /bin/busybox $tmpdir/ln | ||
| 166 | ln -s /bin/busybox $tmpdir/dirname | ||
| 167 | ln -s /bin/busybox $tmpdir/rm | ||
| 168 | ln -s /bin/busybox $tmpdir/sed | ||
| 169 | ln -s /bin/busybox $tmpdir/sort | ||
| 170 | export PATH=$PATH:$tmpdir | ||
| 171 | while read link; do case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; bn=`basename $link`; sh /usr/bin/update-alternatives --remove $bn $to; done </etc/busybox.links | ||
| 172 | } | ||
diff --git a/meta/packages/busybox/busybox_1.8.2.bb b/meta/packages/busybox/busybox_1.8.2.bb index 0cd757cc9b..a1ed55a53f 100644 --- a/meta/packages/busybox/busybox_1.8.2.bb +++ b/meta/packages/busybox/busybox_1.8.2.bb | |||
| @@ -2,8 +2,6 @@ require busybox.inc | |||
| 2 | 2 | ||
| 3 | PR = "r2" | 3 | PR = "r2" |
| 4 | 4 | ||
| 5 | DEFAULT_PREFERENCE = "-1" | ||
| 6 | |||
| 7 | SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ | 5 | SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ |
| 8 | file://busybox-cron \ | 6 | file://busybox-cron \ |
| 9 | file://busybox-httpd \ | 7 | file://busybox-httpd \ |
