r1740 - in trunk

dslinux_amadeus at dslinux.in-berlin.de dslinux_amadeus at dslinux.in-berlin.de
Sat Apr 21 16:54:15 CEST 2007


Author: amadeus
Date: 2007-04-21 16:54:10 +0200 (Sat, 21 Apr 2007)
New Revision: 1740

Log:
fix some errors in the DLDI build

Modified: trunk/config/config.in
===================================================================
--- trunk/config/config.in	2007-04-21 13:17:46 UTC (rev 1739)
+++ trunk/config/config.in	2007-04-21 14:54:10 UTC (rev 1740)
@@ -82,7 +82,7 @@
 
 comment 'Force build (Normally built when required)'
 bool 'Build flex'		CONFIG_LIB_FLEX_FORCE
-bool 'Build gpm'		CONFIG_LIB_GPM
+bool 'Build gpm'		CONFIG_LIB_GPM_FORCE
 bool 'Build libAES'		CONFIG_LIB_LIBAES_FORCE
 bool 'Build libDES'		CONFIG_LIB_LIBDES_FORCE
 bool 'Build libSSL'		CONFIG_LIB_LIBSSL_FORCE
@@ -783,8 +783,6 @@
 bool 'gdbserver'		CONFIG_USER_GDB_GDBSERVER
 bool 'gdbreplay (old)'		CONFIG_USER_GDBSERVER_GDBREPLAY
 bool 'gdbserver (old)'		CONFIG_USER_GDBSERVER_GDBSERVER
-# gpm provides both a lib and an app so it lives in lib/
-bool 'gpm'			CONFIG_LIB_GPM
 bool 'grep'			CONFIG_USER_GREP_GREP
 bool 'hd'			CONFIG_USER_HD_HD
 bool 'hexedit'			CONFIG_USER_HEXEDIT_HEXEDIT

Modified: trunk/vendors/Nintendo/DLDI/config.vendor
===================================================================
--- trunk/vendors/Nintendo/DLDI/config.vendor	2007-04-21 13:17:46 UTC (rev 1739)
+++ trunk/vendors/Nintendo/DLDI/config.vendor	2007-04-21 14:54:10 UTC (rev 1740)
@@ -56,6 +56,7 @@
 # Force build (Normally built when required)
 #
 # CONFIG_LIB_FLEX_FORCE is not set
+# CONFIG_LIB_GPM_FORCE is not set
 # CONFIG_LIB_LIBAES_FORCE is not set
 # CONFIG_LIB_LIBDES_FORCE is not set
 # CONFIG_LIB_LIBSSL_FORCE is not set
@@ -236,7 +237,9 @@
 # CONFIG_USER_KENDIN_CONFIG is not set
 # CONFIG_USER_KLAXON_KLAXON is not set
 # CONFIG_USER_L2TPD_L2TPD is not set
-CONFIG_USER_LINKS_LINKS=y
+# CONFIG_USER_LINKS_LINKS is not set
+# CONFIG_USER_LINKS_WITH_GPM is not set
+# CONFIG_USER_LINKS_WITH_GRAPHICS is not set
 CONFIG_LIB_LIBSSL=y
 # CONFIG_USER_LINUXIGD_LINUXIGD is not set
 # CONFIG_USER_LOATTACH_LOATTACH is not set
@@ -299,7 +302,7 @@
 # CONFIG_USER_TRACEROUTE_TRACEROUTE is not set
 # CONFIG_USER_VCONFIG_VCONFIG is not set
 # CONFIG_USER_VPNLED_VPNLED is not set
-CONFIG_USER_WGET=y
+# CONFIG_USER_WGET is not set
 CONFIG_USER_WNC_WNC=y
 CONFIG_USER_DIALOG_DIALOG=y
 CONFIG_USER_BUSYBOX_EXPR=y
@@ -380,6 +383,7 @@
 # CONFIG_USER_MATH_TEST is not set
 CONFIG_USER_MATHOMATIC=y
 # CONFIG_USER_MAWK_AWK is not set
+# CONFIG_USER_MC is not set
 # CONFIG_USER_MPC is not set
 # CONFIG_USER_MYSQL is not set
 # CONFIG_USER_NULL_NULL is not set




More information about the dslinux-commit mailing list