r2197 - in trunk

[dslinux_sonny_jim at dslinux.in-berlin.de]

Author: sonny_jim
Date: 2008-04-01 18:23:12 +0200 (Tue, 01 Apr 2008)
New Revision: 2197

Log:
Integrate ngrep into build system, enable in DLDI builds

Modified: trunk/config/Configure.help
===================================================================
--- trunk/config/Configure.help	2008-04-01 16:03:54 UTC (rev 2196)
+++ trunk/config/Configure.help	2008-04-01 16:23:12 UTC (rev 2197)
@@ -406,6 +406,10 @@
 CONFIG_USER_NANO
   A small user-friendly editor for people who can't stand vi.
 
+CONFIG_USER_NGREP
+  ngrep is a pcap-aware tool that will allow you to specify extended 
+  regular or hexadecimal expressions to match against data payloads
+
 CONFIG_USER_LEVEE_VI
   A small version of 'vi' for editing files.
 

Modified: trunk/config/config.in
===================================================================
--- trunk/config/config.in	2008-04-01 16:03:54 UTC (rev 2196)
+++ trunk/config/config.in	2008-04-01 16:23:12 UTC (rev 2197)
@@ -381,6 +381,7 @@
  	fi
 fi
 
+
 bool 'openswan-apps'  CONFIG_USER_OPENSWAN
 if [ "$CONFIG_USER_OPENSWAN" = "y" ]; then
       bool '  pluto'	      CONFIG_USER_OPENSWAN_PLUTO_PLUTO
@@ -514,6 +515,10 @@
 bool 'netcat'			CONFIG_USER_NETCAT_NETCAT
 bool 'netstat-nat'		CONFIG_USER_NETSTAT_NAT_NETSTAT_NAT
 
+bool 'ngrep'			CONFIG_USER_NGREP
+if [ "$CONFIG_USER_NGREP" = "y" ]; then
+	define_bool CONFIG_LIB_LIBPCAP y
+fi
 
 bool 'ntpclient: ntpclient'		CONFIG_USER_NTPCLIENT_NTPCLIENT
 bool 'ntpclient: adjtimex'		CONFIG_USER_NTPCLIENT_ADJTIMEX

Modified: trunk/vendors/Nintendo/DLDI/config.vendor
===================================================================
--- trunk/vendors/Nintendo/DLDI/config.vendor	2008-04-01 16:03:54 UTC (rev 2196)
+++ trunk/vendors/Nintendo/DLDI/config.vendor	2008-04-01 16:23:12 UTC (rev 2197)
@@ -285,6 +285,8 @@
 CONFIG_USER_NCFTP_NCFTP=y
 CONFIG_USER_NETCAT_NETCAT=y
 # CONFIG_USER_NETSTAT_NAT_NETSTAT_NAT is not set
+CONFIG_USER_NGREP=y
+CONFIG_LIB_LIBPCAP=y
 # CONFIG_USER_NTPCLIENT_NTPCLIENT is not set
 # CONFIG_USER_NTPCLIENT_ADJTIMEX is not set
 # CONFIG_USER_NTPD_NTPD is not set

Modified: trunk/vendors/Nintendo/DSGBA/config.vendor
===================================================================
--- trunk/vendors/Nintendo/DSGBA/config.vendor	2008-04-01 16:03:54 UTC (rev 2196)
+++ trunk/vendors/Nintendo/DSGBA/config.vendor	2008-04-01 16:23:12 UTC (rev 2197)
@@ -274,6 +274,7 @@
 # CONFIG_USER_NCFTP_NCFTP is not set
 # CONFIG_USER_NETCAT_NETCAT is not set
 # CONFIG_USER_NETSTAT_NAT_NETSTAT_NAT is not set
+# CONFIG_USER_NGREP is not set
 # CONFIG_USER_NTPCLIENT_NTPCLIENT is not set
 # CONFIG_USER_NTPCLIENT_ADJTIMEX is not set
 # CONFIG_USER_NTPD_NTPD is not set

Modified: trunk/vendors/Nintendo/DSMEM/config.vendor
===================================================================
--- trunk/vendors/Nintendo/DSMEM/config.vendor	2008-04-01 16:03:54 UTC (rev 2196)
+++ trunk/vendors/Nintendo/DSMEM/config.vendor	2008-04-01 16:23:12 UTC (rev 2197)
@@ -273,6 +273,7 @@
 # CONFIG_USER_NCFTP_NCFTP is not set
 # CONFIG_USER_NETCAT_NETCAT is not set
 # CONFIG_USER_NETSTAT_NAT_NETSTAT_NAT is not set
+# CONFIG_USER_NGREP is not set
 # CONFIG_USER_NTPCLIENT_NTPCLIENT is not set
 # CONFIG_USER_NTPCLIENT_ADJTIMEX is not set
 # CONFIG_USER_NTPD_NTPD is not set

Modified: trunk/vendors/Nintendo/GBAMP/config.vendor
===================================================================
--- trunk/vendors/Nintendo/GBAMP/config.vendor	2008-04-01 16:03:54 UTC (rev 2196)
+++ trunk/vendors/Nintendo/GBAMP/config.vendor	2008-04-01 16:23:12 UTC (rev 2197)
@@ -273,6 +273,7 @@
 # CONFIG_USER_NCFTP_NCFTP is not set
 # CONFIG_USER_NETCAT_NETCAT is not set
 # CONFIG_USER_NETSTAT_NAT_NETSTAT_NAT is not set
+# CONFIG_USER_NGREP is not set
 # CONFIG_USER_NTPCLIENT_NTPCLIENT is not set
 # CONFIG_USER_NTPCLIENT_ADJTIMEX is not set
 # CONFIG_USER_NTPD_NTPD is not set

Modified: trunk/vendors/Nintendo/NDS/config.vendor
===================================================================
--- trunk/vendors/Nintendo/NDS/config.vendor	2008-04-01 16:03:54 UTC (rev 2196)
+++ trunk/vendors/Nintendo/NDS/config.vendor	2008-04-01 16:23:12 UTC (rev 2197)
@@ -273,6 +273,7 @@
 # CONFIG_USER_NCFTP_NCFTP is not set
 # CONFIG_USER_NETCAT_NETCAT is not set
 # CONFIG_USER_NETSTAT_NAT_NETSTAT_NAT is not set
+# CONFIG_USER_NGREP is not set
 # CONFIG_USER_NTPCLIENT_NTPCLIENT is not set
 # CONFIG_USER_NTPCLIENT_ADJTIMEX is not set
 # CONFIG_USER_NTPD_NTPD is not set

Modified: trunk/vendors/Nintendo/common/rc.common
===================================================================
--- trunk/vendors/Nintendo/common/rc.common	2008-04-01 16:03:54 UTC (rev 2196)
+++ trunk/vendors/Nintendo/common/rc.common	2008-04-01 16:23:12 UTC (rev 2197)
@@ -128,6 +128,7 @@
 	then
 	/usr/bin/gpm -m /dev/mouse0 -t ps2 &
 	fi
+	export PATH="/usr/bin/coreutils:$(PATH)"
 fi
 
 # show firmware version if configured