[aadk-commits] dbailey: uClinux/trunk r102 - in /uClinux/trunk/uClinux-dist: config/ user/

aadk-commits at lists.digium.com aadk-commits at lists.digium.com
Thu Dec 28 08:05:42 MST 2006 

Author: dbailey
Date: Thu Dec 28 09:05:41 2006
New Revision: 102

URL: http://svn.digium.com/view/aadk?view=rev&rev=102
Log:
Updating build for procwatch user program

Modified:
    uClinux/trunk/uClinux-dist/config/.config
    uClinux/trunk/uClinux-dist/config/Configure.help
    uClinux/trunk/uClinux-dist/config/config.in
    uClinux/trunk/uClinux-dist/user/Makefile

Modified: uClinux/trunk/uClinux-dist/config/.config
URL: http://svn.digium.com/view/aadk/uClinux/trunk/uClinux-dist/config/.config?view=diff&rev=102&r1=101&r2=102
==============================================================================
--- uClinux/trunk/uClinux-dist/config/.config (original)
+++ uClinux/trunk/uClinux-dist/config/.config Thu Dec 28 09:05:41 2006
@@ -1,5 +1,5 @@
 #
-# Automatically generated make config: don't edit
+# Automatically generated by make menuconfig: don't edit
 #
 
 #
@@ -28,33 +28,17 @@
 # CONFIG_USER_GETTYD_GETTYD is not set
 # CONFIG_USER_LOGIN_PASSWD is not set
 # CONFIG_USER_CRON_CRON is not set
-
-#
-# Real Time Clock
-#
 # CONFIG_USER_HWCLOCK_HWCLOCK is not set
 # CONFIG_USER_RTC_M41T11 is not set
 # CONFIG_USER_RTC_DS1302 is not set
-
-#
-# Vixie-cron
-#
 # CONFIG_USER_VIXIECRON_CRON is not set
 # CONFIG_USER_VIXIECRON_CRONTAB is not set
-
-#
-# at
-#
 # CONFIG_USER_AT_AT is not set
 # CONFIG_USER_AT_ATD is not set
 # CONFIG_USER_AT_ATRUN is not set
 
 #
 # Library Configuration
-#
-
-#
-# Force build (Normally built when required)
 #
 # CONFIG_LIB_ALSA_LIB_FORCE is not set
 # CONFIG_LIB_DMALLOC_FORCE is not set
@@ -88,10 +72,6 @@
 # CONFIG_LIB_ADNS_FORCE is not set
 # CONFIG_LIB_ARES_FORCE is not set
 # CONFIG_LIB_LIBCRYPT_OLD_FORCE is not set
-
-#
-# Library Configuration
-#
 # CONFIG_LIB_UC_LIBC_TIMEZONE is not set
 # CONFIG_LIB_FAAD2_FORCE is not set
 # CONFIG_LIB_FLAC_FORCE is not set
@@ -111,19 +91,11 @@
 # CONFIG_USER_RECOVER_STATIC_TFTP is not set
 # CONFIG_USER_RECOVER_RECOVER is not set
 # CONFIG_USER_SETMAC_SETMAC is not set
-
-#
-# uCbootloader utils
-#
 # CONFIG_USER_BOOTTOOLS_LOADER is not set
 # CONFIG_USER_BOOTTOOLS_HIMEMLOADER is not set
 # CONFIG_USER_BOOTTOOLS_PRINTBENV is not set
 # CONFIG_USER_BOOTTOOLS_SETBENV is not set
 # CONFIG_USER_BOOTTOOLS_RESET is not set
-
-#
-# MTD utils
-#
 # CONFIG_USER_MTDUTILS is not set
 # CONFIG_USER_MTDUTILS_ERASE is not set
 # CONFIG_USER_MTDUTILS_ERASEALL is not set
