[aadk-commits] qwell: branch uClinux/upstreamsync r293 - in
/uClinux/branches/upstreamsync/u...
aadk-commits at lists.digium.com
aadk-commits at lists.digium.com
Fri Mar 30 15:23:14 MST 2007
Author: qwell
Date: Fri Mar 30 17:23:12 2007
New Revision: 293
URL: http://svn.digium.com/view/aadk?view=rev&rev=293
Log:
Enable support in dd for ibs and obs (which is required for conv=, for some reason...)
Fix install paths for a few applets (also fixed whitespace for the same applets usage messages)
Modified:
uClinux/branches/upstreamsync/uClinux-dist/config/.config
uClinux/branches/upstreamsync/uClinux-dist/user/busybox/.config
uClinux/branches/upstreamsync/uClinux-dist/user/busybox/include/applets.h
uClinux/branches/upstreamsync/uClinux-dist/user/busybox/include/usage.h
uClinux/branches/upstreamsync/uClinux-dist/vendors/Digium/S800I/config.vendor-2.6.x
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=293&r1=292&r2=293
==============================================================================
--- uClinux/branches/upstreamsync/uClinux-dist/config/.config (original)
+++ uClinux/branches/upstreamsync/uClinux-dist/config/.config Fri Mar 30 17:23:12 2007
@@ -404,7 +404,6 @@
# BusyBox
#
CONFIG_USER_BUSYBOX_BUSYBOX=y
-CONFIG_USER_BUSYBOX_HAVE_DOT_CONFIG=y
# CONFIG_USER_BUSYBOX_NITPICK is not set
# CONFIG_USER_BUSYBOX_DESKTOP is not set
CONFIG_USER_BUSYBOX_FEATURE_BUFFERS_USE_MALLOC=y
@@ -478,7 +477,7 @@
# CONFIG_USER_BUSYBOX_FEATURE_DATE_ISOFMT is not set
CONFIG_USER_BUSYBOX_DD=y
# CONFIG_USER_BUSYBOX_FEATURE_DD_SIGNAL_HANDLING is not set
-# CONFIG_USER_BUSYBOX_FEATURE_DD_IBS_OBS is not set
+CONFIG_USER_BUSYBOX_FEATURE_DD_IBS_OBS=y
CONFIG_USER_BUSYBOX_DF=y
# CONFIG_USER_BUSYBOX_DIFF is not set
# CONFIG_USER_BUSYBOX_DIRNAME is not set
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=293&r1=292&r2=293
==============================================================================
--- uClinux/branches/upstreamsync/uClinux-dist/user/busybox/.config (original)
+++ uClinux/branches/upstreamsync/uClinux-dist/user/busybox/.config Fri Mar 30 17:23:12 2007
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.4.1
-# Thu Mar 29 16:53:45 2007
+# Fri Mar 30 15:21:29 2007
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -130,7 +130,7 @@
# CONFIG_FEATURE_DATE_ISOFMT is not set
CONFIG_DD=y
# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set
-# CONFIG_FEATURE_DD_IBS_OBS is not set
+CONFIG_FEATURE_DD_IBS_OBS=y
CONFIG_DF=y
# CONFIG_DIFF is not set
# CONFIG_FEATURE_DIFF_BINARY is not set
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=293&r1=292&r2=293
==============================================================================
--- uClinux/branches/upstreamsync/uClinux-dist/user/busybox/include/applets.h (original)
+++ uClinux/branches/upstreamsync/uClinux-dist/user/busybox/include/applets.h Fri Mar 30 17:23:12 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_BIN, _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))
@@ -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_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_BIN, _BB_SUID_NEVER))
#if !defined(PROTOTYPES) && !defined(MAKE_USAGE)
{ 0,NULL,0,0 }
Modified: uClinux/branches/upstreamsync/uClinux-dist/user/busybox/include/usage.h
URL: http://svn.digium.com/view/aadk/uClinux/branches/upstreamsync/uClinux-dist/user/busybox/include/usage.h?view=diff&rev=293&r1=292&r2=293
==============================================================================
--- uClinux/branches/upstreamsync/uClinux-dist/user/busybox/include/usage.h (original)
+++ uClinux/branches/upstreamsync/uClinux-dist/user/busybox/include/usage.h Fri Mar 30 17:23:12 2007
@@ -99,41 +99,40 @@
"The ash shell (command interpreter)"
#define nvram_trivial_usage \
- "[dump|store] [FILENAME]"
+ "[dump|store] [FILENAME]"
#define nvram_full_usage \
- "[dump|store] [FILENAME]\n" \
- " Dump NVRAM config into a specified file or load\n"
- " contents of specified file into NVRAM\n"
+ "[dump|store] [FILENAME]\n" \
+ " Dump NVRAM config into a specified file or load\n"
+ " contents of specified file into NVRAM\n"
+
+#define zapscan_trivial_usage \
+ "[OPTIONS]..."
+
+#define zapscan_full_usage \
+ "[OPTIONS]...\n"
#define ztcfg_trivial_usage \
- "[OPTIONS]..."
-
-#define zapscan_trivial_usage \
- "[OPTIONS]..."
+ "[OPTIONS]..."
#define ztcfg_full_usage \
- "[OPTIONS]...\n"
- " Configure zaptel interfaces. Valid options are:\n" \
- " -c <filename> -- Use <filename> instead of /etc/zaptel.conf\n" \
- " -d [level] -- Generate debugging output. (Default level is 1.)\n" \
- " -f -- Always reconfigure every channel\n" \
- " -h -- Generate this help statement\n" \
- " -s -- Shutdown spans only\n" \
- " -t -- Test mode only, do not apply\n" \
- " -v -- Verbose (more -v's means more verbose)\n"
-
-#define zapscan_full_usage \
- "[OPTIONS]...\n"
-
+ "[OPTIONS]...\n"
+ " Configure zaptel interfaces. Valid options are:\n" \
+ " -c <filename> -- Use <filename> instead of /etc/zaptel.conf\n" \
+ " -d [level] -- Generate debugging output. (Default level is 1.)\n" \
+ " -f -- Always reconfigure every channel\n" \
+ " -h -- Generate this help statement\n" \
+ " -s -- Shutdown spans only\n" \
+ " -t -- Test mode only, do not apply\n" \
+ " -v -- Verbose (more -v's means more verbose)\n"
#define makeiplist_trivial_usage \
- "START COUNT"
+ "START COUNT"
#define makeiplist_full_usage \
- "START COUNT...\n" \
- "Creates /etc/configs/dhcpd.iplist starting from START address\n" \
- "and creating COUNT entries.\n"
+ "START COUNT...\n" \
+ "Creates /etc/configs/dhcpd.iplist starting from START address\n" \
+ "and creating COUNT entries.\n"
#define awk_trivial_usage \
"[OPTION]... [program-text] [FILE ...]"
Modified: uClinux/branches/upstreamsync/uClinux-dist/vendors/Digium/S800I/config.vendor-2.6.x
URL: http://svn.digium.com/view/aadk/uClinux/branches/upstreamsync/uClinux-dist/vendors/Digium/S800I/config.vendor-2.6.x?view=diff&rev=293&r1=292&r2=293
==============================================================================
--- uClinux/branches/upstreamsync/uClinux-dist/vendors/Digium/S800I/config.vendor-2.6.x (original)
+++ uClinux/branches/upstreamsync/uClinux-dist/vendors/Digium/S800I/config.vendor-2.6.x Fri Mar 30 17:23:12 2007
@@ -404,7 +404,6 @@
# BusyBox
#
CONFIG_USER_BUSYBOX_BUSYBOX=y
-CONFIG_USER_BUSYBOX_HAVE_DOT_CONFIG=y
# CONFIG_USER_BUSYBOX_NITPICK is not set
# CONFIG_USER_BUSYBOX_DESKTOP is not set
CONFIG_USER_BUSYBOX_FEATURE_BUFFERS_USE_MALLOC=y
@@ -478,7 +477,7 @@
# CONFIG_USER_BUSYBOX_FEATURE_DATE_ISOFMT is not set
CONFIG_USER_BUSYBOX_DD=y
# CONFIG_USER_BUSYBOX_FEATURE_DD_SIGNAL_HANDLING is not set
-# CONFIG_USER_BUSYBOX_FEATURE_DD_IBS_OBS is not set
+CONFIG_USER_BUSYBOX_FEATURE_DD_IBS_OBS=y
CONFIG_USER_BUSYBOX_DF=y
# CONFIG_USER_BUSYBOX_DIFF is not set
# CONFIG_USER_BUSYBOX_DIRNAME is not set
More information about the aadk-commits
mailing list