summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/dhcp/dhcp/remove-dhclient-script-bash-dependency.patch
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2017-08-16 04:31:17 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-18 10:40:26 +0100
commita02826add027f71d1fca56547b2b72db28b1005f (patch)
treef42f5c26ea1ee6f5c67a79e08184df197bb4db71 /meta/recipes-connectivity/dhcp/dhcp/remove-dhclient-script-bash-dependency.patch
parent5552c856a7dc05cb9ef5da8c0cdac63bbef4e8de (diff)
downloadpoky-a02826add027f71d1fca56547b2b72db28b1005f.tar.gz
dhcp: 4.3.5 -> 4.3.6
1. Rebase patches to 4.3.6 - define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch -> 0001 - dhcp-3.0.3-dhclient-dbus.patch -> 0002 - link-with-lcrypto.patch -> 0003 - fixsepbuild.patch -> 0004 - dhclient-script-drop-resolv.conf.dhclient.patch -> 0005 - 0001-site.h-enable-gentle-shutdown.patch -> 0006 - libxml2-configure-argument.patch -> 0007 - tweak-to-support-external-bind.patch -> 0008 - remove-dhclient-script-bash-dependency.patch -> 0009 - build-shared-libs.patch -> 0010 - Moved-the-call-to-isc_app_ctxstart-to-not-get-signal.patch -> 0011 2. Drop search-for-libxml2.patch It is overrided by libxml2-configure-argument.patch 3. Rework dhclient-script-drop-resolv.conf.dhclient.patch and Drop replace-ifconfig-route.patch. vim client/scripts/linux ... Script refresh in 2017. The aliasing code was too convoluted and needs to go away. Migrated DHCPv4 script to ip command from iproute2 suite. This is based on Debian script with some tweaks. ifconfig is no longer used. Everything is done using ip tool from ip-route2. ... (From OE-Core rev: 77878d2e6e8f36afa9a0fde8a6f0f955c84a5e5c) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/dhcp/dhcp/remove-dhclient-script-bash-dependency.patch')
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/remove-dhclient-script-bash-dependency.patch55
1 files changed, 0 insertions, 55 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp/remove-dhclient-script-bash-dependency.patch b/meta/recipes-connectivity/dhcp/dhcp/remove-dhclient-script-bash-dependency.patch
deleted file mode 100644
index 997b9f6ba9..0000000000
--- a/meta/recipes-connectivity/dhcp/dhcp/remove-dhclient-script-bash-dependency.patch
+++ /dev/null
@@ -1,55 +0,0 @@
1From 8aed2a9ff09cb0d584ad0a7340fe3a596879d9b1 Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com>
3Date: Thu, 21 Jul 2016 19:07:02 -0700
4Subject: [PATCH] remove dhclient-script bash dependency
5
6Take the dash compatible IPv6 link-local address test from the Debian
7version of dhclient-script.
8
9Note that although "echo -e" in the OE version of dhclient-script is
10technically bash specific too, it is supported by Busybox echo when
11Busybox is configured with CONFIG_FEATURE_FANCY_ECHO enabled (which
12is the default in the OE Busybox defconfig) therefore leave as-is.
13
14Upstream-Status: Inappropriate [OE specific]
15
16Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
17---
18 client/scripts/linux | 7 +++----
19 1 file changed, 3 insertions(+), 4 deletions(-)
20
21diff --git a/client/scripts/linux b/client/scripts/linux
22index 232a0aa..1383f46 100755
23--- a/client/scripts/linux
24+++ b/client/scripts/linux
25@@ -1,4 +1,4 @@
26-#!/bin/bash
27+#!/bin/sh
28 # dhclient-script for Linux. Dan Halbert, March, 1997.
29 # Updated for Linux 2.[12] by Brian J. Murrell, January 1999.
30 # No guarantees about this. I'm a novice at the details of Linux
31@@ -47,11 +47,11 @@ make_resolv_conf() {
32 if [ "x${new_dhcp6_domain_search}" != x ] ; then
33 resolv_conf="search ${new_dhcp6_domain_search}\n"
34 fi
35- shopt -s nocasematch
36 for nameserver in ${new_dhcp6_name_servers} ; do
37 # If the nameserver has a link-local address
38 # add a <zone_id> (interface name) to it.
39- if [[ "$nameserver" =~ ^fe80:: ]]
40+ if [ "${nameserver##fe80::}" != "$nameserver" ] ||
41+ [ "${nameserver##FE80::}" != "$nameserver" ]
42 then
43 zone_id="%$interface"
44 else
45@@ -59,7 +59,6 @@ make_resolv_conf() {
46 fi
47 resolv_conf="${resolv_conf}nameserver ${nameserver}$zone_id\n"
48 done
49- shopt -u nocasematch
50
51 echo -e "${resolv_conf}" > /etc/resolv.conf
52 fi
53--
541.9.1
55