@@ -147,10 +119,6 @@
 # CONFIG_USER_MOUNT_UMOUNT is not set
 # CONFIG_USER_FDISK_FDISK is not set
 # CONFIG_USER_FDISK_SFDISK is not set
-
-#
-# EXT2
-#
 # CONFIG_USER_E2FSPROGS_E2FSCK_E2FSCK is not set
 CONFIG_USER_E2FSPROGS_MISC_MKE2FS=y
 # CONFIG_USER_E2FSPROGS_MISC_BADBLOCKS is not set
@@ -162,41 +130,21 @@
 # CONFIG_USER_E2FSPROGS_MISC_MKLOST_FOUND is not set
 # CONFIG_USER_E2FSPROGS_MISC_TUNE2FS is not set
 # CONFIG_USER_E2FSPROGS_MISC_UUIDGEN is not set
-
-#
-# RESIERFS
-#
 # CONFIG_USER_REISERFSPROGS is not set
 # CONFIG_USER_REISERFSPROGS_DEBUGRESIERFS is not set
 # CONFIG_USER_REISERFSPROGS_MKREISERFS is not set
 # CONFIG_USER_REISERFSPROGS_REISERFSCK is not set
 # CONFIG_USER_REISERFSPROGS_RESIZE_REISERFS is not set
 # CONFIG_USER_REISERFSPROGS_UNPACK is not set
-
-#
-# SAMBA
-#
 # CONFIG_USER_SAMBA is not set
 # CONFIG_USER_SAMBA_SMBD is not set
 # CONFIG_USER_SAMBA_NMBD is not set
 # CONFIG_USER_SAMBA_SMBMOUNT is not set
 # CONFIG_USER_SAMBA_SMBUMOUNT is not set
-
-#
-# SMBFS
-#
 # CONFIG_USER_SMBMOUNT_SMBMOUNT is not set
 # CONFIG_USER_SMBMOUNT_SMBUMOUNT is not set
-
-#
-# CRAMFS
-#
 # CONFIG_USER_CRAMFS_CRAMFSCK is not set
 # CONFIG_USER_CRAMFS_MKCRAMFS is not set
-
-#
-# MSDOS
-#
 # CONFIG_USER_DOSFSTOOLS_MKDOSFS is not set
 # CONFIG_USER_DOSFSTOOLS_DOSFSCK is not set
 
@@ -308,10 +256,6 @@
 # CONFIG_USER_VPNLED_VPNLED is not set
 # CONFIG_USER_WGET is not set
 # CONFIG_USER_ZEBRA_ZEBRA_ZEBRA is not set
-
-#
-# Net-tools
-#
 # CONFIG_USER_NET_TOOLS_ARP is not set
 # CONFIG_USER_NET_TOOLS_HOSTNAME is not set
 # CONFIG_USER_NET_TOOLS_IFCONFIG is not set
@@ -322,10 +266,6 @@
 # CONFIG_USER_NET_TOOLS_ROUTE is not set
 # CONFIG_USER_NET_TOOLS_SLATTACH is not set
 # CONFIG_USER_NET_TOOLS_MII_TOOL is not set
-
-#
-# Wireless-tools
-#
 CONFIG_USER_WIRELESS_TOOLS=y
 CONFIG_USER_WIRELESS_TOOLS_IWCONFIG=y
 # CONFIG_USER_WIRELESS_TOOLS_IWGETID is not set
@@ -384,10 +324,6 @@
 # CONFIG_USER_TIP_TIP is not set
 # CONFIG_USER_TRIPWIRE_TRIPWIRE is not set
 # CONFIG_USER_LRZSZ_LRZSZ is not set
-
-#
-# LIRC
-#
 # CONFIG_USER_LIRC is not set
 # CONFIG_USER_LIRC_LIRCD is not set
 # CONFIG_USER_LIRC_IRRECORD is not set
