[Runnix-commits] SF.net SVN: runnix: [47] trunk/package
Status: Alpha
Brought to you by:
krisk84
Menu
▾
▴
[Runnix-commits] SF.net SVN: runnix: [47] trunk/package
|
From: <kr...@us...> - 2007-04-27 19:12:11
|
Revision: 47
http://svn.sourceforge.net/runnix/?rev=47&view=rev
Author: krisk84
Date: 2007-04-27 12:12:05 -0700 (Fri, 27 Apr 2007)
Log Message:
-----------
MASSIVE package update
Modified Paths:
--------------
trunk/package/acpid/acpid.mk
trunk/package/at/at.mk
trunk/package/bash/bash.mk
trunk/package/busybox/Config.in
trunk/package/busybox/busybox.mk
trunk/package/dhcp/dhcp.mk
trunk/package/dhcp/dhcp_xecute.patch
trunk/package/dnsmasq/dnsmasq.init
trunk/package/dnsmasq/dnsmasq.mk
trunk/package/dropbear/dropbear.mk
trunk/package/e2fsprogs/e2fsprogs.mk
trunk/package/fakeroot/Config.in
trunk/package/fakeroot/fakeroot.mk
trunk/package/file/file.mk
trunk/package/hotplug/hotplug.mk
trunk/package/inadyn/inadyn.mk
trunk/package/iproute2/astshape.init
trunk/package/iproute2/iproute2.mk
trunk/package/ipsec-tools/ipsec-tools.mk
trunk/package/iptables/iptables.init
trunk/package/iptables/iptables.mk
trunk/package/kexectools/kexectools.mk
trunk/package/lcdproc/lcdproc.mk
trunk/package/libelf/libelf.mk
trunk/package/libusb/libusb.mk
trunk/package/links/links.mk
trunk/package/madwifi/madwifi.mk
trunk/package/microperl/microperl.mk
trunk/package/minihttpd/minihttpd.mk
trunk/package/mkdosfs/mkdosfs.mk
trunk/package/msmtp/msmtp.mk
trunk/package/mtd/Config.in
trunk/package/mtd/mtd.mk
trunk/package/netsnmp/netsnmp.mk
trunk/package/openntpd/ntpd.init
trunk/package/openntpd/openntpd.mk
trunk/package/openssh/openssh.mk
trunk/package/openssh/sshd.init
trunk/package/openssl/openssl-0.9.7e-no-fips.patch
trunk/package/openssl/openssl.mk
trunk/package/openssl/openssl.patch
trunk/package/openvpn/openvpn.mk
trunk/package/pciutils/pciutils.mk
trunk/package/pcmcia/pcmcia.mk
trunk/package/php4/php4.mk
trunk/package/pppd/pppd.mk
trunk/package/readline/readline.mk
trunk/package/screen/screen.mk
trunk/package/sfdisk/sfdisk.mk
trunk/package/strace/strace.mk
trunk/package/usbutils/usbutils.mk
trunk/package/util-linux/util-linux.mk
trunk/package/vsftpd/vsftpd.init
trunk/package/vsftpd/vsftpd.mk
trunk/package/wireless-tools/wireless-tools.mk
Added Paths:
-----------
trunk/package/acpid/acpid-buildfix.patch
trunk/package/acpid/acpid.init
trunk/package/busybox/busybox-1.4.1-binhex.patch
trunk/package/busybox/busybox-1.4.1-etherwake.patch
trunk/package/busybox/busybox-1.4.1-iproute.patch
trunk/package/busybox/busybox-1.4.1-tar_t.patch
trunk/package/busybox/busybox-1.4.1-trylink.patch
trunk/package/busybox/busybox-1.4.1-wgetSEGV.patch
trunk/package/busybox/busybox-astlinux.config
trunk/package/fakeroot/fakeroot-doc.patch
trunk/package/hotplug/diethotplug-0.5.tar
trunk/package/iproute2/astshape
trunk/package/iptables/astfw
trunk/package/iptables/iptables-no-xml.patch
trunk/package/libusb/libusb-config
trunk/package/madwifi/rt-madwifi.patch
trunk/package/mtd/mtd-osx.patch
trunk/package/netsnmp/netsnmp.init
trunk/package/openvpn/easy-rsa.tar.gz
trunk/package/openvpn/openvpn.init
trunk/package/pcmcia/pcmcia-init
trunk/package/screen/screenrc
trunk/package/sfdisk/sfdisk-linux2618.patch
trunk/package/strace/strace-linux2618.patch
trunk/package/util-linux/util-linux-remove-deprecated-functions.patch
Added: trunk/package/acpid/acpid-buildfix.patch
===================================================================
--- trunk/package/acpid/acpid-buildfix.patch (rev 0)
+++ trunk/package/acpid/acpid-buildfix.patch 2007-04-27 19:12:05 UTC (rev 47)
@@ -0,0 +1,35 @@
+diff -urN acpid-1.0.4.orig/acpid.c acpid-1.0.4/acpid.c
+--- acpid-1.0.4.orig/acpid.c 2006-05-16 14:13:13.963213500 -0500
++++ acpid-1.0.4/acpid.c 2006-05-16 14:14:10.678758000 -0500
+@@ -61,7 +61,7 @@
+ main(int argc, char **argv)
+ {
+ int event_fd;
+- int sock_fd;
++ int sock_fd = -1;
+
+ /* learn who we really are */
+ progname = (const char *)strrchr(argv[0], '/');
+@@ -386,9 +386,7 @@
+ umask(0);
+
+ /* get outta the way */
+- chdir("/");
+-
+- return 0;
++ return chdir("/");
+ }
+
+ static int
+diff -urN acpid-1.0.4.orig/ud_socket.c acpid-1.0.4/ud_socket.c
+--- acpid-1.0.4.orig/ud_socket.c 2006-05-16 14:13:13.983214750 -0500
++++ acpid-1.0.4/ud_socket.c 2006-05-16 14:14:10.678758000 -0500
+@@ -58,7 +58,7 @@
+ while (1) {
+ int newsock = 0;
+ struct sockaddr_un cliaddr;
+- int len = sizeof(struct sockaddr_un);
++ socklen_t len = sizeof(struct sockaddr_un);
+
+ newsock = accept(listenfd, (struct sockaddr *)&cliaddr, &len);
+ if (newsock < 0) {
Added: trunk/package/acpid/acpid.init
===================================================================
--- trunk/package/acpid/acpid.init (rev 0)
+++ trunk/package/acpid/acpid.init 2007-04-27 19:12:05 UTC (rev 47)
@@ -0,0 +1,45 @@
+#!/bin/sh
+
+. /etc/rc.conf
+
+start () {
+if [ -x /usr/sbin/acpid -a -r /proc/acpi/event ]
+then
+echo "Starting acpid..."
+/usr/sbin/acpid
+fi
+}
+
+stop () {
+if `ps | grep -q acpid`
+then
+echo "Stopping acpid..."
+killall acpid 2> /dev/null
+fi
+}
+
+case $1 in
+
+start)
+start
+;;
+
+stop)
+stop
+;;
+
+init)
+start
+;;
+
+restart)
+stop
+sleep 2
+start
+;;
+
+*)
+echo "Usage: start|stop|restart"
+;;
+
+esac
Property changes on: trunk/package/acpid/acpid.init
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/package/acpid/acpid.mk
===================================================================
--- trunk/package/acpid/acpid.mk 2007-04-27 18:58:37 UTC (rev 46)
+++ trunk/package/acpid/acpid.mk 2007-04-27 19:12:05 UTC (rev 47)
@@ -13,6 +13,7 @@
$(ACPID_DIR)/Makefile: $(DL_DIR)/$(ACPID_SOURCE)
zcat $(DL_DIR)/$(ACPID_SOURCE) | tar -C $(BUILD_DIR) -xvf -
$(SED) "s:ACPI_SOCKETFILE.*:ACPI_SOCKETFILE \"/tmp/acpid.socket\":" $(ACPID_DIR)/acpid.h
+ toolchain/patch-kernel.sh $(ACPID_DIR) package/acpid/ acpid\*.patch
touch -c $(ACPID_DIR)/Makefile
$(ACPID_DIR)/acpid: $(ACPID_DIR)/Makefile
@@ -26,6 +27,7 @@
mkdir -p $(TARGET_DIR)/etc/acpi/events
echo -e "event=button[ /]power\naction=/sbin/poweroff" > $(TARGET_DIR)/etc/acpi/events/powerbtn
touch -c $(TARGET_DIR)/usr/sbin/acpid
+ $(INSTALL) -D -m 0755 package/acpid/acpid.init $(TARGET_DIR)/etc/init.d/acpid
acpid: $(TARGET_DIR)/usr/sbin/acpid
@@ -33,6 +35,9 @@
acpid-clean:
-make -C $(ACPID_DIR) clean
+ rm -f $(TARGET_DIR)/usr/sbin/acpid
+ rm -f $(TARGET_DIR)/etc/init.d/acpid
+ rm -rf $(TARGET_DIR)/etc/acpi
acpid-dirclean:
rm -rf $(ACPID_DIR)
Modified: trunk/package/at/at.mk
===================================================================
--- trunk/package/at/at.mk 2007-04-27 18:58:37 UTC (rev 46)
+++ trunk/package/at/at.mk 2007-04-27 19:12:05 UTC (rev 47)
@@ -3,7 +3,7 @@
# at
#
#############################################################
-AT_VER:=3.1.9
+AT_VER:=3.1.10
AT_SOURCE:=at_$(AT_VER).tar.gz
AT_SITE:=http://ftp.debian.org/debian/pool/main/a/at
AT_DIR:=$(BUILD_DIR)/at-$(AT_VER)
Modified: trunk/package/bash/bash.mk
===================================================================
--- trunk/package/bash/bash.mk 2007-04-27 18:58:37 UTC (rev 46)
+++ trunk/package/bash/bash.mk 2007-04-27 19:12:05 UTC (rev 47)
@@ -62,8 +62,7 @@
(cd $(TARGET_DIR)/bin; /bin/ln -fs bash sh)
rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
- $(STRIP) $(TARGET_DIR)/usr/bin/bash
- $(STRIP) $(TARGET_DIR)/usr/bin/bashbug
+ $(STRIP) $(TARGET_DIR)/bin/bash
#If both bash and busybox are selected, make certain bash wins
#the fight over who gets to own the /bin/sh symlink
Modified: trunk/package/busybox/Config.in
===================================================================
--- trunk/package/busybox/Config.in 2007-04-27 18:58:37 UTC (rev 46)
+++ trunk/package/busybox/Config.in 2007-04-27 19:12:05 UTC (rev 47)
@@ -30,13 +30,3 @@
busybox includes replacement applets for the package.
If you wish to just install /bin/busybox, then answer N.
-
-config BR2_PACKAGE_BUSYBOX_CONFIG
- string "BusyBox configuration file to use?"
- depends BR2_PACKAGE_BUSYBOX
- default "package/busybox/busybox.config"
- help
- Some people may wish to use their own modified BusyBox configuration
- file, and will specify their config file location with this option.
-
- Most people will just use the default BusyBox configuration file.
Added: trunk/package/busybox/busybox-1.4.1-binhex.patch
===================================================================
--- trunk/package/busybox/busybox-1.4.1-binhex.patch (rev 0)
+++ trunk/package/busybox/busybox-1.4.1-binhex.patch 2007-04-27 19:12:05 UTC (rev 47)
@@ -0,0 +1,24 @@
+--- busybox-1.4.1/include/libbb.h Wed Jan 24 22:34:48 2007
++++ busybox-1.4.1-binhex/include/libbb.h Sat Jan 27 00:32:01 2007
+@@ -690,7 +690,7 @@
+ extern const char bb_msg_standard_output[];
+
+ extern const char bb_str_default[];
+-/* NB: (bb_hexdigits_upcase[i] | 0x10) -> lowercase hex digit */
++/* NB: (bb_hexdigits_upcase[i] | 0x20) -> lowercase hex digit */
+ extern const char bb_hexdigits_upcase[];
+
+ extern const char bb_path_mtab_file[];
+--- busybox-1.4.1/libbb/xfuncs.c Wed Jan 24 22:49:25 2007
++++ busybox-1.4.1-binhex/libbb/xfuncs.c Sat Jan 27 00:32:01 2007
+@@ -340,8 +340,8 @@
+ while (count) {
+ unsigned char c = *cp++;
+ /* put lowercase hex digits */
+- *p++ = 0x10 | bb_hexdigits_upcase[c >> 4];
+- *p++ = 0x10 | bb_hexdigits_upcase[c & 0xf];
++ *p++ = 0x20 | bb_hexdigits_upcase[c >> 4];
++ *p++ = 0x20 | bb_hexdigits_upcase[c & 0xf];
+ count--;
+ }
+ return p;
Added: trunk/package/busybox/busybox-1.4.1-etherwake.patch
===================================================================
--- trunk/package/busybox/busybox-1.4.1-etherwake.patch (rev 0)
+++ trunk/package/busybox/busybox-1.4.1-etherwake.patch 2007-04-27 19:12:05 UTC (rev 47)
@@ -0,0 +1,11 @@
+--- busybox-1.4.1.orig/networking/ether-wake.c 2007-01-24 16:34:34.000000000 -0500
++++ busybox-1.4.1/networking/ether-wake.c 2007-02-07 00:49:29.000000000 -0500
+@@ -223,8 +223,6 @@
+ #if !defined(__UCLIBC__)
+ } else if (ether_hostton(hostid, eaddr) == 0) {
+ bb_debug_msg("Station address for hostname %s is %s\n\n", hostid, ether_ntoa(eaddr));
+-#else
+-# warning Need to implement ether_hostton() for uClibc
+ #endif
+ } else
+ bb_show_usage();
Added: trunk/package/busybox/busybox-1.4.1-iproute.patch
===================================================================
--- trunk/package/busybox/busybox-1.4.1-iproute.patch (rev 0)
+++ trunk/package/busybox/busybox-1.4.1-iproute.patch 2007-04-27 19:12:05 UTC (rev 47)
@@ -0,0 +1,71 @@
+diff -urN busybox-1.4.1/networking/ip.c busybox-1.4.1-iproute/networking/ip.c
+--- busybox-1.4.1/networking/ip.c 2007-01-24 22:34:34.000000000 +0100
++++ busybox-1.4.1-iproute/networking/ip.c 2007-01-27 14:07:05.000000000 +0100
+@@ -33,8 +33,9 @@
+ if (ENABLE_FEATURE_IP_LINK && matches(argv[1], "link") == 0) {
+ ret = do_iplink(argc-2, argv+2);
+ }
+- if (ENABLE_FEATURE_IP_TUNNEL &&
+- (matches(argv[1], "tunnel") == 0 || strcmp(argv[1], "tunl") == 0)) {
++ if (ENABLE_FEATURE_IP_TUNNEL
++ && (matches(argv[1], "tunnel") == 0 || strcmp(argv[1], "tunl") == 0)
++ ) {
+ ret = do_iptunnel(argc-2, argv+2);
+ }
+ if (ENABLE_FEATURE_IP_RULE && matches(argv[1], "rule") == 0) {
+diff -urN busybox-1.4.1/networking/libiproute/iproute.c busybox-1.4.1-iproute/networking/libiproute/iproute.c
+--- busybox-1.4.1/networking/libiproute/iproute.c 2007-01-24 22:34:33.000000000 +0100
++++ busybox-1.4.1-iproute/networking/libiproute/iproute.c 2007-01-27 14:07:05.000000000 +0100
+@@ -835,9 +835,11 @@
+
+ int do_iproute(int argc, char **argv)
+ {
+- static const char * const ip_route_commands[] =
+- { "add", "append", "change", "chg", "delete", "get",
+- "list", "show", "prepend", "replace", "test", "flush", 0 };
++ static const char * const ip_route_commands[] = {
++ /*0-3*/ "add", "append", "change", "chg",
++ /*4-7*/ "delete", "get", "list", "show",
++ /*8..*/ "prepend", "replace", "test", "flush", 0
++ };
+ int command_num = 6;
+ unsigned int flags = 0;
+ int cmd = RTM_NEWROUTE;
+@@ -848,7 +850,7 @@
+ command_num = index_in_substr_array(ip_route_commands, *argv);
+ }
+ switch (command_num) {
+- case 0: /* add*/
++ case 0: /* add */
+ flags = NLM_F_CREATE|NLM_F_EXCL;
+ break;
+ case 1: /* append */
+@@ -859,21 +861,20 @@
+ flags = NLM_F_REPLACE;
+ break;
+ case 4: /* delete */
+- case 5: /* del */
+ cmd = RTM_DELROUTE;
+ break;
+- case 6: /* get */
++ case 5: /* get */
+ return iproute_get(argc-1, argv+1);
+- case 7: /* list */
+- case 8: /* show */
++ case 6: /* list */
++ case 7: /* show */
+ return iproute_list_or_flush(argc-1, argv+1, 0);
+- case 9: /* prepend */
++ case 8: /* prepend */
+ flags = NLM_F_CREATE;
+- case 10: /* replace */
++ case 9: /* replace */
+ flags = NLM_F_CREATE|NLM_F_REPLACE;
+- case 11: /* test */
++ case 10: /* test */
+ flags = NLM_F_EXCL;
+- case 12: /* flush */
++ case 11: /* flush */
+ return iproute_list_or_flush(argc-1, argv+1, 1);
+ default:
+ bb_error_msg_and_die("unknown command %s", *argv);
Added: trunk/package/busybox/busybox-1.4.1-tar_t.patch
===================================================================
--- trunk/package/busybox/busybox-1.4.1-tar_t.patch (rev 0)
+++ trunk/package/busybox/busybox-1.4.1-tar_t.patch 2007-04-27 19:12:05 UTC (rev 47)
@@ -0,0 +1,76 @@
+--- busybox-1.4.1/archival/tar.c Wed Jan 24 22:49:25 2007
++++ busybox-1.4.1-tar_t/archival/tar.c Sun Feb 25 21:50:35 2007
+@@ -760,7 +760,9 @@
+ const char *tar_filename = "-";
+ unsigned opt;
+ int verboseFlag = 0;
++#if ENABLE_FEATURE_TAR_LONG_OPTIONS && ENABLE_FEATURE_TAR_FROM
+ llist_t *excludes = NULL;
++#endif
+
+ /* Initialise default values */
+ tar_handle = init_handle();
+@@ -773,7 +775,9 @@
+ "tt:vv:" // count -t,-v
+ "?:" // bail out with usage instead of error return
+ "X::T::" // cumulative lists
++#if ENABLE_FEATURE_TAR_LONG_OPTIONS && ENABLE_FEATURE_TAR_FROM
+ "\xff::" // cumulative lists for --exclude
++#endif
+ USE_FEATURE_TAR_CREATE("c:") "t:x:" // at least one of these is reqd
+ USE_FEATURE_TAR_CREATE("c--tx:t--cx:x--ct") // mutually exclusive
+ SKIP_FEATURE_TAR_CREATE("t--x:x--t"); // mutually exclusive
+@@ -788,14 +792,15 @@
+ USE_FEATURE_TAR_FROM( "T:X:")
+ USE_FEATURE_TAR_GZIP( "z" )
+ USE_FEATURE_TAR_COMPRESS("Z" )
+- ,
+- &base_dir, // -C dir
+- &tar_filename, // -f filename
+- USE_FEATURE_TAR_FROM(&(tar_handle->accept),) // T
+- USE_FEATURE_TAR_FROM(&(tar_handle->reject),) // X
+- USE_FEATURE_TAR_FROM(&excludes ,) // --exclude
+- &verboseFlag, // combined count for -t and -v
+- &verboseFlag // combined count for -t and -v
++ , &base_dir // -C dir
++ , &tar_filename // -f filename
++ USE_FEATURE_TAR_FROM(, &(tar_handle->accept)) // T
++ USE_FEATURE_TAR_FROM(, &(tar_handle->reject)) // X
++#if ENABLE_FEATURE_TAR_LONG_OPTIONS && ENABLE_FEATURE_TAR_FROM
++ , &excludes // --exclude
++#endif
++ , &verboseFlag // combined count for -t and -v
++ , &verboseFlag // combined count for -t and -v
+ );
+
+ if (verboseFlag) tar_handle->action_header = header_verbose_list;
+@@ -828,17 +833,19 @@
+ if (opt & OPT_COMPRESS)
+ get_header_ptr = get_header_tar_Z;
+
+- if (ENABLE_FEATURE_TAR_FROM) {
+- tar_handle->reject = append_file_list_to_list(tar_handle->reject);
+- /* Append excludes to reject */
+- while (excludes) {
+- llist_t *temp = excludes->link;
+- excludes->link = tar_handle->reject;
+- tar_handle->reject = excludes;
+- excludes = temp;
+- }
+- tar_handle->accept = append_file_list_to_list(tar_handle->accept);
++#if ENABLE_FEATURE_TAR_FROM
++ tar_handle->reject = append_file_list_to_list(tar_handle->reject);
++#if ENABLE_FEATURE_TAR_LONG_OPTIONS
++ /* Append excludes to reject */
++ while (excludes) {
++ llist_t *next = excludes->link;
++ excludes->link = tar_handle->reject;
++ tar_handle->reject = excludes;
++ excludes = next;
+ }
++#endif
++ tar_handle->accept = append_file_list_to_list(tar_handle->accept);
++#endif
+
+ /* Check if we are reading from stdin */
+ if (argv[optind] && *argv[optind] == '-') {
Added: trunk/package/busybox/busybox-1.4.1-trylink.patch
===================================================================
--- trunk/package/busybox/busybox-1.4.1-trylink.patch (rev 0)
+++ trunk/package/busybox/busybox-1.4.1-trylink.patch 2007-04-27 19:12:05 UTC (rev 47)
@@ -0,0 +1,14 @@
+diff -ur busybox-1.4.1.orig/scripts/trylink busybox-1.4.1/scripts/trylink
+--- busybox-1.4.1.orig/scripts/trylink 2007-01-24 16:34:36.000000000 -0500
++++ busybox-1.4.1/scripts/trylink 2007-04-18 00:57:03.000000000 -0400
+@@ -1,8 +1,8 @@
+-#!/bin/sh
++#!/bin/bash
+
+ debug=false
+
+-function try {
++try () {
+ added="$1"
+ shift
+ $debug && echo "Trying: $* $added"
Added: trunk/package/busybox/busybox-1.4.1-wgetSEGV.patch
===================================================================
--- trunk/package/busybox/busybox-1.4.1-wgetSEGV.patch (rev 0)
+++ trunk/package/busybox/busybox-1.4.1-wgetSEGV.patch 2007-04-27 19:12:05 UTC (rev 47)
@@ -0,0 +1,14 @@
+diff -urN busybox-1.4.1/networking/wget.c busybox-1.4.1-wgetSEGV/networking/wget.c
+--- busybox-1.4.1/networking/wget.c 2007-01-24 22:34:34.000000000 +0100
++++ busybox-1.4.1-wgetSEGV/networking/wget.c 2007-02-11 17:21:18.000000000 +0100
+@@ -543,7 +543,9 @@
+ p = strchr(h->host, '?'); if (!sp || (p && sp > p)) sp = p;
+ p = strchr(h->host, '#'); if (!sp || (p && sp > p)) sp = p;
+ if (!sp) {
+- h->path = "";
++ /* must be writable because of bb_get_last_path_component() */
++ static char nullstr[] = "";
++ h->path = nullstr;
+ } else if (*sp == '/') {
+ *sp = '\0';
+ h->path = sp + 1;
Added: trunk/package/busybox/busybox-astlinux.config
===================================================================
--- trunk/package/busybox/busybox-astlinux.config (rev 0)
+++ trunk/package/busybox/busybox-astlinux.config 2007-04-27 19:12:05 UTC (rev 47)
@@ -0,0 +1,675 @@
+#
+# Automatically generated make config: don't edit
+# Busybox version: 1.4.1
+# Wed Feb 7 11:48:53 2007
+#
+CONFIG_HAVE_DOT_CONFIG=y
+
+#
+# Busybox Settings
+#
+
+#
+# General Configuration
+#
+CONFIG_NITPICK=y
+# CONFIG_DESKTOP is not set
+# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
+# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
+CONFIG_FEATURE_BUFFERS_GO_IN_BSS=y
+CONFIG_SHOW_USAGE=y
+CONFIG_FEATURE_VERBOSE_USAGE=y
+CONFIG_FEATURE_COMPRESS_USAGE=y
+CONFIG_FEATURE_INSTALLER=y
+# CONFIG_LOCALE_SUPPORT is not set
+CONFIG_GETOPT_LONG=y
+CONFIG_FEATURE_DEVPTS=y
+# CONFIG_FEATURE_CLEAN_UP is not set
+CONFIG_FEATURE_SUID=y
+CONFIG_FEATURE_SYSLOG=y
+# CONFIG_FEATURE_SUID_CONFIG is not set
+# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
+CONFIG_FEATURE_HAVE_RPC=y
+# CONFIG_SELINUX is not set
+CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
+
+#
+# Build Options
+#
+# CONFIG_STATIC is not set
+# CONFIG_BUILD_LIBBUSYBOX is not set
+# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set
+# CONFIG_FEATURE_SHARED_BUSYBOX is not set
+CONFIG_LFS=y
+# CONFIG_BUILD_AT_ONCE is not set
+
+#
+# Debugging Options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_PESSIMIZE is not set
+# CONFIG_NO_DEBUG_LIB is not set
+# CONFIG_DMALLOC is not set
+# CONFIG_EFENCE is not set
+CONFIG_INCLUDE_SUSv2=y
+
+#
+# Installation Options
+#
+# CONFIG_INSTALL_NO_USR is not set
+CONFIG_INSTALL_APPLET_SYMLINKS=y
+# CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_DONT is not set
+CONFIG_PREFIX="./install"
+
+#
+# Busybox Library Tuning
+#
+CONFIG_PASSWORD_MINLEN=6
+CONFIG_MD5_SIZE_VS_SPEED=2
+
+#
+# Applets
+#
+
+#
+# Archival Utilities
+#
+# CONFIG_AR is not set
+# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
+CONFIG_BUNZIP2=y
+# CONFIG_CPIO is not set
+# CONFIG_DPKG is not set
+# CONFIG_DPKG_DEB is not set
+# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
+CONFIG_GUNZIP=y
+# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set
+CONFIG_GZIP=y
+# CONFIG_RPM2CPIO is not set
+# CONFIG_RPM is not set
+CONFIG_TAR=y
+CONFIG_FEATURE_TAR_CREATE=y
+CONFIG_FEATURE_TAR_BZIP2=y
+# CONFIG_FEATURE_TAR_LZMA is not set
+# CONFIG_FEATURE_TAR_FROM is not set
+CONFIG_FEATURE_TAR_GZIP=y
+# CONFIG_FEATURE_TAR_COMPRESS is not set
+# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
+# CONFIG_UNCOMPRESS is not set
+# CONFIG_UNLZMA is not set
+# CONFIG_FEATURE_LZMA_FAST is not set
+CONFIG_UNZIP=y
+
+#
+# Common options for cpio and tar
+#
+# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
+# CONFIG_FEATURE_DEB_TAR_GZ is not set
+# CONFIG_FEATURE_DEB_TAR_BZ2 is not set
+# CONFIG_FEATURE_DEB_TAR_LZMA is not set
+
+#
+# Coreutils
+#
+CONFIG_BASENAME=y
+# CONFIG_CAL is not set
+CONFIG_CAT=y
+# CONFIG_CATV is not set
+CONFIG_CHGRP=y
+CONFIG_CHMOD=y
+CONFIG_CHOWN=y
+CONFIG_CHROOT=y
+# CONFIG_CKSUM is not set
+CONFIG_CMP=y
+# CONFIG_COMM is not set
+CONFIG_CP=y
+CONFIG_CUT=y
+CONFIG_DATE=y
+CONFIG_FEATURE_DATE_ISOFMT=y
+CONFIG_DD=y
+CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
+# CONFIG_FEATURE_DD_IBS_OBS is not set
+CONFIG_DF=y
+CONFIG_DIFF=y
+CONFIG_FEATURE_DIFF_BINARY=y
+CONFIG_FEATURE_DIFF_DIR=y
+# CONFIG_FEATURE_DIFF_MINIMAL is not set
+CONFIG_DIRNAME=y
+CONFIG_DOS2UNIX=y
+CONFIG_UNIX2DOS=y
+CONFIG_DU=y
+CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+CONFIG_ENV=y
+# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set
+CONFIG_EXPR=y
+# CONFIG_EXPR_MATH_SUPPORT_64 is not set
+CONFIG_FALSE=y
+# CONFIG_FOLD is not set
+CONFIG_HEAD=y
+# CONFIG_FEATURE_FANCY_HEAD is not set
+CONFIG_HOSTID=y
+CONFIG_ID=y
+CONFIG_INSTALL=y
+# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
+# CONFIG_LENGTH is not set
+CONFIG_LN=y
+CONFIG_LOGNAME=y
+CONFIG_LS=y
+CONFIG_FEATURE_LS_FILETYPES=y
+CONFIG_FEATURE_LS_FOLLOWLINKS=y
+CONFIG_FEATURE_LS_RECURSIVE=y
+CONFIG_FEATURE_LS_SORTFILES=y
+CONFIG_FEATURE_LS_TIMESTAMPS=y
+CONFIG_FEATURE_LS_USERNAME=y
+CONFIG_FEATURE_LS_COLOR=y
+# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
+CONFIG_MD5SUM=y
+CONFIG_MKDIR=y
+# CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set
+# CONFIG_MKFIFO is not set
+CONFIG_MKNOD=y
+CONFIG_MV=y
+# CONFIG_FEATURE_MV_LONG_OPTIONS is not set
+CONFIG_NICE=y
+CONFIG_NOHUP=y
+# CONFIG_OD is not set
+# CONFIG_PRINTENV is not set
+# CONFIG_PRINTF is not set
+CONFIG_PWD=y
+CONFIG_REALPATH=y
+CONFIG_RM=y
+CONFIG_RMDIR=y
+CONFIG_SEQ=y
+CONFIG_SHA1SUM=y
+CONFIG_SLEEP=y
+# CONFIG_FEATURE_FANCY_SLEEP is not set
+CONFIG_SORT=y
+CONFIG_FEATURE_SORT_BIG=y
+CONFIG_STAT=y
+# CONFIG_FEATURE_STAT_FORMAT is not set
+CONFIG_STTY=y
+# CONFIG_SUM is not set
+CONFIG_SYNC=y
+CONFIG_TAIL=y
+CONFIG_FEATURE_FANCY_TAIL=y
+CONFIG_TEE=y
+CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
+CONFIG_TEST=y
+CONFIG_FEATURE_TEST_64=y
+CONFIG_TOUCH=y
+CONFIG_TR=y
+# CONFIG_FEATURE_TR_CLASSES is not set
+# CONFIG_FEATURE_TR_EQUIV is not set
+CONFIG_TRUE=y
+CONFIG_TTY=y
+CONFIG_UNAME=y
+CONFIG_UNIQ=y
+CONFIG_USLEEP=y
+CONFIG_UUDECODE=y
+CONFIG_UUENCODE=y
+CONFIG_WATCH=y
+CONFIG_WC=y
+# CONFIG_FEATURE_WC_LARGE is not set
+CONFIG_WHO=y
+CONFIG_WHOAMI=y
+CONFIG_YES=y
+
+#
+# Common options for cp and mv
+#
+CONFIG_FEATURE_PRESERVE_HARDLINKS=y
+
+#
+# Common options for ls, more and telnet
+#
+CONFIG_FEATURE_AUTOWIDTH=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
+
+#
+# Common options for md5sum, sha1sum
+#
+CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
+
+#
+# Console Utilities
+#
+CONFIG_CHVT=y
+CONFIG_CLEAR=y
+CONFIG_DEALLOCVT=y
+# CONFIG_DUMPKMAP is not set
+# CONFIG_LOADFONT is not set
+# CONFIG_LOADKMAP is not set
+CONFIG_OPENVT=y
+CONFIG_RESET=y
+# CONFIG_RESIZE is not set
+# CONFIG_FEATURE_RESIZE_PRINT is not set
+# CONFIG_SETCONSOLE is not set
+# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
+# CONFIG_SETKEYCODES is not set
+# CONFIG_SETLOGCONS is not set
+
+#
+# Debian Utilities
+#
+CONFIG_MKTEMP=y
+# CONFIG_PIPE_PROGRESS is not set
+CONFIG_READLINK=y
+# CONFIG_FEATURE_READLINK_FOLLOW is not set
+CONFIG_RUN_PARTS=y
+# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
+# CONFIG_START_STOP_DAEMON is not set
+# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set
+# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set
+CONFIG_WHICH=y
+
+#
+# Editors
+#
+CONFIG_AWK=y
+CONFIG_FEATURE_AWK_MATH=y
+# CONFIG_ED is not set
+CONFIG_PATCH=y
+CONFIG_SED=y
+CONFIG_VI=y
+CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_YANKMARK=y
+CONFIG_FEATURE_VI_SEARCH=y
+CONFIG_FEATURE_VI_USE_SIGNALS=y
+CONFIG_FEATURE_VI_DOT_CMD=y
+CONFIG_FEATURE_VI_READONLY=y
+CONFIG_FEATURE_VI_SETOPTS=y
+CONFIG_FEATURE_VI_SET=y
+CONFIG_FEATURE_VI_WIN_RESIZE=y
+CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
+CONFIG_FEATURE_ALLOW_EXEC=y
+
+#
+# Finding Utilities
+#
+CONFIG_FIND=y
+CONFIG_FEATURE_FIND_PRINT0=y
+CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_MMIN=y
+CONFIG_FEATURE_FIND_PERM=y
+CONFIG_FEATURE_FIND_TYPE=y
+CONFIG_FEATURE_FIND_XDEV=y
+CONFIG_FEATURE_FIND_NEWER=y
+# CONFIG_FEATURE_FIND_INUM is not set
+CONFIG_FEATURE_FIND_EXEC=y
+CONFIG_GREP=y
+CONFIG_FEATURE_GREP_EGREP_ALIAS=y
+CONFIG_FEATURE_GREP_FGREP_ALIAS=y
+CONFIG_FEATURE_GREP_CONTEXT=y
+CONFIG_XARGS=y
+CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y
+CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
+CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
+CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
+
+#
+# Init Utilities
+#
+CONFIG_INIT=y
+# CONFIG_DEBUG_INIT is not set
+CONFIG_FEATURE_USE_INITTAB=y
+# CONFIG_FEATURE_INIT_SCTTY is not set
+# CONFIG_FEATURE_EXTRA_QUIET is not set
+# CONFIG_FEATURE_INIT_COREDUMPS is not set
+CONFIG_FEATURE_INITRD=y
+CONFIG_HALT=y
+# CONFIG_MESG is not set
+
+#
+# Login/Password Management Utilities
+#
+CONFIG_FEATURE_SHADOWPASSWDS=y
+# CONFIG_USE_BB_SHADOW is not set
+# CONFIG_USE_BB_PWD_GRP is not set
+CONFIG_ADDGROUP=y
+CONFIG_DELGROUP=y
+CONFIG_ADDUSER=y
+CONFIG_DELUSER=y
+CONFIG_GETTY=y
+CONFIG_FEATURE_UTMP=y
+CONFIG_FEATURE_WTMP=y
+CONFIG_LOGIN=y
+# CONFIG_LOGIN_SCRIPTS is not set
+# CONFIG_FEATURE_SECURETTY is not set
+CONFIG_PASSWD=y
+# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set
+CONFIG_SU=y
+CONFIG_FEATURE_SU_SYSLOG=y
+CONFIG_FEATURE_SU_CHECKS_SHELLS=y
+CONFIG_SULOGIN=y
+CONFIG_VLOCK=y
+
+#
+# Linux Ext2 FS Progs
+#
+# CONFIG_CHATTR is not set
+CONFIG_FSCK=y
+CONFIG_LSATTR=y
+
+#
+# Linux Module Utilities
+#
+CONFIG_INSMOD=y
+# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
+# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
+CONFIG_RMMOD=y
+CONFIG_LSMOD=y
+CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
+CONFIG_MODPROBE=y
+CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y
+CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y
+
+#
+# Options common to multiple modutils
+#
+CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
+# CONFIG_FEATURE_2_4_MODULES is not set
+CONFIG_FEATURE_2_6_MODULES=y
+# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set
+
+#
+# Linux System Utilities
+#
+CONFIG_DMESG=y
+CONFIG_FEATURE_DMESG_PRETTY=y
+# CONFIG_FBSET is not set
+# CONFIG_FEATURE_FBSET_FANCY is not set
+# CONFIG_FEATURE_FBSET_READMODE is not set
+# CONFIG_FDFLUSH is not set
+CONFIG_FDFORMAT=y
+CONFIG_FDISK=y
+CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
+CONFIG_FEATURE_FDISK_WRITABLE=y
+# CONFIG_FEATURE_AIX_LABEL is not set
+# CONFIG_FEATURE_SGI_LABEL is not set
+# CONFIG_FEATURE_SUN_LABEL is not set
+# CONFIG_FEATURE_OSF_LABEL is not set
+# CONFIG_FEATURE_FDISK_ADVANCED is not set
+# CONFIG_FREERAMDISK is not set
+# CONFIG_FSCK_MINIX is not set
+# CONFIG_MKFS_MINIX is not set
+# CONFIG_FEATURE_MINIX2 is not set
+CONFIG_GETOPT=y
+CONFIG_HEXDUMP=y
+CONFIG_HWCLOCK=y
+# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set
+CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
+# CONFIG_IPCRM is not set
+# CONFIG_IPCS is not set
+CONFIG_LOSETUP=y
+# CONFIG_MDEV is not set
+# CONFIG_FEATURE_MDEV_CONF is not set
+# CONFIG_FEATURE_MDEV_EXEC is not set
+CONFIG_MKSWAP=y
+# CONFIG_FEATURE_MKSWAP_V0 is not set
+CONFIG_MORE=y
+CONFIG_FEATURE_USE_TERMIOS=y
+CONFIG_MOUNT=y
+CONFIG_FEATURE_MOUNT_NFS=y
+# CONFIG_FEATURE_MOUNT_CIFS is not set
+CONFIG_FEATURE_MOUNT_FLAGS=y
+CONFIG_FEATURE_MOUNT_FSTAB=y
+CONFIG_PIVOT_ROOT=y
+CONFIG_RDATE=y
+# CONFIG_READPROFILE is not set
+# CONFIG_SETARCH is not set
+CONFIG_SWAPONOFF=y
+# CONFIG_SWITCH_ROOT is not set
+CONFIG_UMOUNT=y
+CONFIG_FEATURE_UMOUNT_ALL=y
+
+#
+# Common options for mount/umount
+#
+CONFIG_FEATURE_MOUNT_LOOP=y
+# CONFIG_FEATURE_MTAB_SUPPORT is not set
+
+#
+# Miscellaneous Utilities
+#
+# CONFIG_ADJTIMEX is not set
+# CONFIG_BBCONFIG is not set
+CONFIG_CROND=y
+# CONFIG_DEBUG_CROND_OPTION is not set
+CONFIG_FEATURE_CROND_CALL_SENDMAIL=y
+CONFIG_CRONTAB=y
+CONFIG_DC=y
+# CONFIG_DEVFSD is not set
+# CONFIG_DEVFSD_MODLOAD is not set
+# CONFIG_DEVFSD_FG_NP is not set
+# CONFIG_DEVFSD_VERBOSE is not set
+# CONFIG_FEATURE_DEVFS is not set
+# CONFIG_EJECT is not set
+CONFIG_LAST=y
+CONFIG_LESS=y
+CONFIG_FEATURE_LESS_MAXLINES=9999999
+CONFIG_FEATURE_LESS_BRACKETS=y
+CONFIG_FEATURE_LESS_FLAGS=y
+# CONFIG_FEATURE_LESS_FLAGCS is not set
+# CONFIG_FEATURE_LESS_MARKS is not set
+# CONFIG_FEATURE_LESS_REGEXP is not set
+CONFIG_HDPARM=y
+CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
+CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y
+CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y
+# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
+# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
+CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y
+CONFIG_MAKEDEVS=y
+# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
+CONFIG_FEATURE_MAKEDEVS_TABLE=y
+# CONFIG_MOUNTPOINT is not set
+CONFIG_MT=y
+CONFIG_NMETER=y
+# CONFIG_RAIDAUTORUN is not set
+# CONFIG_READAHEAD is not set
+# CONFIG_RUNLEVEL is not set
+# CONFIG_RX is not set
+CONFIG_STRINGS=y
+# CONFIG_SETSID is not set
+# CONFIG_TASKSET is not set
+# CONFIG_FEATURE_TASKSET_FANCY is not set
+CONFIG_TIME=y
+CONFIG_WATCHDOG=y
+
+#
+# Networking Utilities
+#
+# CONFIG_FEATURE_IPV6 is not set
+CONFIG_ARP=y
+CONFIG_ARPING=y
+# CONFIG_DNSD is not set
+CONFIG_ETHER_WAKE=y
+CONFIG_FAKEIDENTD=y
+CONFIG_FTPGET=y
+CONFIG_FTPPUT=y
+# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
+CONFIG_HOSTNAME=y
+# CONFIG_HTTPD is not set
+# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
+# CONFIG_FEATURE_HTTPD_SETUID is not set
+# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
+# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
+# CONFIG_FEATURE_HTTPD_CGI is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
+# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
+# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
+# CONFIG_FEATURE_IFCONFIG_SLIP is not set
+CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
+CONFIG_FEATURE_IFCONFIG_HW=y
+CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
+CONFIG_IFUPDOWN=y
+# CONFIG_FEATURE_IFUPDOWN_IP is not set
+# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
+CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN=y
+CONFIG_FEATURE_IFUPDOWN_IPV4=y
+# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
+# CONFIG_FEATURE_IFUPDOWN_IPX is not set
+# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
+CONFIG_INETD=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN=y
+# CONFIG_FEATURE_INETD_RPC is not set
+# CONFIG_IP is not set
+# CONFIG_FEATURE_IP_ADDRESS is not set
+# CONFIG_FEATURE_IP_LINK is not set
+# CONFIG_FEATURE_IP_ROUTE is not set
+# CONFIG_FEATURE_IP_TUNNEL is not set
+# CONFIG_FEATURE_IP_RULE is not set
+# CONFIG_FEATURE_IP_SHORT_FORMS is not set
+# CONFIG_IPADDR is not set
+# CONFIG_IPLINK is not set
+# CONFIG_IPROUTE is not set
+# CONFIG_IPTUNNEL is not set
+# CONFIG_IPRULE is not set
+CONFIG_IPCALC=y
+CONFIG_FEATURE_IPCALC_FANCY=y
+# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
+# CONFIG_NAMEIF is not set
+CONFIG_NC=y
+CONFIG_NC_SERVER=y
+# CONFIG_NC_EXTRA is not set
+CONFIG_NETSTAT=y
+CONFIG_NSLOOKUP=y
+CONFIG_PING=y
+CONFIG_FEATURE_FANCY_PING=y
+# CONFIG_PING6 is not set
+# CONFIG_FEATURE_FANCY_PING6 is not set
+CONFIG_ROUTE=y
+CONFIG_TELNET=y
+CONFIG_FEATURE_TELNET_TTYPE=y
+# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
+CONFIG_TELNETD=y
+# CONFIG_FEATURE_TELNETD_STANDALONE is not set
+CONFIG_TFTP=y
+CONFIG_FEATURE_TFTP_GET=y
+CONFIG_FEATURE_TFTP_PUT=y
+CONFIG_FEATURE_TFTP_BLOCKSIZE=y
+CONFIG_DEBUG_TFTP=y
+CONFIG_TRACEROUTE=y
+CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
+# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
+CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y
+# CONFIG_APP_UDHCPD is not set
+# CONFIG_APP_DHCPRELAY is not set
+# CONFIG_APP_DUMPLEASES is not set
+CONFIG_APP_UDHCPC=y
+CONFIG_FEATURE_UDHCP_SYSLOG=y
+# CONFIG_FEATURE_UDHCP_DEBUG is not set
+CONFIG_VCONFIG=y
+CONFIG_WGET=y
+CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+# CONFIG_FEATURE_WGET_IP6_LITERAL is not set
+# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
+CONFIG_ZCIP=y
+
+#
+# Process Utilities
+#
+CONFIG_FREE=y
+CONFIG_FUSER=y
+CONFIG_KILL=y
+CONFIG_KILLALL=y
+CONFIG_KILLALL5=y
+CONFIG_PIDOF=y
+# CONFIG_FEATURE_PIDOF_SINGLE is not set
+# CONFIG_FEATURE_PIDOF_OMIT is not set
+CONFIG_PS=y
+CONFIG_FEATURE_PS_WIDE=y
+CONFIG_RENICE=y
+CONFIG_BB_SYSCTL=y
+CONFIG_TOP=y
+CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
+CONFIG_UPTIME=y
+
+#
+# Shells
+#
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_LASH is not set
+# CONFIG_FEATURE_SH_IS_MSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+CONFIG_ASH=y
+
+#
+# Ash Shell Options
+#
+CONFIG_ASH_JOB_CONTROL=y
+# CONFIG_ASH_READ_NCHARS is not set
+# CONFIG_ASH_READ_TIMEOUT is not set
+CONFIG_ASH_ALIAS=y
+CONFIG_ASH_MATH_SUPPORT=y
+CONFIG_ASH_MATH_SUPPORT_64=y
+# CONFIG_ASH_GETOPTS is not set
+# CONFIG_ASH_BUILTIN_ECHO is not set
+CONFIG_ASH_BUILTIN_TEST=y
+# CONFIG_ASH_CMDCMD is not set
+# CONFIG_ASH_MAIL is not set
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+# CONFIG_ASH_RANDOM_SUPPORT is not set
+# CONFIG_ASH_EXPAND_PRMT is not set
+# CONFIG_HUSH is not set
+# CONFIG_LASH is not set
+# CONFIG_MSH is not set
+
+#
+# Bourne Shell Options
+#
+CONFIG_FEATURE_SH_EXTRA_QUIET=y
+# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set
+CONFIG_FEATURE_COMMAND_EDITING=y
+# CONFIG_FEATURE_COMMAND_EDITING_VI is not set
+CONFIG_FEATURE_COMMAND_HISTORY=100
+CONFIG_FEATURE_COMMAND_SAVEHISTORY=y
+CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y
+CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION=y
+CONFIG_FEATURE_SH_FANCY_PROMPT=y
+
+#
+# System Logging Utilities
+#
+CONFIG_SYSLOGD=y
+CONFIG_FEATURE_ROTATE_LOGFILE=y
+CONFIG_FEATURE_REMOTE_LOG=y
+CONFIG_FEATURE_IPC_SYSLOG=y
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
+CONFIG_LOGREAD=y
+# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
+CONFIG_KLOGD=y
+CONFIG_LOGGER=y
+
+#
+# Runit Utilities
+#
+# CONFIG_RUNSV is not set
+# CONFIG_RUNSVDIR is not set
+# CONFIG_SV is not set
+# CONFIG_SVLOGD is not set
+# CONFIG_CHPST is not set
+# CONFIG_SETUIDGID is not set
+# CONFIG_ENVUIDGID is not set
+# CONFIG_ENVDIR is not set
+# CONFIG_SOFTLIMIT is not set
Modified: trunk/package/busybox/busybox.mk
===================================================================
--- trunk/package/busybox/busybox.mk 2007-04-27 18:58:37 UTC (rev 46)
+++ trunk/package/busybox/busybox.mk 2007-04-27 19:12:05 UTC (rev 47)
@@ -4,26 +4,27 @@
#
#############################################################
+BUSYBOX_VER:=1.4.1
+
ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y)
# Be aware that this changes daily....
BUSYBOX_DIR:=$(BUILD_DIR)/busybox
BUSYBOX_SOURCE:=busybox-snapshot.tar.bz2
BUSYBOX_SITE:=http://www.busybox.net/downloads/snapshots
else
-BUSYBOX_VER:=1.1.0
BUSYBOX_DIR:=$(BUILD_DIR)/busybox-$(BUSYBOX_VER)
BUSYBOX_SOURCE:=busybox-$(BUSYBOX_VER).tar.bz2
BUSYBOX_SITE:=http://www.busybox.net/downloads
endif
+
BUSYBOX_UNZIP=bzcat
-BUSYBOX_CONFIG_FILE=$(subst ",, $(strip $(BR2_PACKAGE_BUSYBOX_CONFIG)))
-#"
+BUSYBOX_CONFIG_FILE=package/busybox/busybox-astlinux.config
$(DL_DIR)/$(BUSYBOX_SOURCE):
$(WGET) -P $(DL_DIR) $(BUSYBOX_SITE)/$(BUSYBOX_SOURCE)
-busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_CONFIG_FILE)
+busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_CONFIG_FILE) dependencies
$(BUSYBOX_DIR)/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE)
$(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
@@ -32,39 +33,136 @@
$(SED) "/#include.*busybox\.h/a#define CONFIG_SYSLOGD" $(BUSYBOX_DIR)/init/init.c
endif
# Allow busybox patches.
- toolchain/patch-kernel.sh $(BUSYBOX_DIR) package/busybox busybox\*.patch
- touch $(BUSYBOX_DIR)/.unpacked
+ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y)
+ toolchain/patch-kernel.sh $(BUSYBOX_DIR) package/busybox busybox.\*.patch
+else
+ toolchain/patch-kernel.sh $(BUSYBOX_DIR) package/busybox busybox-$(BUSYBOX_VER)-\*.patch
+endif
+ touch $@
+ifeq ($(strip $(BR2_INITRD_ROOTFS_EXT2)),y)
+ cp -a $(BUSYBOX_DIR) $(BUSYBOX_DIR)-initrd
+endif
+$(BUSYBOX_DIR)-initrd/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE)
+ $(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ mv $(BUSYBOX_DIR) $(BUSYBOX_DIR)-initrd
+ifeq ($(BR2_PACKAGE_SYSKLOGD),y)
+ # if we have external syslogd, force busybox to use it
+ $(SED) "/#include.*busybox\.h/a#define CONFIG_SYSLOGD" $(BUSYBOX_DIR)-initrd/init/init.c
+endif
+ # Allow busybox patches.
+ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y)
+ toolchain/patch-kernel.sh $(BUSYBOX_DIR)-initrd package/busybox busybox.\*.patch
+else
+ toolchain/patch-kernel.sh $(BUSYBOX_DIR)-initrd package/busybox busybox-$(BUSYBOX_VER)-\*.patch
+endif
+ touch $@
+
$(BUSYBOX_DIR)/.configured: $(BUSYBOX_DIR)/.unpacked $(BUSYBOX_CONFIG_FILE)
- cp $(BUSYBOX_CONFIG_FILE) $(BUSYBOX_DIR)/.config
- $(SED) "s,^CROSS.*,CROSS=$(TARGET_CROSS)\n\
- PREFIX=$(TARGET_DIR),;" $(BUSYBOX_DIR)/Rules.mak
+ cp -f $(BUSYBOX_CONFIG_FILE) $(BUSYBOX_DIR)/.config
+ $(SED) s,CONFIG_PREFIX=.*,CONFIG_PREFIX=\"$(TARGET_DIR)\", \
+ $(BUSYBOX_DIR)/.config ;
+ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y)
+ $(SED) s,CONFIG_PREFIX=.*,CONFIG_PREFIX=\"$(TARGET_DIR)\", \
+ $(BUSYBOX_DIR)/.config ;
+ $(SED) s,CROSS_COMPILER_PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \
+ $(BUSYBOX_DIR)/.config ;
+ $(SED) s,PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \
+ $(BUSYBOX_DIR)/.config ;
+endif
ifeq ($(BR2_LARGEFILE),y)
$(SED) "s/^.*CONFIG_LFS.*/CONFIG_LFS=y/;" $(BUSYBOX_DIR)/.config
else
$(SED) "s/^.*CONFIG_LFS.*/CONFIG_LFS=n/;" $(BUSYBOX_DIR)/.config
$(SED) "s/^.*FDISK_SUPPORT_LARGE_DISKS.*/FDISK_SUPPORT_LARGE_DISKS=n/;" $(BUSYBOX_DIR)/.config
endif
- yes "" | $(MAKE) CC=$(TARGET_CC) CROSS="$(TARGET_CROSS)" -C $(BUSYBOX_DIR) oldconfig
- touch $(BUSYBOX_DIR)/.configured
+ yes "" | $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
+ CROSS="$(TARGET_CROSS)" -C $(BUSYBOX_DIR) oldconfig
+ touch $@
+$(BUSYBOX_DIR)-initrd/.configured: $(BUSYBOX_DIR)-initrd/.unpacked $(BUSYBOX_INITRD_CONFIG_FILE)
+ cp -f $(BUSYBOX_INITRD_CONFIG_FILE) $(BUSYBOX_DIR)-initrd/.config
+ $(SED) s,CONFIG_PREFIX=.*,CONFIG_PREFIX=\"$(INITRD_DIR)\", \
+ $(BUSYBOX_DIR)-initrd/.config ;
+ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y)
+ $(SED) s,CONFIG_PREFIX=.*,CONFIG_PREFIX=\"$(INITRD_DIR)\", \
+ $(BUSYBOX_DIR)-initrd/.config ;
+ $(SED) s,CROSS_COMPILER_PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \
+ $(BUSYBOX_DIR)-initrd/.config ;
+ $(SED) s,PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \
+ $(BUSYBOX_DIR)-initrd/.config ;
+endif
+ifeq ($(BR2_LARGEFILE),y)
+ $(SED) "s/^.*CONFIG_LFS.*/CONFIG_LFS=y/;" $(BUSYBOX_DIR)-initrd/.config
+else
+ $(SED) "s/^.*CONFIG_LFS.*/CONFIG_LFS=n/;" $(BUSYBOX_DIR)-initrd/.config
+ $(SED) "s/^.*FDISK_SUPPORT_LARGE_DISKS.*/FDISK_SUPPORT_LARGE_DISKS=n/;" $(BUSYBOX_DIR)-initrd/.config
+endif
+ yes "" | $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
+ CROSS="$(TARGET_CROSS)" -C $(BUSYBOX_DIR)-initrd oldconfig
+ touch $@
+
$(BUSYBOX_DIR)/busybox: $(BUSYBOX_DIR)/.configured
- $(MAKE) CC=$(TARGET_CC) CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
+ $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
+ CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
+ ARCH=$(LINUX_KARCH) \
EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_DIR)
+ifeq ($(BR2_PREFER_IMA)$(BR2_PACKAGE_BUSYBOX_SNAPSHOT),yy)
+ rm -f $@
+ $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
+ CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
+ ARCH=$(LINUX_KARCH) STRIP="$(STRIP)" \
+ EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_DIR) \
+ -f scripts/Makefile.IMA
+endif
+$(BUSYBOX_DIR)-initrd/busybox: $(BUSYBOX_DIR)-initrd/.configured
+ $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
+ CROSS="$(TARGET_CROSS)" PREFIX="$(INITRD_DIR)" \
+ ARCH=$(LINUX_KARCH) \
+ EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_DIR)-initrd
+ifeq ($(BR2_PREFER_IMA)$(BR2_PACKAGE_BUSYBOX_SNAPSHOT),yy)
+ rm -f $@
+ $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
+ CROSS="$(TARGET_CROSS)" PREFIX="$(INITRD_DIR)" \
+ ARCH=$(LINUX_KARCH) STRIP="$(STRIP)" \
+ EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_DIR)-initrd \
+ -f scripts/Makefile.IMA
+endif
+
$(TARGET_DIR)/bin/busybox: $(BUSYBOX_DIR)/busybox
ifeq ($(BR2_PACKAGE_BUSYBOX_INSTALL_SYMLINKS),y)
- $(MAKE) CC=$(TARGET_CC) CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
+ $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
+ CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
+ ARCH=$(LINUX_KARCH) \
EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_DIR) install
else
install -D -m 0755 $(BUSYBOX_DIR)/busybox $(TARGET_DIR)/bin/busybox
endif
# Just in case
- -chmod a+x $(TARGET_DIR)/usr/share/udhcpc/default.script
-rm $(TARGET_DIR)/linuxrc
+ ln -sf ../usr/sbin/astwrap $(TARGET_DIR)/bin/addgroup
+ ln -sf ../usr/sbin/astwrap $(TARGET_DIR)/bin/adduser
+ ln -sf ../usr/sbin/astwrap $(TARGET_DIR)/bin/delgroup
+ ln -sf ../usr/sbin/astwrap $(TARGET_DIR)/bin/deluser
+ ln -sf ../sbin/astwrap $(TARGET_DIR)/usr/bin/passwd
+$(INITRD_DIR)/bin/busybox: $(BUSYBOX_DIR)-initrd/busybox
+ $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
+ CROSS="$(TARGET_CROSS)" PREFIX="$(INITRD_DIR)" \
+ ARCH=$(LINUX_KARCH) \
+ EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_DIR)-initrd install
+ -rm $(INITRD_DIR)/linuxrc
+ cp -a target/initrd/target_skeleton/linuxrc $(INITRD_DIR)/linuxrc
+
busybox: uclibc $(TARGET_DIR)/bin/busybox
+busybox-initrd: uclibc $(INITRD_DIR)/bin/busybox
+
+busybox-menuconfig: busybox-source $(BUSYBOX_DIR)/.configured
+ $(MAKE) __TARGET_ARCH=$(ARCH) -C $(BUSYBOX_DIR) menuconfig
+ cp -f $(BUSYBOX_DIR)/.config $(BUSYBOX_CONFIG_FILE)
+
busybox-clean:
rm -f $(TARGET_DIR)/bin/busybox
-$(MAKE) -C $(BUSYBOX_DIR) clean
@@ -76,6 +174,11 @@
# Toplevel Makefile options
#
#############################################################
+ifeq ($(strip $(BR2_INITRD_ROOTFS_EXT2)),y)
+TARGETS+=busybox-initrd
+endif
+
ifeq ($(strip $(BR2_PACKAGE_BUSYBOX)),y)
TARGETS+=busybox
endif
+
Modified: trunk/package/dhcp/dhcp.mk
===================================================================
--- trunk/package/dhcp/dhcp.mk 2007-04-27 18:58:37 UTC (rev 46)
+++ trunk/package/dhcp/dhcp.mk 2007-04-27 19:12:05 UTC (rev 47)
@@ -3,7 +3,7 @@
# dhcp
#
#############################################################
-DHCP_VER:=3.0.4
+DHCP_VER:=3.0.5
DHCP_SOURCE:=dhcp-$(DHCP_VER).tar.gz
DHCP_SITE:=ftp://ftp.isc.org/isc/dhcp
DHCP_CAT:=zcat
@@ -14,15 +14,19 @@
DHCP_SERVER_TARGET_BINARY:=usr/sbin/dhcpd
DHCP_RELAY_TARGET_BINARY:=usr/sbin/dhcrelay
DHCP_CLIENT_TARGET_BINARY:=usr/sbin/dhclient
-BVARS=PREDEFINES='-D_PATH_DHCPD_DB=\"/var/state/dhcp/dhcpd.leases\" \
+BVARS=PREDEFINES='-D_PATH_DHCPD_DB=\"/var/lib/dhcp/dhcpd.leases\" \
-D_PATH_DHCLIENT_DB=\"/var/lib/dhcp/dhclient.leases\"' \
- VARDB=/var/state/dhcp
+ VARDB=/var/lib/dhcp
$(DL_DIR)/$(DHCP_SOURCE):
$(WGET) -P $(DL_DIR) $(DHCP_SITE)/$(DHCP_SOURCE)
dhcp-source: $(DL_DIR)/$(DHCP_SOURCE)
+dhcp_server-source: dhcp-source
+dhcp_relay-source: dhcp-source
+dhcp_client-source: dhcp-source
+
$(DHCP_DIR)/.unpacked: $(DL_DIR)/$(DHCP_SOURCE)
$(DHCP_CAT) $(DL_DIR)/$(DHCP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(DHCP_DIR) package/dhcp/ dhcp\*.patch
@@ -37,21 +41,22 @@
$(STRIP) $(DHCP_DIR)/$(DHCP_RELAY_BINARY)
$(TARGET_DIR)/$(DHCP_SERVER_TARGET_BINARY): $(DHCP_DIR)/$(DHCP_RELAY_BINARY)
- # (cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp)
+ (cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp)
$(INSTALL) -m 0755 -D $(DHCP_DIR)/$(DHCP_SERVER_BINARY) $(TARGET_DIR)/$(DHCP_SERVER_TARGET_BINARY)
- $(INSTALL) -m 0755 -D package/dhcp/dhcpd.init $(TARGET_DIR)/etc/init.d/dhcpd
+ $(INSTALL) -m 0755 -D package/dhcp/init-server $(TARGET_DIR)/etc/init.d/S80dhcp-server
+ $(INSTALL) -m 0644 -D package/dhcp/dhcpd.conf $(TARGET_DIR)/etc/dhcp/dhcpd.conf
rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
$(TARGET_DIR)/$(DHCP_RELAY_TARGET_BINARY): $(DHCP_DIR)/$(DHCP_RELAY_BINARY)
- # (cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp)
+ (cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp)
$(INSTALL) -m 0755 -D $(DHCP_DIR)/$(DHCP_RELAY_BINARY) $(TARGET_DIR)/$(DHCP_RELAY_TARGET_BINARY)
- # $(INSTALL) -m 0755 -D package/dhcp/init-relay $(TARGET_DIR)/etc/init.d/S80dhcp-relay # no AstLinux equiv. yet
+ $(INSTALL) -m 0755 -D package/dhcp/init-relay $(TARGET_DIR)/etc/init.d/S80dhcp-relay
rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
$(TARGET_DIR)/$(DHCP_CLIENT_TARGET_BINARY): $(DHCP_DIR)/$(DHCP_RELAY_BINARY)
- # (cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp)
+ (cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp)
$(INSTALL) -m 0755 -D $(DHCP_DIR)/$(DHCP_CLIENT_BINARY) $(TARGET_DIR)/$(DHCP_CLIENT_TARGET_BINARY)
$(INSTALL) -m 0644 -D package/dhcp/dhclient.conf $(TARGET_DIR)/etc/dhcp/dhclient.conf
$(INSTALL) -m 0755 -D package/dhcp/dhclient-script $(TARGET_DIR)/sbin/dhclient-script
Modified: trunk/package/dhcp/dhcp_xecute.patch
===================================================================
--- trunk/package/dhcp/dhcp_xecute.patch 2007-04-27 18:58:37 UTC (rev 46)
+++ trunk/package/dhcp/dhcp_xecute.patch 2007-04-27 19:12:05 UTC (rev 47)
@@ -412,11 +412,11 @@
--- dhcp-3.0.2.orig/includes/dhctoken.h 2004-09-21 13:25:38.000000000 -0600
+++ dhcp-3.0.2/includes/dhctoken.h 2005-02-24 12:33:21.000000000 -0700
@@ -308,7 +308,8 @@
- REFRESH = 612,
DOMAIN_NAME = 613,
DO_FORWARD_UPDATE = 614,
-- KNOWN_CLIENTS = 615
-+ KNOWN_CLIENTS = 615,
+ KNOWN_CLIENTS = 615,
+- ATSFP = 616
++ ATSFP = 616,
+ EXECUTE = 616
};
Modified: trunk/package/dnsmasq/dnsmasq.init
===================================================================
--- trunk/package/dnsmasq/dnsmasq.init 2007-04-27 18:58:37 UTC (rev 46)
+++ trunk/package/dnsmasq/dnsmasq.init 2007-04-27 19:12:05 UTC (rev 47)
@@ -30,6 +30,15 @@
LAN3IPBASE=`echo $INT3IP | cut -d. -f1-3`
fi
+if [ "$LOCALDNS" ]
+then
+RCONF="/tmp/etc/resolv-up.conf"
+echo "search $DOMAIN
+nameserver 127.0.0.1" > /tmp/etc/resolv.conf
+else
+RCONF="/tmp/etc/resolv.conf"
+fi
+
echo "domain-needed
bogus-priv
local=/$DOMAIN/
@@ -45,6 +54,7 @@
dhcp-option=lan,150,$INTIP
# dhcp-lease-max=153
+resolv-file=$RCONF
dhcp-leasefile=/var/db/dnsmasq.leases
cache-size=150" > /tmp/etc/dnsmasq.conf
@@ -80,7 +90,15 @@
dhcp-option=lan3,150,$INT3IP" >> /tmp/etc/dnsmasq.conf
fi
+echo "# Create /mnt/kd/dnsmasq.static to specify additional settings." >> /tmp/etc/dnsmasq.conf
+
+# read static mappings from a file
+if [ -e /mnt/kd/dnsmasq.static ]
+then
+cat /mnt/kd/dnsmasq.static >> /tmp/etc/dnsmasq.conf
fi
+
+fi
}
start () {
Modified: trunk/package/dnsmasq/dnsmasq.mk
===================================================================
--- trunk/package/dnsmasq/dnsmasq.mk 2007-04-27 18:58:37 UTC (rev 46)
+++ trunk/package/dnsmasq/dnsmasq.mk 2007-04-27 19:12:05 UTC (rev 47)
@@ -5,15 +5,9 @@
#############################################################
DNSMASQ_SITE=http://thekelleys.org.uk/dnsmasq
-ifeq ($(filter $(TARGETS),dnsmasq1),)
-DNSMASQ_UPVER=2.22
-DNSMASQ_VER=dnsmasq2
-else
-DNSMASQ_UPVER=1.18
-DNSMASQ_VER=dnsmasq1
-endif
-DNSMASQ_SOURCE=dnsmasq-$(DNSMASQ_UPVER).tar.gz
-DNSMASQ_DIR=$(BUILD_DIR)/dnsmasq-$(DNSMASQ_UPVER)
+DNSMASQ_VER=2.38
+DNSMASQ_SOURCE=dnsmasq-$(DNSMASQ_VER).tar.gz
+DNSMASQ_DIR=$(BUILD_DIR)/dnsmasq-$(DNSMASQ_VER)
DNSMASQ_BINARY=dnsmasq
DNSMASQ_TARGET_BINARY=usr/sbin/dnsmasq
@@ -36,7 +30,7 @@
$(STRIP) $(TARGET_DIR)/$(DNSMASQ_TARGET_BINARY)
$(INSTALL) -D -m 0755 package/dnsmasq/dnsmasq.init $(TARGET_DIR)/etc/init.d/dnsmasq
rm -rf $(TARGET_DIR)/usr/man
- ln -sf /tmp/etc/dnsmasq.conf $(TARGET_DIR)/etc/dnsmasq.conf
+ -ln -s /tmp/etc/dnsmasq.conf $(TARGET_DIR)/etc/dnsmasq.conf
dnsmasq: uclibc $(TARGET_DIR)/$(DNSMASQ_TARGET_BINARY)
Modified: trunk/package/dropbear/dropbear.mk
===================================================================
--- trunk/package/dropbear/dropbear.mk 2007-04-27 18:58:37 UTC (rev 46)
+++ trunk/package/dropbear/dropbear.mk 2007-04-27 19:12:05 UTC (rev 47)
@@ -70,8 +70,8 @@
ln -snf ../sbin/dropbear $(TARGET_DIR)/usr/bin/dbclient
ln -snf ../sbin/dropbear $(TARGET_DIR)/usr/bin/dropbearkey
ln -snf ../sbin/dropbear $(TARGET_DIR)/usr/bin/dropbearconvert
- # cp $(DROPBEAR_DIR)/S50dropbear $(TARGET_DIR)/etc/init.d/
- # chmod a+x $(TARGET_DIR)/etc/init.d/S50dropbear
+ cp $(DROPBEAR_DIR)/S50dropbear $(TARGET_DIR)/etc/init.d/
+ chmod a+x $(TARGET_DIR)/etc/init.d/S50dropbear
dropbear: uclibc zlib $(TARGET_DIR)/$(DROPBEAR_TARGET_BINARY)
Modified: trunk/package/e2fsprogs/e2fsprogs.mk
===================================================================
--- trunk/package/e2fsprogs/e2fsprogs.mk 2007-04-27 18:58:37 UTC (rev 46)
+++ trunk/package/e2fsprogs/e2fsprogs.mk 2007-04-27 19:12:05 UTC (rev 47)
@@ -3,7 +3,7 @@
# e2fsprogs
#
#############################################################
-E2FSPROGS_VER:=1.38
+E2FSPROGS_VER:=1.39
E2FSPROGS_SOURCE=e2fsprogs-$(E2FSPROGS_VER).tar.gz
E2FSPROGS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/e2fsprogs
E2FSPROGS_DIR=$(BUILD_DIR)/e2fsprogs-$(E2FSPROGS_VER)
Modified: trunk/package/fakeroot/Config.in
===================================================================
--- trunk/package/fakeroot/Config.in 2007-04-27 18:58:37 UTC (rev 46)
+++ trunk/package/fakeroot/Config.in 2007-04-27 19:12:05 UTC (rev 47)
@@ -5,3 +5,8 @@
Run commands in an environment faking root privileges.
http://joostje.op.het.net/fakeroot/
+
+# dummy for fakeroot-source
+config BR2_HOST_FAKEROUTE
+ bool
+ default n
Added: trunk/package/fakeroot/fakeroot-doc.patch
===================================================================
--- trunk/package/fakeroot/fakeroot-doc.patch (rev 0)
+++ trunk/package/fakeroot/fakeroot-doc.patch 2007-04-27 19:12:05 UTC (rev 47)
@@ -0,0 +1,20 @@
+--- fakeroot/Makefile.am.orig 2006-04-19 11:50:35.000000000 -0600
++++ fakeroot/Makefile.am 2006-04-19 11:50:59.000000000 -0600
+@@ -1,5 +1,5 @@
+ AUTOMAKE_OPTIONS=foreign
+-SUBDIRS=scripts doc test
++SUBDIRS=scripts test
+
+ noinst_LTLIBRARIES = libcommunicate.la
+ libcommunicate_la_SOURCES = communicate.c
+--- fakeroot/Makefile.in.orig 2006-04-19 11:50:43.000000000 -0600
++++ fakeroot/Makefile.in 2006-04-19 11:51:21.000000000 -0600
+@@ -230,7 +230,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = foreign
+-SUBDIRS = scripts doc test
++SUBDIRS = scripts test
+ noinst_LTLIBRARIES = libcommunicate.la
+ libcommunicate_la_SOURCES = communicate.c
+ lib_LTLIBRARIES = libfakeroot.la
Modified: trunk/package/fakeroot/fakeroot.mk
===================================================================
--- trunk/package/fakeroot/fakeroot.mk 2007-04-27 18:58:37 UTC (rev 46)
+++ trunk/package/fakeroot/fakeroot.mk 2007-04-27 19:12:05 UTC (rev 47)
@@ -3,12 +3,13 @@
# fakeroot
#
#############################################################
-FAKEROOT_VERSION:=1.5.8
+FAKEROOT_VERSION:=1.6.5
FAKEROOT_SOURCE:=fakeroot_$(FAKEROOT_VERSION).tar.gz
FAKEROOT_SITE:=http://ftp.debian.org/debian/pool/main/f/fakeroot
FAKEROOT_CAT:=zcat
-FAKEROOT_DIR1:=$(TOOL_BUILD_DIR)/fakeroot-$(FAKEROOT_VERSION)
-FAKEROOT_DIR2:=$(BUILD_DIR)/fakeroot-$(FAKEROOT_VERSION)
+FAKEROOT_SOURCE_DIR:=$(BUILD_DIR)/fakeroot-$(FAKEROOT_VERSION)
+FAKEROOT_DIR1:=$(TOOL_BUILD_DIR)/fakeroot-$(FAKEROOT_VERSION)-host
+FAKEROOT_DIR2:=$(BUILD_DIR)/fakeroot-$(FAKEROOT_VERSION)-target
$(DL_DIR)/$(FAKEROOT_SOURCE):
@@ -16,34 +17,41 @@
fakeroot-source: $(DL_DIR)/$(FAKEROOT_SOURCE)
+$(FAKEROOT_SOURCE_DIR)/.unpacked: $(DL_DIR)/$(FAKEROOT_SOURCE)
+ $(FAKEROOT_CAT) $(DL_DIR)/$(FAKEROOT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ # If using busybox getopt, make it be quiet.
+ $(SED) "s,getopt --version,getopt --version 2>/dev/null," \
+ $(FAKEROOT_SOURCE_DIR)/scripts/fakeroot.in
+ toolchain/patch-kernel.sh $(FAKEROOT_SOURCE_DIR) package/fakeroot/ \*.patch
+ touch $@
+
#############################################################
#
# build fakeroot for use on the host system
#
#############################################################
-$(FAKEROOT_DIR1)/.unpacked: $(DL_DIR)/$(FAKEROOT_SOURCE)
- $(FAKEROOT_CAT) $(DL_DIR)/$(FAKEROOT_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
- $(SED) "s,getopt --version,getopt --version 2>/dev/null," \
- $(FAKEROOT_DIR1)/scripts/fakeroot.in
- touch $(FAKEROOT_DIR1)/.unpacked
-$(FAKEROOT_DIR1)/.configured: $(FAKEROOT_DIR1)/.unpacked
+$(FAKEROOT_DIR1)/.configured: $(FAKEROOT_SOURCE_DIR)/.unpacked
+ mkdir -p $(FAKEROOT_DIR1)
(cd $(FAKEROOT_DIR1); rm -rf config.cache; \
CC="$(HOSTCC)" \
- ./configure \
+ $(FAKEROOT_SOURCE_DIR)/configure \
--prefix=/usr \
+ $(DISABLE_NLS) \
);
- touch $(FAKEROOT_DIR1)/.configured
+ touch $@
$(FAKEROOT_DIR1)/faked: $(FAKEROOT_DIR1)/.configured
$(MAKE) -C $(FAKEROOT_DIR1)
+ touch -c $@
$(STAGING_DIR)/usr/bin/fakeroot: $(FAKEROOT_DIR1)/faked
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(FAKEROOT_DIR1) install
$(SED) 's,^PREFIX=.*,PREFIX=$(STAGING_DIR)/usr,g' $(STAGING_DIR)/usr/bin/fakeroot
$(SED) 's,^BINDIR=.*,BINDIR=$(STAGING_DIR)/usr/bin,g' $(STAGING_DIR)/usr/bin/fakeroot
$(SED) 's,^PATHS=.*,PATHS=$(FAKEROOT_DIR1)/.libs:/lib:/usr/lib,g' $(STAGING_DIR)/usr/bin/fakeroot
+ touch -c $@
host-fakeroot: uclibc $(STAGING_DIR)/usr/bin/fakeroot
@@ -59,17 +67,14 @@
# build fakeroot for use on the target system
#
#############################################################
-$(FAKEROOT_DIR2)/.unpacked: $(DL_DIR)/$(FAKEROOT_SOURCE)
- $(FAKEROOT_CAT) $(DL_DIR)/$(FAKEROOT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- # If using busybox getopt, make it be quiet.
- $(SED) "s,getopt --version,getopt --version 2>/dev/null," \
- $(FAKEROOT_DIR2)/scripts/fakeroot.in
- touch $(FAKEROOT_DIR2)/.unpacked
-$(FAKEROOT_DIR2)/.configured: $(FAKEROOT_DIR2)/.unpacked
+$(FAKEROOT_DIR2)/.configured: $(FAKEROOT_SOURCE_DIR)/.unpacked
+ mkdir -p $(FAKEROOT_DIR2)
(cd $(FAKEROOT_DIR2); rm -rf config.cache; \
$(TARGET_CONFIGURE_OPTS) \
- ./configure \
+ CFLAGS="$(TARGET_CFLAGS)" \
+ LDFLAGS="$(TARGET_LDFLAGS)" \
+ $(FAKEROOT_SOURCE_DIR)/configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
@@ -85,10 +90,11 @@
--infodir=/usr/info \
$(DISABLE_NLS) \
);
- touch $(FAKEROOT_DIR2)/.configured
+ touch $@
$(FAKEROOT_DIR2)/faked: $(FAKEROOT_DIR2)/.configured
$(MAKE) CC=$(TARGET_CC) -C $(FAKEROOT_DIR2)
+ touch -c $@
$(TARGET_DIR)/usr/bin/fakeroot: $(FAKEROOT_DIR2)/faked
$(MAKE) DESTDIR=$(TARGET_DIR) -C $(FAKEROOT_DIR2) install
@@ -96,11 +102,13 @@
-mv $(TARGET_DIR)/usr/bin/$(ARCH)-linux-fakeroot $(TARGET_DIR)/usr/bin/fakeroot
rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
+ touch -c $@
fakeroot: uclibc $(TARGET_DIR)/usr/bin/fakeroot
fakeroot-clean:
$(MAKE) -C $(FAKEROOT_DIR2) clean
+ rm -f $(TARGET_DIR)/usr/bin/fake{d,root}
fakeroot-dirclean:
rm -rf $(FAKEROOT_DIR2)
@@ -114,3 +122,7 @@
ifeq ($(strip $(BR2_PACKAGE_FAKEROOT)),y)
TARGETS+=fakeroot
endif
+
+ifeq ($(strip $(BR2_HOST_FAKEROUTE)),y)
+HOST_SOURCE+=fakeroot-source
+endif
Modified: trunk/package/file/file.mk
===================================================================
--- trunk/package/file/file.mk 2007-04-27 18:58:37 UTC (rev 46)
+++ trunk/package/file/file.mk 2007-04-27 19:12:05 UTC (rev 47)
@@ -3,11 +3,12 @@
# file
#
#############################################################
-FILE_VER:=4.15
+FILE_VER:=4.19
FILE_SOURCE:=file-$(FILE_VER).tar.gz
FILE_SITE:=ftp://ftp.astron.com/pub/file
-FILE_DIR1:=$(TOOL_BUILD_DIR)/file-$(FILE_VER)
-FILE_DIR2:=$(BUILD_DIR)/file-$(FILE_VER)
+FILE_SOURCE_DIR:=$(BUILD_DIR)/file-$(FILE_VER)
+FILE_DIR1:=$(TOOL_BUILD_DIR)/file-$(FILE_VER)-host
+FILE_DIR2:=$(BUILD_DIR)/file-$(FILE_VER)-target
FILE_CAT:=zcat
FILE_BINARY:=src/file
FILE_TARGET_BINARY:=usr/bin/file
@@ -23,13 +24,11 @@
# build file for use on the host system
#
#############################################################
-$(FILE_DIR1)/.unpacked: $(DL_DIR)/$(FILE_SOURCE)
- $(FILE_CAT) $(DL_DIR)/$(FILE_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
- touch $(FILE_DIR1)/.unpacked
-
-$(FILE_DIR1)/.configured: $(FILE_DIR1)/.unpacked
+$(FILE_DIR1)/.configured: $(FILE_SOURCE_DIR)/.unpacked
+ mkdir -p $(FILE_DIR1)
(cd $(FILE_DIR1); rm -rf config.cache; \
- ./configure \
+ CC="$(HOSTCC)" \
+ $(FILE_SOURCE_DIR)/configure \
--prefix=$(FILE_DIR1)/install \
);
touch $(FILE_DIR1)/.configured
@@ -51,16 +50,20 @@
# build file for use on the target system
#
#############################################################
-$(FILE_DIR2)/.unpacked: $(DL_DIR)/$(FILE_SOURCE)
+file-unpacked: $(FILE_SOURCE_DIR)/.unpacked
+$(FILE_SOURCE_DIR)/.unpacked: $(DL_DIR)/$(FILE_SOURCE)
$(FILE_CAT) $(DL_DIR)/$(FILE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(FILE_DIR2) package/file/ file\*.patch
- touch $(FILE_DIR2)/.unpacked
+ toolchain/patch-kernel.sh $(FILE_SOURCE_DIR) package/file/ file\*.patch
+ $(CONFIG_UPDATE) $(FILE_SOURCE_DIR)
+ touch $(FILE_SOURCE_DIR)/.unpacked
-$(FILE_DIR2)/.configured: $(FILE_DIR2)/.unpacked
+$(FILE_DIR2)/.configured: $(FILE_SOURCE_DIR)/.unpacked
+ mkdir -p $(FILE_DIR2)
(cd $(FILE_DIR2); rm -rf config.cache; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
- ./configure \
+ LDFLAGS="$(TARGET_LDFLAGS)" \
+ $(FILE_SOURCE_DIR)/configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
@@ -68,6 +71,7 @@
--exec-prefix=/usr \
--bindir=/usr/bin \
--sbindir=/usr/sbin \
+ --libdir=/lib \
--libexecdir=/usr/lib \
--sysconfdir=/etc \
--datadir=/usr/share/misc \
@@ -82,13 +86,16 @@
touch $(FILE_DIR2)/.configured
$(FILE_DIR2)/$(FILE_BINARY): $(FILE_DIR2)/.configured $(TOOL_BUILD_DIR)/bin/file
- $(MAKE) $(TARGET_CONFIGURE_OPTS) LDFLAGS="-static" -C $(FILE_DIR2)
+ $(MAKE) $(TARGET_CONFIGURE_OPTS) LDFLAGS="$(TARGET_LDFLAGS) -static" -C $(FILE_DIR2)
$(TARGET_DIR)/$(FILE_TARGET_BINARY): $(FILE_DIR2)/$(FILE_BINARY)
- $(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) -C $(FILE_DIR2) install
+ $(MAKE) $(TARGET_CONFIGURE_OPTS) LDFLAGS="$(TARGET_LDFLAGS)" DESTDIR=$(TARGET_DIR) -C $(FILE_DIR2) install
-($(STRIP) $(TARGET_DIR)/usr/lib/libmagic.so.*.* > /dev/null 2>&1)
rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
+ mv $(TARGET_DIR)/lib/libmagic.a $(STAGING_DIR)/lib
+ rm -f $(TARGET_DIR)/lib/libmagic.la
+ mv $(TARGET_DIR)/usr/include/magic.h $(STAGING_DIR)/include
file: zlib uclibc $(TARGET_DIR)/$(FILE_TARGET_BINARY)
Added: trunk/package/hotplug/diethotplug-0.5.tar
===================================================================
(Binary files differ)
Property changes on: trunk/package/hotplug/diethotplug-0.5.tar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/package/hotplug/hotplug.mk
===================================================================
--- trunk/package/hotplug/hotplug.mk 2007-04-27 18:58...
[truncated message content] |
