aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2001-03-15 17:54:56 +0000
committerandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2001-03-15 17:54:56 +0000
commit3de7d20ae04048a44df00cbb4c656e8bcf273626 (patch)
tree7680d4ef5df4862ca5611a53ccb29ae7e8f07d66
parent47e26531c4206efcf941deef37ffd5d0449c77a2 (diff)
downloadbusybox-w32-3de7d20ae04048a44df00cbb4c656e8bcf273626.tar.gz
busybox-w32-3de7d20ae04048a44df00cbb4c656e8bcf273626.tar.bz2
busybox-w32-3de7d20ae04048a44df00cbb4c656e8bcf273626.zip
Update the olympus sections
git-svn-id: svn://busybox.net/trunk/busybox@2086 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat
-rw-r--r--Config.h.Hurd106
-rw-r--r--debian/Config.h-deb112
-rw-r--r--debian/Config.h-static113
-rw-r--r--debian/Config.h-udeb112
4 files changed, 292 insertions, 151 deletions
diff --git a/Config.h.Hurd b/Config.h.Hurd
index 37806c12e..e75ca86f6 100644
--- a/Config.h.Hurd
+++ b/Config.h.Hurd
@@ -273,51 +273,107 @@
273// Nothing beyond this point should ever be touched by 273// Nothing beyond this point should ever be touched by
274// mere mortals so leave this stuff alone. 274// mere mortals so leave this stuff alone.
275// 275//
276#ifdef BB_FEATURE_MOUNT_MTAB_SUPPORT 276#if defined BB_MOUNT || defined BB_UMOUNT || defined BB_DF
277#define BB_MTAB 277 #ifdef BB_FEATURE_MOUNT_MTAB_SUPPORT
278#endif 278 #define BB_MTAB
279// 279 #endif
280#if defined BB_FEATURE_SH_COMMAND_EDITING && defined BB_SH 280#else
281#define BB_CMDEDIT 281 #undef BB_MTAB
282#endif
283//
284#if defined BB_SH
285 #if defined BB_FEATURE_COMMAND_EDITING
286 #define BB_CMDEDIT
287 #ifndef BB_FEATURE_USE_TERMIOS
288 #define BB_FEATURE_USE_TERMIOS
289 #endif
290 #else
291 #undef BB_FEATURE_COMMAND_EDITING
292 #undef BB_FEATURE_COMMAND_TAB_COMPLETION
293 #undef BB_FEATURE_COMMAND_USERNAME_COMPLETION
294 #define BB_FEATURE_SH_SIMPLE_PROMPT
295 #endif
296#else
297 #undef BB_FEATURE_COMMAND_EDITING
298 #undef BB_FEATURE_SH_APPLETS_ALWAYS_WIN
299 #undef BB_FEATURE_SH_STANDALONE_SHELL
300 #undef BB_FEATURE_SH_SIMPLE_PROMPT
282#endif 301#endif
283// 302//
284#ifdef BB_KILLALL 303#ifdef BB_KILLALL
285#ifndef BB_KILL 304 #ifndef BB_KILL
286#define BB_KILL 305 #define BB_KILL
287#endif 306 #endif
288#endif 307#endif
289// 308//
290#ifdef BB_FEATURE_LINUXRC
291#ifndef BB_INIT 309#ifndef BB_INIT
292#define BB_INIT 310 #undef BB_LINUXRC
293#endif 311 #undef BB_FEATURE_LINUXRC
294#define BB_LINUXRC
295#endif 312#endif
296// 313//
297#ifdef BB_GZIP 314#ifdef BB_GZIP
298#ifndef BB_GUNZIP 315 #ifndef BB_GUNZIP
299#define BB_GUNZIP 316 #define BB_GUNZIP
317 #endif
300#endif 318#endif
319//
320#ifdef BB_DPKG
321 #ifndef BB_DPKG_DEB
322 #define BB_DPKG_DEB
323 #endif
301#endif 324#endif
302// 325//
303#if defined BB_MOUNT && defined BB_FEATURE_NFSMOUNT 326#ifdef BB_DPKG_DEB
304#define BB_NFSMOUNT 327 #ifndef BB_AR
328 #define BB_AR
329 #endif
330 #ifndef BB_TAR
331 #define BB_TAR
332 #endif
333 #ifndef BB_FEATURE_TAR_GZIP
334 #define BB_FEATURE_TAR_GZIP
335 #endif
305#endif 336#endif
306// 337//
307#if defined BB_FEATURE_SH_COMMAND_EDITING 338#ifdef BB_TAR
308#ifndef BB_FEATURE_USE_TERMIOS 339 #ifdef BB_FEATURE_TAR_GZIP
309#define BB_FEATURE_USE_TERMIOS 340 #ifndef BB_GUNZIP
341 #define BB_GUNZIP
342 #endif
343 #endif
310#endif 344#endif
345//
346#if defined BB_MOUNT && defined BB_FEATURE_NFSMOUNT
347 #define BB_NFSMOUNT
311#endif 348#endif
312// 349//
350#if defined BB_IFCONFIG
351 #ifdef BB_FEATURE_IFCONFIG_STATUS
352 #define BB_INTERFACE
353 #endif
354#else
355 #undef BB_INTERFACE
356#endif
357//
313#if defined BB_FEATURE_AUTOWIDTH 358#if defined BB_FEATURE_AUTOWIDTH
314#ifndef BB_FEATURE_USE_TERMIOS 359 #ifndef BB_FEATURE_USE_TERMIOS
315#define BB_FEATURE_USE_TERMIOS 360 #define BB_FEATURE_USE_TERMIOS
361 #endif
316#endif 362#endif
363//
364#if defined BB_INSMOD || defined BB_LSMOD
365 #if ! defined BB_FEATURE_NEW_MODULE_INTERFACE && ! defined BB_FEATURE_OLD_MODULE_INTERFACE
366 #define BB_FEATURE_NEW_MODULE_INTERFACE
367 #endif
317#endif 368#endif
318// 369//
319#if defined BB_INSMOD 370#ifdef BB_SYSLOGD
320#ifndef BB_FEATURE_INSMOD_OLD_KERNEL 371 #if defined BB_FEATURE_IPC_SYSLOG
321#define BB_FEATURE_INSMOD_NEW_KERNEL 372 #define BB_LOGREAD
373 #endif
322#endif 374#endif
375//
376#if defined BB_DOS2UNIX
377 #define BB_UNIX2DOS
323#endif 378#endif
379
diff --git a/debian/Config.h-deb b/debian/Config.h-deb
index 90368232f..649dd431f 100644
--- a/debian/Config.h-deb
+++ b/debian/Config.h-deb
@@ -325,78 +325,106 @@
325// mere mortals so leave this stuff alone. 325// mere mortals so leave this stuff alone.
326// 326//
327#if defined BB_MOUNT || defined BB_UMOUNT || defined BB_DF 327#if defined BB_MOUNT || defined BB_UMOUNT || defined BB_DF
328#ifdef BB_FEATURE_MOUNT_MTAB_SUPPORT 328 #ifdef BB_FEATURE_MOUNT_MTAB_SUPPORT
329#define BB_MTAB 329 #define BB_MTAB
330#endif 330 #endif
331#else 331#else
332#undef BB_MTAB 332 #undef BB_MTAB
333#endif 333#endif
334// 334//
335#if defined BB_FEATURE_SH_COMMAND_EDITING && defined BB_SH 335#if defined BB_SH
336#define BB_CMDEDIT 336 #if defined BB_FEATURE_COMMAND_EDITING
337 #define BB_CMDEDIT
338 #ifndef BB_FEATURE_USE_TERMIOS
339 #define BB_FEATURE_USE_TERMIOS
340 #endif
341 #else
342 #undef BB_FEATURE_COMMAND_EDITING
343 #undef BB_FEATURE_COMMAND_TAB_COMPLETION
344 #undef BB_FEATURE_COMMAND_USERNAME_COMPLETION
345 #define BB_FEATURE_SH_SIMPLE_PROMPT
346 #endif
347#else
348 #undef BB_FEATURE_COMMAND_EDITING
349 #undef BB_FEATURE_SH_APPLETS_ALWAYS_WIN
350 #undef BB_FEATURE_SH_STANDALONE_SHELL
351 #undef BB_FEATURE_SH_SIMPLE_PROMPT
337#endif 352#endif
338// 353//
339#ifdef BB_KILLALL 354#ifdef BB_KILLALL
340#ifndef BB_KILL 355 #ifndef BB_KILL
341#define BB_KILL 356 #define BB_KILL
342#endif 357 #endif
343#endif 358#endif
344// 359//
345#ifndef BB_INIT 360#ifndef BB_INIT
346#undef BB_LINUXRC 361 #undef BB_LINUXRC
347#undef BB_FEATURE_LINUXRC 362 #undef BB_FEATURE_LINUXRC
348#endif 363#endif
349// 364//
350#ifdef BB_GZIP 365#ifdef BB_GZIP
351#ifndef BB_GUNZIP 366 #ifndef BB_GUNZIP
352#define BB_GUNZIP 367 #define BB_GUNZIP
353#endif 368 #endif
354#endif 369#endif
355// 370//
356#ifdef BB_DPKG 371#ifdef BB_DPKG
357#ifndef BB_DPKG_DEB 372 #ifndef BB_DPKG_DEB
358#define BB_DPKG_DEB 373 #define BB_DPKG_DEB
359#endif 374 #endif
360#endif 375#endif
361// 376//
362#ifdef BB_DPKG_DEB 377#ifdef BB_DPKG_DEB
363#ifndef BB_AR 378 #ifndef BB_AR
364#define BB_AR 379 #define BB_AR
365#endif 380 #endif
366#ifndef BB_TAR 381 #ifndef BB_TAR
367#define BB_TAR 382 #define BB_TAR
368#endif 383 #endif
369#ifndef BB_FEATURE_TAR_GZIP 384 #ifndef BB_FEATURE_TAR_GZIP
370#define BB_FEATURE_TAR_GZIP 385 #define BB_FEATURE_TAR_GZIP
371#endif 386 #endif
372#endif 387#endif
373// 388//
374#ifdef BB_TAR 389#ifdef BB_TAR
375#ifdef BB_FEATURE_TAR_GZIP 390 #ifdef BB_FEATURE_TAR_GZIP
376#ifndef BB_GUNZIP 391 #ifndef BB_GUNZIP
377#define BB_GUNZIP 392 #define BB_GUNZIP
378#endif 393 #endif
379#endif 394 #endif
380#endif 395#endif
381// 396//
382#if defined BB_MOUNT && defined BB_FEATURE_NFSMOUNT 397#if defined BB_MOUNT && defined BB_FEATURE_NFSMOUNT
383#define BB_NFSMOUNT 398 #define BB_NFSMOUNT
384#endif 399#endif
385// 400//
386#if defined BB_FEATURE_SH_COMMAND_EDITING 401#if defined BB_IFCONFIG
387#ifndef BB_FEATURE_USE_TERMIOS 402 #ifdef BB_FEATURE_IFCONFIG_STATUS
388#define BB_FEATURE_USE_TERMIOS 403 #define BB_INTERFACE
389#endif 404 #endif
390#endif 405#else
406 #undef BB_INTERFACE
407#endif
391// 408//
392#if defined BB_FEATURE_AUTOWIDTH 409#if defined BB_FEATURE_AUTOWIDTH
393#ifndef BB_FEATURE_USE_TERMIOS 410 #ifndef BB_FEATURE_USE_TERMIOS
394#define BB_FEATURE_USE_TERMIOS 411 #define BB_FEATURE_USE_TERMIOS
395#endif 412 #endif
396#endif 413#endif
397// 414//
398#if defined BB_INSMOD || defined BB_LSMOD 415#if defined BB_INSMOD || defined BB_LSMOD
399#ifndef BB_FEATURE_NEW_MODULE_INTERFACE 416 #if ! defined BB_FEATURE_NEW_MODULE_INTERFACE && ! defined BB_FEATURE_OLD_MODULE_INTERFACE
400#define BB_FEATURE_NEW_MODULE_INTERFACE 417 #define BB_FEATURE_NEW_MODULE_INTERFACE
418 #endif
401#endif 419#endif
420//
421#ifdef BB_SYSLOGD
422 #if defined BB_FEATURE_IPC_SYSLOG
423 #define BB_LOGREAD
424 #endif
425#endif
426//
427#if defined BB_DOS2UNIX
428 #define BB_UNIX2DOS
402#endif 429#endif
430
diff --git a/debian/Config.h-static b/debian/Config.h-static
index 9dc2215fd..c4ce444f3 100644
--- a/debian/Config.h-static
+++ b/debian/Config.h-static
@@ -325,78 +325,107 @@
325// mere mortals so leave this stuff alone. 325// mere mortals so leave this stuff alone.
326// 326//
327#if defined BB_MOUNT || defined BB_UMOUNT || defined BB_DF 327#if defined BB_MOUNT || defined BB_UMOUNT || defined BB_DF
328#ifdef BB_FEATURE_MOUNT_MTAB_SUPPORT 328 #ifdef BB_FEATURE_MOUNT_MTAB_SUPPORT
329#define BB_MTAB 329 #define BB_MTAB
330#endif 330 #endif
331#else 331#else
332#undef BB_MTAB 332 #undef BB_MTAB
333#endif 333#endif
334// 334//
335#if defined BB_FEATURE_SH_COMMAND_EDITING && defined BB_SH 335#if defined BB_SH
336#define BB_CMDEDIT 336 #if defined BB_FEATURE_COMMAND_EDITING
337 #define BB_CMDEDIT
338 #ifndef BB_FEATURE_USE_TERMIOS
339 #define BB_FEATURE_USE_TERMIOS
340 #endif
341 #else
342 #undef BB_FEATURE_COMMAND_EDITING
343 #undef BB_FEATURE_COMMAND_TAB_COMPLETION
344 #undef BB_FEATURE_COMMAND_USERNAME_COMPLETION
345 #define BB_FEATURE_SH_SIMPLE_PROMPT
346 #endif
347#else
348 #undef BB_FEATURE_COMMAND_EDITING
349 #undef BB_FEATURE_SH_APPLETS_ALWAYS_WIN
350 #undef BB_FEATURE_SH_STANDALONE_SHELL
351 #undef BB_FEATURE_SH_SIMPLE_PROMPT
337#endif 352#endif
338// 353//
339#ifdef BB_KILLALL 354#ifdef BB_KILLALL
340#ifndef BB_KILL 355 #ifndef BB_KILL
341#define BB_KILL 356 #define BB_KILL
342#endif 357 #endif
343#endif 358#endif
344// 359//
345#ifndef BB_INIT 360#ifndef BB_INIT
346#undef BB_LINUXRC 361 #undef BB_LINUXRC
347#undef BB_FEATURE_LINUXRC 362 #undef BB_FEATURE_LINUXRC
348#endif 363#endif
349// 364//
350#ifdef BB_GZIP 365#ifdef BB_GZIP
351#ifndef BB_GUNZIP 366 #ifndef BB_GUNZIP
352#define BB_GUNZIP 367 #define BB_GUNZIP
353#endif 368 #endif
354#endif 369#endif
355// 370//
356#ifdef BB_DPKG 371#ifdef BB_DPKG
357#ifndef BB_DPKG_DEB 372 #ifndef BB_DPKG_DEB
358#define BB_DPKG_DEB 373 #define BB_DPKG_DEB
359#endif 374 #endif
360#endif 375#endif
361// 376//
362#ifdef BB_DPKG_DEB 377#ifdef BB_DPKG_DEB
363#ifndef BB_AR 378 #ifndef BB_AR
364#define BB_AR 379 #define BB_AR
365#endif 380 #endif
366#ifndef BB_TAR 381 #ifndef BB_TAR
367#define BB_TAR 382 #define BB_TAR
368#endif 383 #endif
369#ifndef BB_FEATURE_TAR_GZIP 384 #ifndef BB_FEATURE_TAR_GZIP
370#define BB_FEATURE_TAR_GZIP 385 #define BB_FEATURE_TAR_GZIP
371#endif 386 #endif
372#endif 387#endif
373// 388//
374#ifdef BB_TAR 389#ifdef BB_TAR
375#ifdef BB_FEATURE_TAR_GZIP 390 #ifdef BB_FEATURE_TAR_GZIP
376#ifndef BB_GUNZIP 391 #ifndef BB_GUNZIP
377#define BB_GUNZIP 392 #define BB_GUNZIP
378#endif 393 #endif
379#endif 394 #endif
380#endif 395#endif
381// 396//
382#if defined BB_MOUNT && defined BB_FEATURE_NFSMOUNT 397#if defined BB_MOUNT && defined BB_FEATURE_NFSMOUNT
383#define BB_NFSMOUNT 398 #define BB_NFSMOUNT
384#endif 399#endif
385// 400//
386#if defined BB_FEATURE_SH_COMMAND_EDITING 401#if defined BB_IFCONFIG
387#ifndef BB_FEATURE_USE_TERMIOS 402 #ifdef BB_FEATURE_IFCONFIG_STATUS
388#define BB_FEATURE_USE_TERMIOS 403 #define BB_INTERFACE
389#endif 404 #endif
390#endif 405#else
406 #undef BB_INTERFACE
407#endif
391// 408//
392#if defined BB_FEATURE_AUTOWIDTH 409#if defined BB_FEATURE_AUTOWIDTH
393#ifndef BB_FEATURE_USE_TERMIOS 410 #ifndef BB_FEATURE_USE_TERMIOS
394#define BB_FEATURE_USE_TERMIOS 411 #define BB_FEATURE_USE_TERMIOS
395#endif 412 #endif
396#endif 413#endif
397// 414//
398#if defined BB_INSMOD || defined BB_LSMOD 415#if defined BB_INSMOD || defined BB_LSMOD
399#ifndef BB_FEATURE_NEW_MODULE_INTERFACE 416 #if ! defined BB_FEATURE_NEW_MODULE_INTERFACE && ! defined BB_FEATURE_OLD_MODULE_INTERFACE
400#define BB_FEATURE_NEW_MODULE_INTERFACE 417 #define BB_FEATURE_NEW_MODULE_INTERFACE
418 #endif
401#endif 419#endif
420//
421#ifdef BB_SYSLOGD
422 #if defined BB_FEATURE_IPC_SYSLOG
423 #define BB_LOGREAD
424 #endif
425#endif
426//
427#if defined BB_DOS2UNIX
428 #define BB_UNIX2DOS
402#endif 429#endif
430
431
diff --git a/debian/Config.h-udeb b/debian/Config.h-udeb
index 2bd3ed2fa..93c6e9051 100644
--- a/debian/Config.h-udeb
+++ b/debian/Config.h-udeb
@@ -325,78 +325,106 @@
325// mere mortals so leave this stuff alone. 325// mere mortals so leave this stuff alone.
326// 326//
327#if defined BB_MOUNT || defined BB_UMOUNT || defined BB_DF 327#if defined BB_MOUNT || defined BB_UMOUNT || defined BB_DF
328#ifdef BB_FEATURE_MOUNT_MTAB_SUPPORT 328 #ifdef BB_FEATURE_MOUNT_MTAB_SUPPORT
329#define BB_MTAB 329 #define BB_MTAB
330#endif 330 #endif
331#else 331#else
332#undef BB_MTAB 332 #undef BB_MTAB
333#endif 333#endif
334// 334//
335#if defined BB_FEATURE_SH_COMMAND_EDITING && defined BB_SH 335#if defined BB_SH
336#define BB_CMDEDIT 336 #if defined BB_FEATURE_COMMAND_EDITING
337 #define BB_CMDEDIT
338 #ifndef BB_FEATURE_USE_TERMIOS
339 #define BB_FEATURE_USE_TERMIOS
340 #endif
341 #else
342 #undef BB_FEATURE_COMMAND_EDITING
343 #undef BB_FEATURE_COMMAND_TAB_COMPLETION
344 #undef BB_FEATURE_COMMAND_USERNAME_COMPLETION
345 #define BB_FEATURE_SH_SIMPLE_PROMPT
346 #endif
347#else
348 #undef BB_FEATURE_COMMAND_EDITING
349 #undef BB_FEATURE_SH_APPLETS_ALWAYS_WIN
350 #undef BB_FEATURE_SH_STANDALONE_SHELL
351 #undef BB_FEATURE_SH_SIMPLE_PROMPT
337#endif 352#endif
338// 353//
339#ifdef BB_KILLALL 354#ifdef BB_KILLALL
340#ifndef BB_KILL 355 #ifndef BB_KILL
341#define BB_KILL 356 #define BB_KILL
342#endif 357 #endif
343#endif 358#endif
344// 359//
345#ifndef BB_INIT 360#ifndef BB_INIT
346#undef BB_LINUXRC 361 #undef BB_LINUXRC
347#undef BB_FEATURE_LINUXRC 362 #undef BB_FEATURE_LINUXRC
348#endif 363#endif
349// 364//
350#ifdef BB_GZIP 365#ifdef BB_GZIP
351#ifndef BB_GUNZIP 366 #ifndef BB_GUNZIP
352#define BB_GUNZIP 367 #define BB_GUNZIP
353#endif 368 #endif
354#endif 369#endif
355// 370//
356#ifdef BB_DPKG 371#ifdef BB_DPKG
357#ifndef BB_DPKG_DEB 372 #ifndef BB_DPKG_DEB
358#define BB_DPKG_DEB 373 #define BB_DPKG_DEB
359#endif 374 #endif
360#endif 375#endif
361// 376//
362#ifdef BB_DPKG_DEB 377#ifdef BB_DPKG_DEB
363#ifndef BB_AR 378 #ifndef BB_AR
364#define BB_AR 379 #define BB_AR
365#endif 380 #endif
366#ifndef BB_TAR 381 #ifndef BB_TAR
367#define BB_TAR 382 #define BB_TAR
368#endif 383 #endif
369#ifndef BB_FEATURE_TAR_GZIP 384 #ifndef BB_FEATURE_TAR_GZIP
370#define BB_FEATURE_TAR_GZIP 385 #define BB_FEATURE_TAR_GZIP
371#endif 386 #endif
372#endif 387#endif
373// 388//
374#ifdef BB_TAR 389#ifdef BB_TAR
375#ifdef BB_FEATURE_TAR_GZIP 390 #ifdef BB_FEATURE_TAR_GZIP
376#ifndef BB_GUNZIP 391 #ifndef BB_GUNZIP
377#define BB_GUNZIP 392 #define BB_GUNZIP
378#endif 393 #endif
379#endif 394 #endif
380#endif 395#endif
381// 396//
382#if defined BB_MOUNT && defined BB_FEATURE_NFSMOUNT 397#if defined BB_MOUNT && defined BB_FEATURE_NFSMOUNT
383#define BB_NFSMOUNT 398 #define BB_NFSMOUNT
384#endif 399#endif
385// 400//
386#if defined BB_FEATURE_SH_COMMAND_EDITING 401#if defined BB_IFCONFIG
387#ifndef BB_FEATURE_USE_TERMIOS 402 #ifdef BB_FEATURE_IFCONFIG_STATUS
388#define BB_FEATURE_USE_TERMIOS 403 #define BB_INTERFACE
389#endif 404 #endif
390#endif 405#else
406 #undef BB_INTERFACE
407#endif
391// 408//
392#if defined BB_FEATURE_AUTOWIDTH 409#if defined BB_FEATURE_AUTOWIDTH
393#ifndef BB_FEATURE_USE_TERMIOS 410 #ifndef BB_FEATURE_USE_TERMIOS
394#define BB_FEATURE_USE_TERMIOS 411 #define BB_FEATURE_USE_TERMIOS
395#endif 412 #endif
396#endif 413#endif
397// 414//
398#if defined BB_INSMOD || defined BB_LSMOD 415#if defined BB_INSMOD || defined BB_LSMOD
399#ifndef BB_FEATURE_NEW_MODULE_INTERFACE 416 #if ! defined BB_FEATURE_NEW_MODULE_INTERFACE && ! defined BB_FEATURE_OLD_MODULE_INTERFACE
400#define BB_FEATURE_NEW_MODULE_INTERFACE 417 #define BB_FEATURE_NEW_MODULE_INTERFACE
418 #endif
401#endif 419#endif
420//
421#ifdef BB_SYSLOGD
422 #if defined BB_FEATURE_IPC_SYSLOG
423 #define BB_LOGREAD
424 #endif
425#endif
426//
427#if defined BB_DOS2UNIX
428 #define BB_UNIX2DOS
402#endif 429#endif
430
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2026-01-22 18:48:13 +0000