Author: fmueller
Date: Mon Jul 26 03:26:12 2010
New Revision: 8989
URL: http://svn.slimdevices.com/jive?rev=8989&view=rev
Log:
Bug: n/a
Description: Update busybox to 1.16.2 (was 1.15.2)
Added:
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.16.2/
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.16.2/busybox_ifupdown_hostname.patch
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.16.2/busybox_syslogd.patch
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.16.2/busybox_udhcpd_hostname_nak.patch
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.16.2/busybox_udhcpd_syslog.patch
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.16.2/busybox_udhcpd_write_pid_after_signal_pipe.patch
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox_1.16.2.bb
Modified:
7.6/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/files/defconfig
Modified: 7.6/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf?rev=8989&r1=8988&r2=8989&view=diff
==============================================================================
--- 7.6/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
(original)
+++ 7.6/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf Mon Jul
26 03:26:12 2010
@@ -88,7 +88,7 @@
PREFERRED_PROVIDER_baby-msp430 ?= "baby-msp430-bin"
-PREFERRED_VERSION_busybox ?= "1.15.2"
+PREFERRED_VERSION_busybox ?= "1.16.2"
PREFERRED_VERSION_qemu-native ?= "0.9.1"
PREFERRED_VERSION_freetype ?= "2.1.10"
PREFERRED_VERSION_oprofile ?= "0.9.6"
Added:
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.16.2/busybox_ifupdown_hostname.patch
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.16.2/busybox_ifupdown_hostname.patch?rev=8989&view=auto
==============================================================================
---
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.16.2/busybox_ifupdown_hostname.patch
(added)
+++
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.16.2/busybox_ifupdown_hostname.patch
Mon Jul 26 03:26:12 2010
@@ -1,0 +1,20 @@
+Index: busybox_1_7_stable/networking/ifupdown.c
+===================================================================
+--- busybox_1_7_stable/networking/ifupdown.c (revision 2550)
++++ busybox_1_7_stable/networking/ifupdown.c (revision 2551)
+@@ -151,6 +151,15 @@
+ return ifd->option[i].value;
+ }
+ }
++
++ /* gethostname if it is not in the interface definition */
++ if (strncmpz(id, "hostname", idlen) == 0) {
++ static char hostname[HOST_NAME_MAX + 1];
++ if (gethostname(hostname, HOST_NAME_MAX) == 0) {
++ return hostname;
++ }
++ }
++
+ return NULL;
+ }
+
Added:
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.16.2/busybox_syslogd.patch
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.16.2/busybox_syslogd.patch?rev=8989&view=auto
==============================================================================
---
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.16.2/busybox_syslogd.patch
(added)
+++
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.16.2/busybox_syslogd.patch
Mon Jul 26 03:26:12 2010
@@ -1,0 +1,13 @@
+Index: busybox-1.15.2/sysklogd/syslogd.c
+===================================================================
+--- busybox-1.15.2/sysklogd/syslogd.c 2010-02-04 12:14:33.742307876 -0800
++++ busybox-1.15.2/sysklogd/syslogd.c 2010-02-04 12:14:43.398271165 -0800
+@@ -47,7 +47,7 @@
+ #undef SYSLOGD_WRLOCK
+
+ enum {
+- MAX_READ = 256,
++ MAX_READ = 2048,
+ DNS_WAIT_SEC = 2 * 60,
+ };
+
Added:
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.16.2/busybox_udhcpd_hostname_nak.patch
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.16.2/busybox_udhcpd_hostname_nak.patch?rev=8989&view=auto
==============================================================================
---
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.16.2/busybox_udhcpd_hostname_nak.patch
(added)
+++
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.16.2/busybox_udhcpd_hostname_nak.patch
Mon Jul 26 03:26:12 2010
@@ -1,0 +1,19 @@
+Index: busybox-1.13.3/networking/udhcp/dhcpc.c
+===================================================================
+--- busybox-1.13.3.orig/networking/udhcp/dhcpc.c 2009-04-08
12:35:02.000000000 +0100
++++ busybox-1.13.3/networking/udhcp/dhcpc.c 2009-04-08 12:35:08.000000000
+0100
+@@ -662,6 +662,14 @@
+ timeout = 0;
+ packet_num = 0;
+ already_waited_sec = 0;
++
++/* The Microsoft MN-700 router appears to have a problem with hostnames
++ * larger than 16 characters, and responds with a DHCP NAK. To workaround
++ * this, on a NAK we trucate the hostname is applicable.
++ */
++ if (client_config.hostname &&
client_config.hostname[OPT_LEN] > 16) {
++ client_config.hostname[OPT_LEN] = 16;
++ }
+ }
+ continue;
+ /* case BOUND, RELEASED: - ignore all packets */
Added:
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.16.2/busybox_udhcpd_syslog.patch
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.16.2/busybox_udhcpd_syslog.patch?rev=8989&view=auto
==============================================================================
---
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.16.2/busybox_udhcpd_syslog.patch
(added)
+++
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.16.2/busybox_udhcpd_syslog.patch
Mon Jul 26 03:26:12 2010
@@ -1,0 +1,15 @@
+Index: busybox_1_7_stable/networking/ifupdown.c
+===================================================================
+--- busybox_1_7_stable/networking/ifupdown.c (revision 835)
++++ busybox_1_7_stable/networking/ifupdown.c (revision 836)
+@@ -526,7 +526,8 @@
+ return 0;
+ #endif
+- return execute("udhcpc " UDHCPC_CMD_OPTIONS " -p
/var/run/udhcpc.%iface%.pid "
++ return execute("udhcpc -R -a -p /var/run/udhcpc.%iface%.pid "
++ "-b --syslog "
+ "-i %iface%[[ -H %hostname%]][[ -c %clientid%]][[ -s
%script%]][[ %udhcpc_opts%]]",
+ ifd, exec);
+ }
+ #else
+
Added:
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.16.2/busybox_udhcpd_write_pid_after_signal_pipe.patch
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.16.2/busybox_udhcpd_write_pid_after_signal_pipe.patch?rev=8989&view=auto
==============================================================================
---
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.16.2/busybox_udhcpd_write_pid_after_signal_pipe.patch
(added)
+++
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.16.2/busybox_udhcpd_write_pid_after_signal_pipe.patch
Mon Jul 26 03:26:12 2010
@@ -1,0 +1,22 @@
+--- busybox-1.13.4/networking/udhcp/dhcpc.c.orig 2009-08-28
15:50:57.000000000 +0200
++++ busybox-1.13.4/networking/udhcp/dhcpc.c 2009-08-28 15:51:33.000000000
+0200
+@@ -287,9 +287,6 @@ int udhcpc_main(int argc UNUSED_PARAM, c
+ /* Equivalent of doing a fflush after every \n */
+ setlinebuf(stdout);
+
+- /* Create pidfile */
+- write_pidfile(client_config.pidfile);
+-
+ /* Goes to stdout (unless NOMMU) and possibly syslog */
+ bb_info_msg("%s (v"BB_VER") started", applet_name);
+
+@@ -306,6 +303,9 @@ int udhcpc_main(int argc UNUSED_PARAM, c
+ /* setup the signal pipe */
+ udhcp_sp_setup();
+
++ /* Create pidfile */
++ write_pidfile(client_config.pidfile);
++
+ state = INIT_SELECTING;
+ udhcp_run_script(NULL, "deconfig");
+ change_listen_mode(LISTEN_RAW);
Added:
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox_1.16.2.bb
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox_1.16.2.bb?rev=8989&view=auto
==============================================================================
--- 7.6/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox_1.16.2.bb
(added)
+++ 7.6/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox_1.16.2.bb
Mon Jul 26 03:26:12 2010
@@ -1,0 +1,19 @@
+require busybox.inc
+PR = "r8"
+
+SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2 \
+ file://busybox_udhcpd_syslog.patch;patch=1 \
+ file://busybox_ifupdown_hostname.patch;patch=1 \
+ file://busybox_udhcpd_hostname_nak.patch;patch=1 \
+ file://busybox_udhcpd_write_pid_after_signal_pipe.patch;patch=1 \
+ file://busybox_syslogd.patch;patch=1 \
+ file://defconfig"
+
+S = "${WORKDIR}/busybox-${PV}"
+
+EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}"
+
+do_configure () {
+ install -m 0644 ${WORKDIR}/defconfig ${S}/.config
+ cml1_do_configure
+}
Modified:
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/files/defconfig
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/files/defconfig?rev=8989&r1=8988&r2=8989&view=diff
==============================================================================
--- 7.6/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/files/defconfig
(original)
+++ 7.6/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/files/defconfig
Mon Jul 26 03:26:12 2010
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Busybox version: 1.15.2
-# Mon Oct 26 16:17:20 2009
+# Busybox version: 1.16.2
+# Wed Jul 7 09:10:20 2010
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -14,6 +14,8 @@
#
# CONFIG_DESKTOP is not set
# CONFIG_EXTRA_COMPAT is not set
+CONFIG_INCLUDE_SUSv2=y
+# CONFIG_USE_PORTABLE_CODE is not set
CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
@@ -59,7 +61,6 @@
CONFIG_NO_DEBUG_LIB=y
# CONFIG_DMALLOC is not set
# CONFIG_EFENCE is not set
-CONFIG_INCLUDE_SUSv2=y
#
# Installation Options
@@ -120,6 +121,7 @@
# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
CONFIG_GUNZIP=y
CONFIG_GZIP=y
+# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set
# CONFIG_LZOP is not set
# CONFIG_LZOP_COMPR_HIGH is not set
# CONFIG_RPM2CPIO is not set
@@ -133,6 +135,7 @@
CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
# CONFIG_FEATURE_TAR_UNAME_GNAME is not set
+# CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set
# CONFIG_UNCOMPRESS is not set
# CONFIG_UNLZMA is not set
# CONFIG_FEATURE_LZMA_FAST is not set
@@ -148,15 +151,19 @@
CONFIG_CHGRP=y
CONFIG_CHMOD=y
CONFIG_CHOWN=y
+# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set
CONFIG_CHROOT=y
# CONFIG_CKSUM is not set
# CONFIG_COMM is not set
CONFIG_CP=y
+# CONFIG_FEATURE_CP_LONG_OPTIONS is not set
CONFIG_CUT=y
CONFIG_DATE=y
CONFIG_FEATURE_DATE_ISOFMT=y
+CONFIG_FEATURE_DATE_COMPAT=y
CONFIG_DD=y
CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
+# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
CONFIG_FEATURE_DD_IBS_OBS=y
CONFIG_DF=y
# CONFIG_FEATURE_DF_FANCY is not set
@@ -271,7 +278,7 @@
CONFIG_FEATURE_HUMAN_READABLE=y
#
-# Common options for md5sum, sha1sum
+# Common options for md5sum, sha1sum, sha256sum, sha512sum
#
CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
@@ -318,9 +325,8 @@
CONFIG_FEATURE_AWK_LIBM=y
# CONFIG_CMP is not set
CONFIG_DIFF=y
-CONFIG_FEATURE_DIFF_BINARY=y
+# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
CONFIG_FEATURE_DIFF_DIR=y
-CONFIG_FEATURE_DIFF_MINIMAL=y
# CONFIG_ED is not set
# CONFIG_PATCH is not set
CONFIG_SED=y
@@ -364,6 +370,7 @@
CONFIG_FEATURE_FIND_PATH=y
CONFIG_FEATURE_FIND_REGEX=y
# CONFIG_FEATURE_FIND_CONTEXT is not set
+# CONFIG_FEATURE_FIND_LINKS is not set
CONFIG_GREP=y
CONFIG_FEATURE_GREP_EGREP_ALIAS=y
CONFIG_FEATURE_GREP_FGREP_ALIAS=y
@@ -453,6 +460,7 @@
# Options common to multiple modutils
#
CONFIG_FEATURE_2_4_MODULES=y
+# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
CONFIG_FEATURE_INSMOD_VERSION_CHECKING=y
CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y
CONFIG_FEATURE_INSMOD_LOADINKMEM=y
@@ -488,8 +496,10 @@
# CONFIG_FINDFS is not set
CONFIG_FREERAMDISK=y
# CONFIG_FSCK_MINIX is not set
+# CONFIG_MKFS_EXT2 is not set
# CONFIG_MKFS_MINIX is not set
# CONFIG_FEATURE_MINIX2 is not set
+# CONFIG_MKFS_REISER is not set
# CONFIG_MKFS_VFAT is not set
CONFIG_GETOPT=y
CONFIG_FEATURE_GETOPT_LONG=y
@@ -502,6 +512,8 @@
# CONFIG_IPCRM is not set
# CONFIG_IPCS is not set
CONFIG_LOSETUP=y
+# CONFIG_LSPCI is not set
+# CONFIG_LSUSB is not set
# CONFIG_MDEV is not set
# CONFIG_FEATURE_MDEV_CONF is not set
# CONFIG_FEATURE_MDEV_RENAME is not set
@@ -514,6 +526,7 @@
CONFIG_FEATURE_USE_TERMIOS=y
CONFIG_VOLUMEID=y
CONFIG_FEATURE_VOLUMEID_EXT=y
+# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
CONFIG_FEATURE_VOLUMEID_FAT=y
# CONFIG_FEATURE_VOLUMEID_HFS is not set
@@ -591,6 +604,7 @@
# CONFIG_EJECT is not set
# CONFIG_FEATURE_EJECT_SCSI is not set
# CONFIG_FBSPLASH is not set
+# CONFIG_FLASHCP is not set
# CONFIG_FLASH_LOCK is not set
# CONFIG_FLASH_UNLOCK is not set
# CONFIG_FLASH_ERASEALL is not set
@@ -634,6 +648,7 @@
# CONFIG_TIMEOUT is not set
CONFIG_TTYSIZE=y
# CONFIG_VOLNAME is not set
+# CONFIG_WALL is not set
# CONFIG_WATCHDOG is not set
#
@@ -653,6 +668,7 @@
# CONFIG_FAKEIDENTD is not set
# CONFIG_FTPD is not set
# CONFIG_FEATURE_FTP_WRITE is not set
+# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set
# CONFIG_FTPGET is not set
# CONFIG_FTPPUT is not set
# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
@@ -718,6 +734,8 @@
CONFIG_FEATURE_NETSTAT_WIDE=y
# CONFIG_FEATURE_NETSTAT_PRG is not set
CONFIG_NSLOOKUP=y
+# CONFIG_NTPD is not set
+# CONFIG_FEATURE_NTPD_SERVER is not set
CONFIG_PING=y
# CONFIG_PING6 is not set
CONFIG_FEATURE_FANCY_PING=y
@@ -729,22 +747,25 @@
# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
# CONFIG_TELNETD is not set
# CONFIG_FEATURE_TELNETD_STANDALONE is not set
+# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
CONFIG_TFTP=y
# CONFIG_TFTPD is not set
CONFIG_FEATURE_TFTP_GET=y
CONFIG_FEATURE_TFTP_PUT=y
CONFIG_FEATURE_TFTP_BLOCKSIZE=y
+# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
# CONFIG_TFTP_DEBUG is not set
CONFIG_TRACEROUTE=y
+# CONFIG_TRACEROUTE6 is not set
# 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_DHCPRELAY is not set
-# CONFIG_APP_DUMPLEASES is not set
+# CONFIG_UDHCPD is not set
+# CONFIG_DHCPRELAY is not set
+# CONFIG_DUMPLEASES is not set
# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
CONFIG_DHCPD_LEASES_FILE=""
-CONFIG_APP_UDHCPC=y
+CONFIG_UDHCPC=y
CONFIG_FEATURE_UDHCPC_ARPING=y
# CONFIG_FEATURE_UDHCP_PORT is not set
CONFIG_UDHCP_DEBUG=0
@@ -809,6 +830,7 @@
# CONFIG_FEATURE_TOP_DECIMALS is not set
# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
# CONFIG_FEATURE_TOPMEM is not set
+# CONFIG_FEATURE_SHOW_THREADS is not set
CONFIG_UPTIME=y
CONFIG_WATCH=y
@@ -851,8 +873,6 @@
CONFIG_ASH=y
CONFIG_ASH_BASH_COMPAT=y
CONFIG_ASH_JOB_CONTROL=y
-CONFIG_ASH_READ_NCHARS=y
-CONFIG_ASH_READ_TIMEOUT=y
# CONFIG_ASH_ALIAS is not set
# CONFIG_ASH_GETOPTS is not set
CONFIG_ASH_BUILTIN_ECHO=y
@@ -875,6 +895,7 @@
# CONFIG_HUSH_FUNCTIONS is not set
# CONFIG_HUSH_LOCAL is not set
# CONFIG_HUSH_EXPORT_N is not set
+# CONFIG_HUSH_RANDOM_SUPPORT is not set
# CONFIG_LASH is not set
CONFIG_MSH=y
CONFIG_SH_MATH_SUPPORT=y
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
