Author: richard
Date: Mon Apr 20 12:37:05 2009
New Revision: 5380
URL: http://svn.slimdevices.com/jive?rev=5380&view=rev
Log:
r5...@harrypotter (orig r5376): richard | 2009-04-20 20:18:21 +0100
Bug: 8984
Description:
Fix dhcp problem with Microsoft router.
Added:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.13.3/busybox_udhcpd_hostname_nak.patch
Modified:
7.4/trunk/ (props changed)
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox_1.13.3.bb
Propchange: 7.4/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Mon Apr 20 12:37:05 2009
@@ -3,7 +3,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2920
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/private-branches/jive-refresh:3653
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:5339
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:5376
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Added:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.13.3/busybox_udhcpd_hostname_nak.patch
URL:
http://svn.slimdevices.com/jive/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.13.3/busybox_udhcpd_hostname_nak.patch?rev=5380&view=auto
==============================================================================
---
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.13.3/busybox_udhcpd_hostname_nak.patch
(added)
+++
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.13.3/busybox_udhcpd_hostname_nak.patch
Mon Apr 20 12:37:05 2009
@@ -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
+@@ -605,6 +605,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 */
Modified:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox_1.13.3.bb
URL:
http://svn.slimdevices.com/jive/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox_1.13.3.bb?rev=5380&r1=5379&r2=5380&view=diff
==============================================================================
--- 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox_1.13.3.bb
(original)
+++ 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox_1.13.3.bb
Mon Apr 20 12:37:05 2009
@@ -1,9 +1,10 @@
require busybox.inc
-PR = "r0"
+PR = "r1"
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
file://busybox_udhcpd_syslog.patch;patch=1 \
file://busybox_ifupdown_hostname.patch;patch=1 \
+ file://busybox_udhcpd_hostname_nak.patch;patch=1 \
file://defconfig"
S = "${WORKDIR}/busybox-${PV}"
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