@@ -395,16 +331,8 @@
 # CONFIG_USER_LIRC_IREXEC is not set
 # CONFIG_USER_LIRC_IRW is not set
 # CONFIG_USER_LIRC_MODE2 is not set
-
-#
-# Editors
-#
 # CONFIG_USER_LEVEE_VI is not set
 # CONFIG_USER_ELVISTINY_VI is not set
-
-#
-# Audio tools
-#
 # CONFIG_USER_MP3PLAY_MP3PLAY is not set
 # CONFIG_USER_DAGRAB_DAGRAB is not set
 # CONFIG_USER_OGGPLAY_OGG123 is not set
@@ -416,23 +344,11 @@
 # CONFIG_USER_VPLAY_VREC is not set
 # CONFIG_USER_VPLAY_MIXER is not set
 # CONFIG_USER_PLAYRT_PLAYRT is not set
-
-#
-# Video tools
-#
 # CONFIG_USER_CAMSERV is not set
 # CONFIG_USER_W3CAM_VIDCAT is not set
 # CONFIG_USER_W3CAM_W3CAMD is not set
-
-#
-# CAN tools
-#
 # CONFIG_USER_CAN_EXAMPLES is not set
 # CONFIG_USER_CAN_HORCH is not set
-
-#
-# Fileutils tools
-#
 # CONFIG_USER_FILEUTILS_CAT is not set
 # CONFIG_USER_FILEUTILS_CHGRP is not set
 # CONFIG_USER_FILEUTILS_CHMOD is not set
@@ -453,10 +369,6 @@
 # CONFIG_USER_FILEUTILS_RMDIR is not set
 # CONFIG_USER_FILEUTILS_SYNC is not set
 # CONFIG_USER_FILEUTILS_TOUCH is not set
-
-#
-# Shutils tools
-#
 # CONFIG_USER_SHUTILS_BASENAME is not set
 # CONFIG_USER_SHUTILS_DATE is not set
 # CONFIG_USER_SHUTILS_DIRNAME is not set
@@ -470,10 +382,6 @@
 # CONFIG_USER_SHUTILS_WHICH is not set
 # CONFIG_USER_SHUTILS_WHOAMI is not set
 # CONFIG_USER_SHUTILS_YES is not set
-
-#
-# Sysutils tools
-#
 # CONFIG_USER_SYSUTILS_REBOOT is not set
 # CONFIG_USER_SYSUTILS_SHUTDOWN is not set
 # CONFIG_USER_SYSUTILS_DF is not set
@@ -481,10 +389,6 @@
 # CONFIG_USER_SYSUTILS_HOSTNAME is not set
 # CONFIG_USER_SYSUTILS_KILL is not set
 # CONFIG_USER_SYSUTILS_PS is not set
-
-#
-# Procps tools
-#
 # CONFIG_USER_PROCPS_FREE is not set
 # CONFIG_USER_PROCPS_KILL is not set
 # CONFIG_USER_PROCPS_PGREP is not set
@@ -498,26 +402,15 @@
 # CONFIG_USER_PROCPS_VMSTAT is not set
 # CONFIG_USER_PROCPS_W is not set
 # CONFIG_USER_PROCPS_WATCH is not set
-
-#
-# PCI utilities
-#
+CONFIG_USER_PROC_WATCH=y
 # CONFIG_USER_PCIUTILS_LSPCI is not set
 # CONFIG_USER_PCIUTILS_SETPCI is not set
-
-#
-# 
-#
 # CONFIG_USER_CXXTEST_CXXTEST is not set
 
 #
 # BusyBox
 #
 CONFIG_USER_BUSYBOX_BUSYBOX=y
-
-#
-# Applets
-#
 # CONFIG_USER_BUSYBOX_ADDGROUP is not set
 # CONFIG_USER_BUSYBOX_ADDUSER is not set
 # CONFIG_USER_BUSYBOX_ADJTIMEX is not set
