Update the olympus sections

Config.h.Hurd

@@ -273,12 +273,31 @@
 // Nothing beyond this point should ever be touched by 
 // mere mortals so leave this stuff alone.
 //
+#if defined BB_MOUNT || defined BB_UMOUNT || defined BB_DF
 	#ifdef BB_FEATURE_MOUNT_MTAB_SUPPORT
 		#define BB_MTAB
 	#endif
+#else
+	#undef BB_MTAB
+#endif	
 //
-#if defined BB_FEATURE_SH_COMMAND_EDITING && defined BB_SH
+#if defined BB_SH
+	#if defined BB_FEATURE_COMMAND_EDITING 
 		#define BB_CMDEDIT
+		#ifndef BB_FEATURE_USE_TERMIOS
+			#define BB_FEATURE_USE_TERMIOS
+		#endif
+	#else
+		#undef BB_FEATURE_COMMAND_EDITING
+		#undef BB_FEATURE_COMMAND_TAB_COMPLETION
+		#undef BB_FEATURE_COMMAND_USERNAME_COMPLETION
+		#define BB_FEATURE_SH_SIMPLE_PROMPT
+	#endif
+#else
+	#undef BB_FEATURE_COMMAND_EDITING
+	#undef BB_FEATURE_SH_APPLETS_ALWAYS_WIN
+	#undef BB_FEATURE_SH_STANDALONE_SHELL
+	#undef BB_FEATURE_SH_SIMPLE_PROMPT
 #endif
 //
 #ifdef BB_KILLALL
@@ -287,11 +306,9 @@
 	#endif
 #endif
 //
-#ifdef BB_FEATURE_LINUXRC
 #ifndef BB_INIT
-#define BB_INIT
+	#undef BB_LINUXRC
-#endif
+	#undef BB_FEATURE_LINUXRC
-#define BB_LINUXRC
 #endif
 //
 #ifdef BB_GZIP
@@ -300,14 +317,42 @@
 	#endif
 #endif
 //
+#ifdef BB_DPKG
+	#ifndef BB_DPKG_DEB
+		#define BB_DPKG_DEB
+	#endif
+#endif
+//
+#ifdef BB_DPKG_DEB
+	#ifndef BB_AR
+		#define BB_AR
+	#endif
+	#ifndef BB_TAR
+		#define BB_TAR
+	#endif 
+	#ifndef BB_FEATURE_TAR_GZIP
+		#define BB_FEATURE_TAR_GZIP
+	#endif
+#endif
+//
+#ifdef BB_TAR
+	#ifdef BB_FEATURE_TAR_GZIP
+		#ifndef BB_GUNZIP
+			#define BB_GUNZIP
+		#endif
+	#endif
+#endif
+//
 #if defined BB_MOUNT && defined BB_FEATURE_NFSMOUNT
 	#define BB_NFSMOUNT
 #endif
 //
-#if defined BB_FEATURE_SH_COMMAND_EDITING
+#if defined BB_IFCONFIG
-#ifndef BB_FEATURE_USE_TERMIOS
+	#ifdef BB_FEATURE_IFCONFIG_STATUS
-#define BB_FEATURE_USE_TERMIOS
+		#define BB_INTERFACE
 	#endif
+#else
+	#undef BB_INTERFACE
 #endif	
 //
 #if defined BB_FEATURE_AUTOWIDTH
@@ -316,8 +361,19 @@
 	#endif
 #endif
 //
-#if defined BB_INSMOD
+#if defined BB_INSMOD || defined BB_LSMOD
-#ifndef BB_FEATURE_INSMOD_OLD_KERNEL
+	#if ! defined BB_FEATURE_NEW_MODULE_INTERFACE && ! defined BB_FEATURE_OLD_MODULE_INTERFACE
-#define BB_FEATURE_INSMOD_NEW_KERNEL
+		#define BB_FEATURE_NEW_MODULE_INTERFACE
 	#endif
 #endif
