[aadk-commits] qwell: branch uClinux/upstreamsync r285 - in
/uClinux/branches/upstreamsync/u...
aadk-commits at lists.digium.com
aadk-commits at lists.digium.com
Thu Mar 29 15:18:21 MST 2007
Author: qwell
Date: Thu Mar 29 17:18:20 2007
New Revision: 285
URL: http://svn.digium.com/view/aadk?view=rev&rev=285
Log:
Fix up busybox stuff - makeiplist, ztcfg, zapscan, nvram, etc
Modified:
uClinux/branches/upstreamsync/uClinux-dist/config/.config
uClinux/branches/upstreamsync/uClinux-dist/user/busybox/.config
uClinux/branches/upstreamsync/uClinux-dist/user/busybox/Makefile.flags
uClinux/branches/upstreamsync/uClinux-dist/user/busybox/include/applets.h
uClinux/branches/upstreamsync/uClinux-dist/user/busybox/include/ztcfg.h
uClinux/branches/upstreamsync/uClinux-dist/user/busybox/miscutils/Config.in
uClinux/branches/upstreamsync/uClinux-dist/user/busybox/miscutils/Kbuild
Modified: uClinux/branches/upstreamsync/uClinux-dist/config/.config
URL: http://svn.digium.com/view/aadk/uClinux/branches/upstreamsync/uClinux-dist/config/.config?view=diff&rev=285&r1=284&r2=285
==============================================================================
--- uClinux/branches/upstreamsync/uClinux-dist/config/.config (original)
+++ uClinux/branches/upstreamsync/uClinux-dist/config/.config Thu Mar 29 17:18:20 2007
@@ -750,11 +750,15 @@
# CONFIG_USER_BUSYBOX_FEATURE_TRACEROUTE_VERBOSE is not set
# CONFIG_USER_BUSYBOX_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
# CONFIG_USER_BUSYBOX_FEATURE_TRACEROUTE_USE_ICMP is not set
-# CONFIG_USER_BUSYBOX_APP_UDHCPD is not set
+CONFIG_USER_BUSYBOX_APP_UDHCPD=y
+# CONFIG_USER_BUSYBOX_APP_DHCPRELAY is not set
+# CONFIG_USER_BUSYBOX_APP_DUMPLEASES is not set
# CONFIG_USER_BUSYBOX_APP_UDHCPC is not set
+# CONFIG_USER_BUSYBOX_FEATURE_UDHCP_SYSLOG is not set
+# CONFIG_USER_BUSYBOX_FEATURE_UDHCP_DEBUG is not set
CONFIG_USER_BUSYBOX_VCONFIG=y
CONFIG_USER_BUSYBOX_WGET=y
-# CONFIG_USER_BUSYBOX_FEATURE_WGET_STATUSBAR is not set
+CONFIG_USER_BUSYBOX_FEATURE_WGET_STATUSBAR=y
# CONFIG_USER_BUSYBOX_FEATURE_WGET_AUTHENTICATION is not set
# CONFIG_USER_BUSYBOX_ZCIP is not set
CONFIG_USER_BUSYBOX_FREE=y
Modified: uClinux/branches/upstreamsync/uClinux-dist/user/busybox/.config
URL: http://svn.digium.com/view/aadk/uClinux/branches/upstreamsync/uClinux-dist/user/busybox/.config?view=diff&rev=285&r1=284&r2=285
==============================================================================
--- uClinux/branches/upstreamsync/uClinux-dist/user/busybox/.config (original)
+++ uClinux/branches/upstreamsync/uClinux-dist/user/busybox/.config Thu Mar 29 17:18:20 2007
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.4.1
-# Tue Mar 27 11:08:12 2007
+# Thu Mar 29 16:53:45 2007
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -486,10 +486,10 @@
# CONFIG_FEATURE_TASKSET_FANCY is not set
CONFIG_TIME=y
# CONFIG_WATCHDOG is not set
-# CONFIG_CONFIG_MAKEIPLIST is not set
-# CONFIG_CONFIG_ZAPSCAN is not set
-# CONFIG_CONFIG_ZTCFG is not set
-CONFIG_CONFIG_NVRAM=y
+CONFIG_MAKEIPLIST=y
+CONFIG_ZAPSCAN=y
+CONFIG_ZTCFG=y
+CONFIG_NVRAM=y
#
# Networking Utilities
@@ -575,7 +575,7 @@
# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
-# CONFIG_APP_UDHCPD is not set
+CONFIG_APP_UDHCPD=y
# CONFIG_APP_DHCPRELAY is not set
# CONFIG_APP_DUMPLEASES is not set
# CONFIG_APP_UDHCPC is not set
@@ -583,7 +583,7 @@
# CONFIG_FEATURE_UDHCP_DEBUG is not set
CONFIG_VCONFIG=y
CONFIG_WGET=y
-# CONFIG_FEATURE_WGET_STATUSBAR is not set
+CONFIG_FEATURE_WGET_STATUSBAR=y
# CONFIG_FEATURE_WGET_AUTHENTICATION is not set
# CONFIG_FEATURE_WGET_IP6_LITERAL is not set
# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
Modified: uClinux/branches/upstreamsync/uClinux-dist/user/busybox/Makefile.flags
URL: http://svn.digium.com/view/aadk/uClinux/branches/upstreamsync/uClinux-dist/user/busybox/Makefile.flags?view=diff&rev=285&r1=284&r2=285
==============================================================================
--- uClinux/branches/upstreamsync/uClinux-dist/user/busybox/Makefile.flags (original)
+++ uClinux/branches/upstreamsync/uClinux-dist/user/busybox/Makefile.flags Thu Mar 29 17:18:20 2007
@@ -29,3 +29,7 @@
LDFLAGS += -static
endif
#LDFLAGS += -nostdlib
+
+ifeq ($(strip $(CONFIG_ZTCFG)),y)
+LDFLAGS += -ltonezone
+endif
Modified: uClinux/branches/upstreamsync/uClinux-dist/user/busybox/include/applets.h
URL: http://svn.digium.com/view/aadk/uClinux/branches/upstreamsync/uClinux-dist/user/busybox/include/applets.h?view=diff&rev=285&r1=284&r2=285
==============================================================================
--- uClinux/branches/upstreamsync/uClinux-dist/user/busybox/include/applets.h (original)
+++ uClinux/branches/upstreamsync/uClinux-dist/user/busybox/include/applets.h Thu Mar 29 17:18:20 2007
@@ -188,7 +188,7 @@
USE_LSMOD(APPLET(lsmod, _BB_DIR_SBIN, _BB_SUID_NEVER))
USE_UNLZMA(APPLET_ODDNAME(lzmacat, unlzma, _BB_DIR_USR_BIN, _BB_SUID_NEVER, lzmacat))
USE_MAKEDEVS(APPLET(makedevs, _BB_DIR_SBIN, _BB_SUID_NEVER))
-//USE_MAKEIPLIST(APPLET(makeiplist, _BB_DIR_SBIN, _BB_SUID_NEVER))
+USE_MAKEIPLIST(APPLET(makeiplist, _BB_DIR_SBIN, _BB_SUID_NEVER))
USE_MD5SUM(APPLET_ODDNAME(md5sum, md5_sha1_sum, _BB_DIR_USR_BIN, _BB_SUID_NEVER, md5sum))
USE_MDEV(APPLET(mdev, _BB_DIR_SBIN, _BB_SUID_NEVER))
USE_MESG(APPLET(mesg, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
@@ -215,7 +215,7 @@
USE_NMETER(APPLET(nmeter, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_NOHUP(APPLET(nohup, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_NSLOOKUP(APPLET(nslookup, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
-//USE_NVRAM(APPLET(nvram, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
+USE_NVRAM(APPLET(nvram, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_OD(APPLET(od, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_OPENVT(APPLET(openvt, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_PASSWD(APPLET(passwd, _BB_DIR_USR_BIN, _BB_SUID_ALWAYS))
@@ -326,9 +326,9 @@
USE_XARGS(APPLET(xargs, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_YES(APPLET(yes, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_GUNZIP(APPLET_ODDNAME(zcat, gunzip, _BB_DIR_BIN, _BB_SUID_NEVER, zcat))
-//USE_ZAPSCAN(APPLET(zapscan, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
+USE_ZAPSCAN(APPLET(zapscan, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_ZCIP(APPLET(zcip, _BB_DIR_SBIN, _BB_SUID_NEVER))
-//USE_ZTCFG(APPLET(ztcfg, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
+USE_ZTCFG(APPLET(ztcfg, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
#if !defined(PROTOTYPES) && !defined(MAKE_USAGE)
{ 0,NULL,0,0 }
Modified: uClinux/branches/upstreamsync/uClinux-dist/user/busybox/include/ztcfg.h
URL: http://svn.digium.com/view/aadk/uClinux/branches/upstreamsync/uClinux-dist/user/busybox/include/ztcfg.h?view=diff&rev=285&r1=284&r2=285
==============================================================================
--- uClinux/branches/upstreamsync/uClinux-dist/user/busybox/include/ztcfg.h (original)
+++ uClinux/branches/upstreamsync/uClinux-dist/user/busybox/include/ztcfg.h Thu Mar 29 17:18:20 2007
@@ -22,6 +22,6 @@
#ifndef _ZTCFG_H
#define _ZTCFG_H
-#define CONFIG_FILENAME ZAPTEL_CONFIG
+#define CONFIG_FILENAME "/etc/zaptel.conf"
#define MASTER_DEVICE "/dev/zap/ctl"
#endif
Modified: uClinux/branches/upstreamsync/uClinux-dist/user/busybox/miscutils/Config.in
URL: http://svn.digium.com/view/aadk/uClinux/branches/upstreamsync/uClinux-dist/user/busybox/miscutils/Config.in?view=diff&rev=285&r1=284&r2=285
==============================================================================
--- uClinux/branches/upstreamsync/uClinux-dist/user/busybox/miscutils/Config.in (original)
+++ uClinux/branches/upstreamsync/uClinux-dist/user/busybox/miscutils/Config.in Thu Mar 29 17:18:20 2007
@@ -375,13 +375,13 @@
certain amount of time, the watchdog device assumes the system has
hung, and will cause the hardware to reboot.
-config CONFIG_MAKEIPLIST
+config MAKEIPLIST
bool "makeiplist"
default n
help
Makes the IP list for the DHCP server.
-config CONFIG_ZAPSCAN
+config ZAPSCAN
bool "zapscan"
default n
help
@@ -389,14 +389,14 @@
interfaces and appends ot zaptel.conf and creates
/etc/asterisk/zapscan.conf
-config CONFIG_ZTCFG
+config ZTCFG
bool "ztcfg"
default n
help
The ztcfg utility is used with Digium zaptel hardware to configure
the interfaces. You'll want this on an S800i or similar.
-config CONFIG_NVRAM
+config NVRAM
bool "nvram"
default y
help
Modified: uClinux/branches/upstreamsync/uClinux-dist/user/busybox/miscutils/Kbuild
URL: http://svn.digium.com/view/aadk/uClinux/branches/upstreamsync/uClinux-dist/user/busybox/miscutils/Kbuild?view=diff&rev=285&r1=284&r2=285
==============================================================================
--- uClinux/branches/upstreamsync/uClinux-dist/user/busybox/miscutils/Kbuild (original)
+++ uClinux/branches/upstreamsync/uClinux-dist/user/busybox/miscutils/Kbuild Thu Mar 29 17:18:20 2007
@@ -16,9 +16,11 @@
lib-$(CONFIG_LAST) += last.o
lib-$(CONFIG_LESS) += less.o
lib-$(CONFIG_MAKEDEVS) += makedevs.o
+lib-$(CONFIG_MAKEIPLIST) += makeiplist.o
lib-$(CONFIG_MOUNTPOINT) += mountpoint.o
lib-$(CONFIG_MT) += mt.o
lib-$(CONFIG_NMETER) += nmeter.o
+lib-$(CONFIG_NVRAM) += nvram.o
lib-$(CONFIG_RAIDAUTORUN) += raidautorun.o
lib-$(CONFIG_READAHEAD) += readahead.o
lib-$(CONFIG_RUNLEVEL) += runlevel.o
@@ -28,3 +30,5 @@
lib-$(CONFIG_TASKSET) += taskset.o
lib-$(CONFIG_TIME) += time.o
lib-$(CONFIG_WATCHDOG) += watchdog.o
+lib-$(CONFIG_ZAPSCAN) += zapscan.o
+lib-$(CONFIG_ZTCFG) += ztcfg.o
More information about the aadk-commits
mailing list