@@ -816,10 +709,6 @@
 CONFIG_USER_BUSYBOX_ZAPSCAN=y
 CONFIG_USER_BUSYBOX_ZIP=y
 CONFIG_USER_BUSYBOX_ZTCFG=y
-
-#
-# other features
-#
 CONFIG_USER_BUSYBOX_BUFFERS_GO_ON_STACK=y
 # CONFIG_USER_BUSYBOX_BUFFERS_GO_IN_BSS is not set
 # CONFIG_USER_BUSYBOX_USE_DEVPS_PATCH is not set
@@ -887,20 +776,8 @@
 #
 # CONFIG_LIB_DEBUG is not set
 # CONFIG_USER_DEBUG is not set
-
-#
-# Blackfin
-#
 # CONFIG_BLACKFIN_CHECK_STACKFLOW is not set
-
-#
-# Debug tools
-#
 # CONFIG_USER_TIMEPEG_TPT is not set
-
-#
-# Debug libraries
-#
 # CONFIG_LIB_LIBCCMALLOC is not set
 
 #

Modified: uClinux/trunk/uClinux-dist/config/Configure.help
URL: http://svn.digium.com/view/aadk/uClinux/trunk/uClinux-dist/config/Configure.help?view=diff&rev=102&r1=101&r2=102
==============================================================================
--- uClinux/trunk/uClinux-dist/config/Configure.help (original)
+++ uClinux/trunk/uClinux-dist/config/Configure.help Thu Dec 28 09:05:41 2006
@@ -558,6 +558,9 @@
   Diagnostic tool for testing network connections.
   Approx. binary size: 27k
 
+CONFIG_USER_PROC_WATCH 
+  Application that monitors processes and hits the watchdog if they are running.
+
 CONFIG_USER_PKTDELAY_PKTDELAY
   Queue up packets from netfilter for the specified amount of time and then
   release them.  Requires the netfilter user space packet queueing

Modified: uClinux/trunk/uClinux-dist/config/config.in
URL: http://svn.digium.com/view/aadk/uClinux/trunk/uClinux-dist/config/config.in?view=diff&rev=102&r1=101&r2=102
==============================================================================
--- uClinux/trunk/uClinux-dist/config/config.in (original)
+++ uClinux/trunk/uClinux-dist/config/config.in Thu Dec 28 09:05:41 2006
@@ -834,6 +834,9 @@
 bool 'vmstat'			CONFIG_USER_PROCPS_VMSTAT
 bool 'w'			CONFIG_USER_PROCPS_W
 bool 'watch'			CONFIG_USER_PROCPS_WATCH
+
+bool 'proc_watch'		CONFIG_USER_PROC_WATCH
+
 if [ "$CONFIG_USER_PROCPS_TOP" = "y" ]; then
 	define_bool 	CONFIG_LIB_NCURSES y
 fi

Modified: uClinux/trunk/uClinux-dist/user/Makefile
URL: http://svn.digium.com/view/aadk/uClinux/trunk/uClinux-dist/user/Makefile?view=diff&rev=102&r1=101&r2=102
==============================================================================
--- uClinux/trunk/uClinux-dist/user/Makefile (original)
+++ uClinux/trunk/uClinux-dist/user/Makefile Thu Dec 28 09:05:41 2006
@@ -237,6 +237,7 @@
 dir_$(CONFIG_USER_PPTP_CLIENT_PPTP_CALLMGR) += pptp-client
 dir_$(CONFIG_USER_PPTPD_PPTPCTRL)           += pptpd
 dir_$(CONFIG_USER_PPTPD_PPTPD)              += pptpd
+dir_$(CONFIG_USER_PROC_WATCH)               += procwatch
 dir_$(CONFIG_USER_PROCPS_FREE)              += procps
 dir_$(CONFIG_USER_PROCPS_KILL)              += procps
 dir_$(CONFIG_USER_PROCPS_PGREP)             += procps

More information about the aadk-commits mailing list