+//
+#ifdef BB_SYSLOGD
+	#if defined BB_FEATURE_IPC_SYSLOG
+		#define BB_LOGREAD
+	#endif
+#endif
+//
+#if defined BB_DOS2UNIX 
+	#define BB_UNIX2DOS
+#endif
+

debian/Config.h-deb

@@ -332,8 +332,23 @@
 	#undef BB_MTAB
 #endif	
 //
-#if defined BB_FEATURE_SH_COMMAND_EDITING && defined BB_SH
+#if defined BB_SH
+	#if defined BB_FEATURE_COMMAND_EDITING 
 		#define BB_CMDEDIT
+		#ifndef BB_FEATURE_USE_TERMIOS
+			#define BB_FEATURE_USE_TERMIOS
+		#endif
+	#else
+		#undef BB_FEATURE_COMMAND_EDITING
+		#undef BB_FEATURE_COMMAND_TAB_COMPLETION
+		#undef BB_FEATURE_COMMAND_USERNAME_COMPLETION
+		#define BB_FEATURE_SH_SIMPLE_PROMPT
+	#endif
+#else
+	#undef BB_FEATURE_COMMAND_EDITING
+	#undef BB_FEATURE_SH_APPLETS_ALWAYS_WIN
+	#undef BB_FEATURE_SH_STANDALONE_SHELL
+	#undef BB_FEATURE_SH_SIMPLE_PROMPT
 #endif
 //
 #ifdef BB_KILLALL
@@ -383,10 +398,12 @@
 	#define BB_NFSMOUNT
 #endif
 //
-#if defined BB_FEATURE_SH_COMMAND_EDITING
+#if defined BB_IFCONFIG
-#ifndef BB_FEATURE_USE_TERMIOS
+	#ifdef BB_FEATURE_IFCONFIG_STATUS
-#define BB_FEATURE_USE_TERMIOS
+		#define BB_INTERFACE
 	#endif
+#else
+	#undef BB_INTERFACE
 #endif	
 //
 #if defined BB_FEATURE_AUTOWIDTH
@@ -396,7 +413,18 @@
 #endif
 //
 #if defined BB_INSMOD || defined BB_LSMOD
-#ifndef BB_FEATURE_NEW_MODULE_INTERFACE
+	#if ! defined BB_FEATURE_NEW_MODULE_INTERFACE && ! defined BB_FEATURE_OLD_MODULE_INTERFACE
 		#define BB_FEATURE_NEW_MODULE_INTERFACE
 	#endif
 #endif
+//
+#ifdef BB_SYSLOGD
+	#if defined BB_FEATURE_IPC_SYSLOG
+		#define BB_LOGREAD
+	#endif
+#endif
+//
+#if defined BB_DOS2UNIX 
+	#define BB_UNIX2DOS
+#endif
+

debian/Config.h-static

@@ -332,8 +332,23 @@
 	#undef BB_MTAB
 #endif	
 //
-#if defined BB_FEATURE_SH_COMMAND_EDITING && defined BB_SH
+#if defined BB_SH
+	#if defined BB_FEATURE_COMMAND_EDITING 
 		#define BB_CMDEDIT
+		#ifndef BB_FEATURE_USE_TERMIOS
+			#define BB_FEATURE_USE_TERMIOS
+		#endif
+	#else
+		#undef BB_FEATURE_COMMAND_EDITING
+		#undef BB_FEATURE_COMMAND_TAB_COMPLETION
+		#undef BB_FEATURE_COMMAND_USERNAME_COMPLETION
+		#define BB_FEATURE_SH_SIMPLE_PROMPT
+	#endif
+#else
+	#undef BB_FEATURE_COMMAND_EDITING
+	#undef BB_FEATURE_SH_APPLETS_ALWAYS_WIN
+	#undef BB_FEATURE_SH_STANDALONE_SHELL
+	#undef BB_FEATURE_SH_SIMPLE_PROMPT
 #endif
 //
 #ifdef BB_KILLALL
@@ -383,10 +398,12 @@
 	#define BB_NFSMOUNT
 #endif
 //
-#if defined BB_FEATURE_SH_COMMAND_EDITING
+#if defined BB_IFCONFIG
-#ifndef BB_FEATURE_USE_TERMIOS
+	#ifdef BB_FEATURE_IFCONFIG_STATUS
-#define BB_FEATURE_USE_TERMIOS
+		#define BB_INTERFACE
 	#endif
+#else
+	#undef BB_INTERFACE
 #endif	
 //
 #if defined BB_FEATURE_AUTOWIDTH
@@ -396,7 +413,19 @@
 #endif
 //
 #if defined BB_INSMOD || defined BB_LSMOD
-#ifndef BB_FEATURE_NEW_MODULE_INTERFACE
+	#if ! defined BB_FEATURE_NEW_MODULE_INTERFACE && ! defined BB_FEATURE_OLD_MODULE_INTERFACE
 		#define BB_FEATURE_NEW_MODULE_INTERFACE
 	#endif
 #endif
+//
+#ifdef BB_SYSLOGD
+	#if defined BB_FEATURE_IPC_SYSLOG
+		#define BB_LOGREAD
+	#endif
+#endif
+//
+#if defined BB_DOS2UNIX 
+	#define BB_UNIX2DOS
+#endif
+
+

debian/Config.h-udeb

@@ -332,8 +332,23 @@
 	#undef BB_MTAB
 #endif	
 //
-#if defined BB_FEATURE_SH_COMMAND_EDITING && defined BB_SH
+#if defined BB_SH
+	#if defined BB_FEATURE_COMMAND_EDITING 
 		#define BB_CMDEDIT
+		#ifndef BB_FEATURE_USE_TERMIOS
+			#define BB_FEATURE_USE_TERMIOS
+		#endif
+	#else
+		#undef BB_FEATURE_COMMAND_EDITING
+		#undef BB_FEATURE_COMMAND_TAB_COMPLETION
+		#undef BB_FEATURE_COMMAND_USERNAME_COMPLETION
+		#define BB_FEATURE_SH_SIMPLE_PROMPT
+	#endif
+#else
+	#undef BB_FEATURE_COMMAND_EDITING
+	#undef BB_FEATURE_SH_APPLETS_ALWAYS_WIN
+	#undef BB_FEATURE_SH_STANDALONE_SHELL
+	#undef BB_FEATURE_SH_SIMPLE_PROMPT
 #endif
 //
 #ifdef BB_KILLALL
@@ -383,10 +398,12 @@
 	#define BB_NFSMOUNT
 #endif
 //
-#if defined BB_FEATURE_SH_COMMAND_EDITING
+#if defined BB_IFCONFIG
-#ifndef BB_FEATURE_USE_TERMIOS
+	#ifdef BB_FEATURE_IFCONFIG_STATUS
-#define BB_FEATURE_USE_TERMIOS
+		#define BB_INTERFACE
 	#endif
+#else
+	#undef BB_INTERFACE
 #endif	
 //
 #if defined BB_FEATURE_AUTOWIDTH
@@ -396,7 +413,18 @@
 #endif
 //
 #if defined BB_INSMOD || defined BB_LSMOD
-#ifndef BB_FEATURE_NEW_MODULE_INTERFACE
+	#if ! defined BB_FEATURE_NEW_MODULE_INTERFACE && ! defined BB_FEATURE_OLD_MODULE_INTERFACE
 		#define BB_FEATURE_NEW_MODULE_INTERFACE
 	#endif
 #endif
+//
+#ifdef BB_SYSLOGD
+	#if defined BB_FEATURE_IPC_SYSLOG
+		#define BB_LOGREAD
+	#endif
+#endif
+//
+#if defined BB_DOS2UNIX 
+	#define BB_UNIX2DOS
+#endif
+