summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/maintainers.inc1
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp.inc149
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch27
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/0001-workaround-busybox-limitation-in-linux-dhclient-script.patch65
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch117
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/0003-link-with-lcrypto.patch35
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch95
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch36
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch62
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/0009-remove-dhclient-script-bash-dependency.patch28
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/0012-dhcp-correct-the-intention-for-xml2-lib-search.patch34
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/0013-fixup_use_libbind.patch64
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb23
-rw-r--r--meta/recipes-connectivity/dhcp/files/default-relay12
-rw-r--r--meta/recipes-connectivity/dhcp/files/default-server7
-rw-r--r--meta/recipes-connectivity/dhcp/files/dhclient-systemd-wrapper39
-rw-r--r--meta/recipes-connectivity/dhcp/files/dhclient.conf50
-rw-r--r--meta/recipes-connectivity/dhcp/files/dhclient.service13
-rw-r--r--meta/recipes-connectivity/dhcp/files/dhcpd.conf108
-rw-r--r--meta/recipes-connectivity/dhcp/files/dhcpd.service15
-rw-r--r--meta/recipes-connectivity/dhcp/files/dhcpd6.service15
-rw-r--r--meta/recipes-connectivity/dhcp/files/dhcrelay.service10
-rw-r--r--meta/recipes-connectivity/dhcp/files/init-relay44
-rw-r--r--meta/recipes-connectivity/dhcp/files/init-server44
24 files changed, 0 insertions, 1093 deletions
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index 13f1714dcb..9f80970309 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -143,7 +143,6 @@ RECIPE_MAINTAINER_pn-debianutils = "Yi Zhao <yi.zhao@windriver.com>"
143RECIPE_MAINTAINER_pn-dejagnu = "Nathan Rossi <nathan@nathanrossi.com>" 143RECIPE_MAINTAINER_pn-dejagnu = "Nathan Rossi <nathan@nathanrossi.com>"
144RECIPE_MAINTAINER_pn-depmodwrapper-cross = "Unassigned <unassigned@yoctoproject.org>" 144RECIPE_MAINTAINER_pn-depmodwrapper-cross = "Unassigned <unassigned@yoctoproject.org>"
145RECIPE_MAINTAINER_pn-desktop-file-utils = "Alexander Kanavin <alex.kanavin@gmail.com>" 145RECIPE_MAINTAINER_pn-desktop-file-utils = "Alexander Kanavin <alex.kanavin@gmail.com>"
146RECIPE_MAINTAINER_pn-dhcp = "Hongxu Jia <hongxu.jia@windriver.com>"
147RECIPE_MAINTAINER_pn-dhcpcd = "Armin Kuster <akuster808@gmail.com>" 146RECIPE_MAINTAINER_pn-dhcpcd = "Armin Kuster <akuster808@gmail.com>"
148RECIPE_MAINTAINER_pn-diffoscope = "Joshua Watt <JPEWhacker@gmail.com>" 147RECIPE_MAINTAINER_pn-diffoscope = "Joshua Watt <JPEWhacker@gmail.com>"
149RECIPE_MAINTAINER_pn-diffstat = "Chen Qi <Qi.Chen@windriver.com>" 148RECIPE_MAINTAINER_pn-diffstat = "Chen Qi <Qi.Chen@windriver.com>"
diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc b/meta/recipes-connectivity/dhcp/dhcp.inc
deleted file mode 100644
index d46130d49b..0000000000
--- a/meta/recipes-connectivity/dhcp/dhcp.inc
+++ /dev/null
@@ -1,149 +0,0 @@
1SECTION = "console/network"
2SUMMARY = "Internet Software Consortium DHCP package"
3DESCRIPTION = "DHCP (Dynamic Host Configuration Protocol) is a protocol \
4which allows individual devices on an IP network to get their own \
5network configuration information from a server. DHCP helps make it \
6easier to administer devices."
7
8HOMEPAGE = "http://www.isc.org/"
9
10LICENSE = "ISC"
11LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;md5=004a4db50a1e20972e924a8618747c01"
12
13DEPENDS = "openssl bind"
14
15SRC_URI = "http://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \
16 file://init-relay file://default-relay \
17 file://init-server file://default-server \
18 file://dhclient.conf file://dhcpd.conf \
19 file://dhclient-systemd-wrapper \
20 file://dhclient.service \
21 file://dhcpd.service file://dhcrelay.service \
22 file://dhcpd6.service \
23 "
24UPSTREAM_CHECK_URI = "http://ftp.isc.org/isc/dhcp/"
25UPSTREAM_CHECK_REGEX = "(?P<pver>\d+\.\d+\.(\d+?))/"
26
27inherit autotools-brokensep systemd useradd update-rc.d
28
29USERADD_PACKAGES = "${PN}-server"
30USERADD_PARAM_${PN}-server = "--system --no-create-home --home-dir /var/run/${BPN} --shell /bin/false --user-group ${BPN}"
31
32SYSTEMD_PACKAGES = "${PN}-server ${PN}-relay ${PN}-client"
33SYSTEMD_SERVICE_${PN}-server = "dhcpd.service dhcpd6.service"
34SYSTEMD_AUTO_ENABLE_${PN}-server = "disable"
35
36SYSTEMD_SERVICE_${PN}-relay = "dhcrelay.service"
37SYSTEMD_AUTO_ENABLE_${PN}-relay = "disable"
38
39SYSTEMD_SERVICE_${PN}-client = "dhclient.service"
40SYSTEMD_AUTO_ENABLE_${PN}-client = "disable"
41
42INITSCRIPT_PACKAGES = "dhcp-server"
43INITSCRIPT_NAME_dhcp-server = "dhcp-server"
44INITSCRIPT_PARAMS_dhcp-server = "defaults"
45
46CFLAGS += "-D_GNU_SOURCE"
47EXTRA_OECONF = "--with-srv-lease-file=${localstatedir}/lib/dhcp/dhcpd.leases \
48 --with-srv6-lease-file=${localstatedir}/lib/dhcp/dhcpd6.leases \
49 --with-cli-lease-file=${localstatedir}/lib/dhcp/dhclient.leases \
50 --with-cli6-lease-file=${localstatedir}/lib/dhcp/dhclient6.leases \
51 --enable-paranoia --disable-static \
52 --with-randomdev=/dev/random \
53 --with-libbind=${STAGING_DIR_HOST} \
54 --enable-libtool \
55 "
56
57#Enable shared libs per dhcp README
58do_configure_prepend () {
59 cp configure.ac+lt configure.ac
60}
61
62do_install_append () {
63 install -d ${D}${sysconfdir}/init.d
64 install -d ${D}${sysconfdir}/default
65 install -d ${D}${sysconfdir}/dhcp
66 install -m 0755 ${WORKDIR}/init-relay ${D}${sysconfdir}/init.d/dhcp-relay
67 install -m 0644 ${WORKDIR}/default-relay ${D}${sysconfdir}/default/dhcp-relay
68 install -m 0755 ${WORKDIR}/init-server ${D}${sysconfdir}/init.d/dhcp-server
69 install -m 0644 ${WORKDIR}/default-server ${D}${sysconfdir}/default/dhcp-server
70
71 rm -f ${D}${sysconfdir}/dhclient.conf*
72 rm -f ${D}${sysconfdir}/dhcpd.conf*
73 install -m 0644 ${WORKDIR}/dhclient.conf ${D}${sysconfdir}/dhcp/dhclient.conf
74 install -m 0644 ${WORKDIR}/dhcpd.conf ${D}${sysconfdir}/dhcp/dhcpd.conf
75
76 install -d ${D}${base_sbindir}/
77 if [ "${sbindir}" != "${base_sbindir}" ]; then
78 mv ${D}${sbindir}/dhclient ${D}${base_sbindir}/
79 fi
80 install -m 0755 ${S}/client/scripts/linux ${D}${base_sbindir}/dhclient-script
81
82 # Install systemd unit files
83 install -d ${D}${systemd_unitdir}/system
84 install -m 0644 ${WORKDIR}/dhcpd.service ${D}${systemd_unitdir}/system
85 install -m 0644 ${WORKDIR}/dhcpd6.service ${D}${systemd_unitdir}/system
86 install -m 0644 ${WORKDIR}/dhcrelay.service ${D}${systemd_unitdir}/system
87 sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/dhcpd*.service ${D}${systemd_unitdir}/system/dhcrelay.service
88 sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/dhcpd*.service
89 sed -i -e 's,@base_bindir@,${base_bindir},g' ${D}${systemd_unitdir}/system/dhcpd*.service
90 sed -i -e 's,@localstatedir@,${localstatedir},g' ${D}${systemd_unitdir}/system/dhcpd*.service
91 sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/dhcrelay.service
92
93 install -d ${D}${base_sbindir}
94 install -m 0755 ${WORKDIR}/dhclient-systemd-wrapper ${D}${base_sbindir}/dhclient-systemd-wrapper
95 install -m 0644 ${WORKDIR}/dhclient.service ${D}${systemd_unitdir}/system
96 sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/dhclient.service
97 sed -i -e 's,@BASE_SBINDIR@,${base_sbindir},g' ${D}${systemd_unitdir}/system/dhclient.service
98}
99
100PACKAGES += "dhcp-libs dhcp-server dhcp-server-config dhcp-client dhcp-relay dhcp-omshell"
101
102PACKAGES_remove = "${PN}"
103RDEPENDS_${PN}-client += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'iproute2', '', d)}"
104RDEPENDS_${PN}-dev = ""
105RDEPENDS_${PN}-staticdev = ""
106FILES_${PN}-libs = "${libdir}/libdhcpctl.so.0* ${libdir}/libomapi.so.0* ${libdir}/libdhcp.so.0*"
107
108FILES_${PN}-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server"
109RRECOMMENDS_${PN}-server = "dhcp-server-config"
110
111FILES_${PN}-server-config = "${sysconfdir}/default/dhcp-server ${sysconfdir}/dhcp/dhcpd.conf"
112
113FILES_${PN}-relay = "${sbindir}/dhcrelay ${sysconfdir}/init.d/dhcp-relay ${sysconfdir}/default/dhcp-relay"
114
115FILES_${PN}-client = "${base_sbindir}/dhclient \
116 ${base_sbindir}/dhclient-script \
117 ${sysconfdir}/dhcp/dhclient.conf \
118 ${base_sbindir}/dhclient-systemd-wrapper \
119 "
120
121FILES_${PN}-omshell = "${bindir}/omshell"
122
123pkg_postinst_dhcp-server() {
124 mkdir -p $D/${localstatedir}/lib/dhcp
125 touch $D/${localstatedir}/lib/dhcp/dhcpd.leases
126 touch $D/${localstatedir}/lib/dhcp/dhcpd6.leases
127}
128
129pkg_postinst_dhcp-client() {
130 mkdir -p $D/${localstatedir}/lib/dhcp
131}
132
133pkg_postrm_dhcp-server() {
134 rm -f $D/${localstatedir}/lib/dhcp/dhcpd.leases
135 rm -f $D/${localstatedir}/lib/dhcp/dhcpd6.leases
136
137 if ! rmdir $D/${localstatedir}/lib/dhcp 2>/dev/null; then
138 echo "Not removing ${localstatedir}/lib/dhcp as it is non-empty."
139 fi
140}
141
142pkg_postrm_dhcp-client() {
143 rm -f $D/${localstatedir}/lib/dhcp/dhclient.leases
144 rm -f $D/${localstatedir}/lib/dhcp/dhclient6.leases
145
146 if ! rmdir $D/${localstatedir}/lib/dhcp 2>/dev/null; then
147 echo "Not removing ${localstatedir}/lib/dhcp as it is non-empty."
148 fi
149}
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch b/meta/recipes-connectivity/dhcp/dhcp/0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch
deleted file mode 100644
index d1b57f0bb4..0000000000
--- a/meta/recipes-connectivity/dhcp/dhcp/0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From 7cc29144535a622fc671dc86eb1da65b0473a7c4 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 15 Aug 2017 16:14:22 +0800
4Subject: [PATCH 01/11] define macro _PATH_DHCPD_CONF and _PATH_DHCLIENT_CONF
5
6Upstream-Status: Inappropriate [OE specific]
7
8Rebase to 4.3.6
9Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
10---
11 includes/site.h | 3 ++-
12 1 file changed, 2 insertions(+), 1 deletion(-)
13
14Index: dhcp-4.4.1/includes/site.h
15===================================================================
16--- dhcp-4.4.1.orig/includes/site.h
17+++ dhcp-4.4.1/includes/site.h
18@@ -148,7 +148,8 @@
19 /* Define this if you want the dhcpd.conf file to go somewhere other than
20 the default location. By default, it goes in /etc/dhcpd.conf. */
21
22-/* #define _PATH_DHCPD_CONF "/etc/dhcpd.conf" */
23+#define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf"
24+#define _PATH_DHCLIENT_CONF "/etc/dhcp/dhclient.conf"
25
26 /* Network API definitions. You do not need to choose one of these - if
27 you don't choose, one will be chosen for you in your system's config
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0001-workaround-busybox-limitation-in-linux-dhclient-script.patch b/meta/recipes-connectivity/dhcp/dhcp/0001-workaround-busybox-limitation-in-linux-dhclient-script.patch
deleted file mode 100644
index 2359381b93..0000000000
--- a/meta/recipes-connectivity/dhcp/dhcp/0001-workaround-busybox-limitation-in-linux-dhclient-script.patch
+++ /dev/null
@@ -1,65 +0,0 @@
1From eec0503cfc36f63d777f5cb3f2719cecedcb8468 Mon Sep 17 00:00:00 2001
2From: Haris Okanovic <haris.okanovic@ni.com>
3Date: Mon, 7 Jan 2019 13:22:09 -0600
4Subject: [PATCH] Workaround busybox limitation in Linux dhclient-script
5
6Busybox is a lightweight implementation of coreutils commonly used on
7space-constrained embedded Linux distributions. It's implementation of
8chown and chmod doesn't provide a "--reference" option added to
9client/scripts/linux as of commit 9261cb14. This change works around
10that limitation by using stat to read ownership and permissions flags
11and simple chown/chmod calls supported in both coreutils and busybox.
12
13 modified: client/scripts/linux
14
15Signed-off-by: Haris Okanovic <haris.okanovic@ni.com>
16Upstream-Status: Pending [ISC-Bugs #48771]
17---
18 client/scripts/linux | 17 +++++++++++++----
19 1 file changed, 13 insertions(+), 4 deletions(-)
20
21diff --git a/client/scripts/linux b/client/scripts/linux
22index 0c429697..2435a44b 100755
23--- a/client/scripts/linux
24+++ b/client/scripts/linux
25@@ -32,6 +32,17 @@
26 # if your system holds ip tool in a non-standard location.
27 ip=/sbin/ip
28
29+chown_chmod_by_reference() {
30+ local reference_file="$1"
31+ local target_file="$2"
32+
33+ local owner=$(stat -c "%u:%g" "$reference_file")
34+ local perm=$(stat -c "%a" "$reference_file")
35+
36+ chown "$owner" "$target_file"
37+ chmod "$perm" "$target_file"
38+}
39+
40 # update /etc/resolv.conf based on received values
41 # This updated version mostly follows Debian script by Andrew Pollock et al.
42 make_resolv_conf() {
43@@ -74,8 +85,7 @@ make_resolv_conf() {
44 fi
45
46 if [ -f /etc/resolv.conf ]; then
47- chown --reference=/etc/resolv.conf $new_resolv_conf
48- chmod --reference=/etc/resolv.conf $new_resolv_conf
49+ chown_chmod_by_reference /etc/resolv.conf $new_resolv_conf
50 fi
51 mv -f $new_resolv_conf /etc/resolv.conf
52 # DHCPv6
53@@ -101,8 +111,7 @@ make_resolv_conf() {
54 fi
55
56 if [ -f /etc/resolv.conf ]; then
57- chown --reference=/etc/resolv.conf $new_resolv_conf
58- chmod --reference=/etc/resolv.conf $new_resolv_conf
59+ chown_chmod_by_reference /etc/resolv.conf $new_resolv_conf
60 fi
61 mv -f $new_resolv_conf /etc/resolv.conf
62 fi
63--
642.20.0
65
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch b/meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch
deleted file mode 100644
index 101c33f677..0000000000
--- a/meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch
+++ /dev/null
@@ -1,117 +0,0 @@
1From be7540d31c356e80ee02e90e8bf162b7ac6e5ba5 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 15 Aug 2017 14:56:56 +0800
4Subject: [PATCH 02/11] dhclient dbus
5
6Upstream-Status: Inappropriate [distribution]
7
8Rebase to 4.3.6
9Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
10---
11 client/scripts/bsdos | 5 +++++
12 client/scripts/freebsd | 5 +++++
13 client/scripts/linux | 5 +++++
14 client/scripts/netbsd | 5 +++++
15 client/scripts/openbsd | 5 +++++
16 client/scripts/solaris | 5 +++++
17 6 files changed, 30 insertions(+)
18
19diff --git a/client/scripts/bsdos b/client/scripts/bsdos
20index d69d0d8..095b143 100755
21--- a/client/scripts/bsdos
22+++ b/client/scripts/bsdos
23@@ -45,6 +45,11 @@ exit_with_hooks() {
24 . /etc/dhclient-exit-hooks
25 fi
26 # probably should do something with exit status of the local script
27+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
28+ dbus-send --system --dest=com.redhat.dhcp \
29+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
30+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
31+ fi
32 exit $exit_status
33 }
34
35diff --git a/client/scripts/freebsd b/client/scripts/freebsd
36index 8f3e2a2..ad7fb44 100755
37--- a/client/scripts/freebsd
38+++ b/client/scripts/freebsd
39@@ -89,6 +89,11 @@ exit_with_hooks() {
40 . /etc/dhclient-exit-hooks
41 fi
42 # probably should do something with exit status of the local script
43+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
44+ dbus-send --system --dest=com.redhat.dhcp \
45+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
46+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
47+ fi
48 exit $exit_status
49 }
50
51diff --git a/client/scripts/linux b/client/scripts/linux
52index 5fb1612..3d447b6 100755
53--- a/client/scripts/linux
54+++ b/client/scripts/linux
55@@ -174,6 +174,11 @@ exit_with_hooks() {
56 exit_status=$?
57 fi
58
59+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
60+ dbus-send --system --dest=com.redhat.dhcp \
61+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
62+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
63+ fi
64 exit $exit_status
65 }
66
67diff --git a/client/scripts/netbsd b/client/scripts/netbsd
68index 07383b7..aaba8e8 100755
69--- a/client/scripts/netbsd
70+++ b/client/scripts/netbsd
71@@ -45,6 +45,11 @@ exit_with_hooks() {
72 . /etc/dhclient-exit-hooks
73 fi
74 # probably should do something with exit status of the local script
75+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
76+ dbus-send --system --dest=com.redhat.dhcp \
77+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
78+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
79+ fi
80 exit $exit_status
81 }
82
83diff --git a/client/scripts/openbsd b/client/scripts/openbsd
84index e7f4746..56b980c 100644
85--- a/client/scripts/openbsd
86+++ b/client/scripts/openbsd
87@@ -45,6 +45,11 @@ exit_with_hooks() {
88 . /etc/dhclient-exit-hooks
89 fi
90 # probably should do something with exit status of the local script
91+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
92+ dbus-send --system --dest=com.redhat.dhcp \
93+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
94+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
95+ fi
96 exit $exit_status
97 }
98
99diff --git a/client/scripts/solaris b/client/scripts/solaris
100index af553b9..4a2aa69 100755
101--- a/client/scripts/solaris
102+++ b/client/scripts/solaris
103@@ -26,6 +26,11 @@ exit_with_hooks() {
104 . /etc/dhclient-exit-hooks
105 fi
106 # probably should do something with exit status of the local script
107+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
108+ dbus-send --system --dest=com.redhat.dhcp \
109+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
110+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
111+ fi
112 exit $exit_status
113 }
114
115--
1161.8.3.1
117
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0003-link-with-lcrypto.patch b/meta/recipes-connectivity/dhcp/dhcp/0003-link-with-lcrypto.patch
deleted file mode 100644
index 5b35933a54..0000000000
--- a/meta/recipes-connectivity/dhcp/dhcp/0003-link-with-lcrypto.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From d80bd792323dbd56269309f85b4506eb6b1b60e9 Mon Sep 17 00:00:00 2001
2From: Andrei Gherzan <andrei@gherzan.ro>
3Date: Tue, 15 Aug 2017 15:05:47 +0800
4Subject: [PATCH 03/11] link with lcrypto
5
6From 4.2.0 final release, -lcrypto check was removed and we compile
7static libraries
8from bind that are linked to libcrypto. This is why i added a patch in
9order to add
10-lcrypto to LIBS.
11
12Upstream-Status: Pending
13Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
14
15Rebase to 4.3.6
16Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
17---
18 configure.ac | 4 ++++
19 1 file changed, 4 insertions(+)
20
21Index: dhcp-4.4.1/configure.ac
22===================================================================
23--- dhcp-4.4.1.orig/configure.ac
24+++ dhcp-4.4.1/configure.ac
25@@ -612,6 +612,10 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],
26 # Look for optional headers.
27 AC_CHECK_HEADERS(sys/socket.h net/if_dl.h net/if6.h regex.h)
28
29+# find an MD5 library
30+AC_SEARCH_LIBS(MD5_Init, [crypto])
31+AC_SEARCH_LIBS(MD5Init, [crypto])
32+
33 # Solaris needs some libraries for functions
34 AC_SEARCH_LIBS(socket, [socket])
35 AC_SEARCH_LIBS(inet_ntoa, [nsl])
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch b/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch
deleted file mode 100644
index 7b57730ffb..0000000000
--- a/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch
+++ /dev/null
@@ -1,95 +0,0 @@
1From cccec0344d68dac4100b6f260ee24e7c2da9dfda Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 15 Aug 2017 15:08:22 +0800
4Subject: [PATCH 04/11] Fix out of tree builds
5
6Upstream-Status: Pending
7
8RP 2013/03/21
9
10Rebase to 4.3.6
11
12Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
13---
14 client/Makefile.am | 4 ++--
15 common/Makefile.am | 3 ++-
16 dhcpctl/Makefile.am | 2 ++
17 omapip/Makefile.am | 1 +
18 relay/Makefile.am | 2 +-
19 server/Makefile.am | 2 +-
20 6 files changed, 9 insertions(+), 5 deletions(-)
21
22Index: dhcp-4.4.1/common/Makefile.am
23===================================================================
24--- dhcp-4.4.1.orig/common/Makefile.am
25+++ dhcp-4.4.1/common/Makefile.am
26@@ -1,4 +1,5 @@
27-AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"'
28+AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"'
29+
30 AM_CFLAGS = $(LDAP_CFLAGS)
31
32 lib_LIBRARIES = libdhcp.a
33Index: dhcp-4.4.1/dhcpctl/Makefile.am
34===================================================================
35--- dhcp-4.4.1.orig/dhcpctl/Makefile.am
36+++ dhcp-4.4.1/dhcpctl/Makefile.am
37@@ -3,6 +3,8 @@ BINDLIBDNSDIR=@BINDLIBDNSDIR@
38 BINDLIBISCCFGDIR=@BINDLIBISCCFGDIR@
39 BINDLIBISCDIR=@BINDLIBISCDIR@
40
41+AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir)
42+
43 bin_PROGRAMS = omshell
44 lib_LIBRARIES = libdhcpctl.a
45 noinst_PROGRAMS = cltest
46Index: dhcp-4.4.1/server/Makefile.am
47===================================================================
48--- dhcp-4.4.1.orig/server/Makefile.am
49+++ dhcp-4.4.1/server/Makefile.am
50@@ -4,7 +4,7 @@
51 # production code. Sadly, we are not there yet.
52 SUBDIRS = . tests
53
54-AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"'
55+AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes
56
57 dist_sysconf_DATA = dhcpd.conf.example
58 sbin_PROGRAMS = dhcpd
59Index: dhcp-4.4.1/client/Makefile.am
60===================================================================
61--- dhcp-4.4.1.orig/client/Makefile.am
62+++ dhcp-4.4.1/client/Makefile.am
63@@ -5,7 +5,7 @@
64 SUBDIRS = . tests
65
66 AM_CPPFLAGS = -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"'
67-AM_CPPFLAGS += -DLOCALSTATEDIR='"$(localstatedir)"'
68+AM_CPPFLAGS += -DLOCALSTATEDIR='"$(localstatedir)"' -I$(top_srcdir)/includes
69
70 dist_sysconf_DATA = dhclient.conf.example
71 sbin_PROGRAMS = dhclient
72Index: dhcp-4.4.1/omapip/Makefile.am
73===================================================================
74--- dhcp-4.4.1.orig/omapip/Makefile.am
75+++ dhcp-4.4.1/omapip/Makefile.am
76@@ -2,6 +2,7 @@ BINDLIBIRSDIR=@BINDLIBIRSDIR@
77 BINDLIBDNSDIR=@BINDLIBDNSDIR@
78 BINDLIBISCCFGDIR=@BINDLIBISCCFGDIR@
79 BINDLIBISCDIR=@BINDLIBISCDIR@
80+AM_CPPFLAGS = -I$(top_srcdir)/includes
81
82 lib_LIBRARIES = libomapi.a
83 noinst_PROGRAMS = svtest
84Index: dhcp-4.4.1/relay/Makefile.am
85===================================================================
86--- dhcp-4.4.1.orig/relay/Makefile.am
87+++ dhcp-4.4.1/relay/Makefile.am
88@@ -1,6 +1,6 @@
89 SUBDIRS = . tests
90
91-AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"'
92+AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes
93
94 sbin_PROGRAMS = dhcrelay
95 dhcrelay_SOURCES = dhcrelay.c
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch b/meta/recipes-connectivity/dhcp/dhcp/0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch
deleted file mode 100644
index dd56381b1d..0000000000
--- a/meta/recipes-connectivity/dhcp/dhcp/0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From 2e8ff0e4f6d39e346ea86b8c514ab4ccc78fa359 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 15 Aug 2017 15:24:14 +0800
4Subject: [PATCH 05/11] dhcp-client: fix invoke dhclient-script failed on
5 Read-only file system
6
7In read-only file system, '/etc' is on the readonly partition,
8and '/etc/resolv.conf' is symlinked to a separate writable
9partition.
10
11In this situation, we create temp files 'resolv.conf.dhclient-new'
12in /tmp dir.
13
14Upstream-Status: Pending
15
16Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
17---
18 client/scripts/linux | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
21diff --git a/client/scripts/linux b/client/scripts/linux
22index 3d447b6..3122a75 100755
23--- a/client/scripts/linux
24+++ b/client/scripts/linux
25@@ -40,7 +40,7 @@ make_resolv_conf() {
26 # DHCPv4
27 if [ -n "$new_domain_search" ] || [ -n "$new_domain_name" ] ||
28 [ -n "$new_domain_name_servers" ]; then
29- new_resolv_conf=/etc/resolv.conf.dhclient-new
30+ new_resolv_conf=/tmp/resolv.conf.dhclient-new
31 rm -f $new_resolv_conf
32
33 if [ -n "$new_domain_name" ]; then
34--
351.8.3.1
36
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch b/meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch
deleted file mode 100644
index feb0754fff..0000000000
--- a/meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch
+++ /dev/null
@@ -1,62 +0,0 @@
1From 7107511fd209f08f9a96f8938041ae48f3295895 Mon Sep 17 00:00:00 2001
2From: Christopher Larson <chris_larson@mentor.com>
3Date: Tue, 15 Aug 2017 16:17:49 +0800
4Subject: [PATCH 07/11] Add configure argument to make the libxml2 dependency
5 explicit and determinisitic.
6
7Upstream-Status: Pending
8
9Signed-off-by: Christopher Larson <chris_larson@mentor.com>
10
11Rebase to 4.3.6
12
13Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
14---
15 configure.ac | 11 +++++++++++
16 1 file changed, 11 insertions(+)
17
18Index: dhcp-4.4.1/configure.ac
19===================================================================
20--- dhcp-4.4.1.orig/configure.ac
21+++ dhcp-4.4.1/configure.ac
22@@ -642,6 +642,17 @@ if test "$have_nanosleep" = "rt"; then
23 LIBS="-lrt $LIBS"
24 fi
25
26+AC_ARG_WITH(libxml2,
27+ AS_HELP_STRING([--with-libxml2], [link against libxml2. this is needed if bind was built with xml2 support enabled]),
28+ with_libxml2="$withval", with_libxml2="no")
29+
30+if test x$with_libxml2 != xno; then
31+ AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],
32+ [if test x$with_libxml2 != xauto; then
33+ AC_MSG_FAILURE([*** Cannot find xmlTextWriterStartElement with -lxml2 and libxml2 was requested])
34+ fi])
35+fi
36+
37 # check for /dev/random (declares HAVE_DEV_RANDOM)
38 AC_MSG_CHECKING(for random device)
39 AC_ARG_WITH(randomdev,
40Index: dhcp-4.4.1/configure.ac+lt
41===================================================================
42--- dhcp-4.4.1.orig/configure.ac+lt
43+++ dhcp-4.4.1/configure.ac+lt
44@@ -909,6 +909,18 @@ elif test "$want_libtool" = "yes" -a "$u
45 fi
46 AM_CONDITIONAL(INSTALL_BIND, test "$want_install_bind" = "yes")
47
48+AC_ARG_WITH(libxml2,
49+ AS_HELP_STRING([--with-libxml2], [link against libxml2. this is needed if bind was built with xml2 support enabled]),
50+ with_libxml2="$withval", with_libxml2="no")
51+
52+if test x$with_libxml2 != xno; then
53+ AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],,
54+ [if test x$with_libxml2 != xauto; then
55+ AC_MSG_FAILURE([*** Cannot find xmlTextWriterStartElement with -lxml2 and libxml2 was requested])
56+ fi])
57+fi
58+
59+
60 # OpenLDAP support.
61 AC_ARG_WITH(ldap,
62 AS_HELP_STRING([--with-ldap],[enable OpenLDAP support in dhcpd (default is no)]),
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0009-remove-dhclient-script-bash-dependency.patch b/meta/recipes-connectivity/dhcp/dhcp/0009-remove-dhclient-script-bash-dependency.patch
deleted file mode 100644
index 912b6d6312..0000000000
--- a/meta/recipes-connectivity/dhcp/dhcp/0009-remove-dhclient-script-bash-dependency.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From f3f8b7726e50e24ef3edf5fa5a17e31d39118d7e Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com>
3Date: Tue, 15 Aug 2017 15:49:31 +0800
4Subject: [PATCH 09/11] remove dhclient-script bash dependency
5
6Upstream-Status: Inappropriate [OE specific]
7
8Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
9
10Rebase to 4.3.6
11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
12---
13 client/scripts/linux | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/client/scripts/linux b/client/scripts/linux
17index 3122a75..1712d7d 100755
18--- a/client/scripts/linux
19+++ b/client/scripts/linux
20@@ -1,4 +1,4 @@
21-#!/bin/bash
22+#!/bin/sh
23 # dhclient-script for Linux. Dan Halbert, March, 1997.
24 # Updated for Linux 2.[12] by Brian J. Murrell, January 1999.
25 # No guarantees about this. I'm a novice at the details of Linux
26--
271.8.3.1
28
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0012-dhcp-correct-the-intention-for-xml2-lib-search.patch b/meta/recipes-connectivity/dhcp/dhcp/0012-dhcp-correct-the-intention-for-xml2-lib-search.patch
deleted file mode 100644
index 39ba65fbc4..0000000000
--- a/meta/recipes-connectivity/dhcp/dhcp/0012-dhcp-correct-the-intention-for-xml2-lib-search.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From 501543b3ef715488a142e3d301ff2733aa33eec7 Mon Sep 17 00:00:00 2001
2From: Awais Belal <awais_belal@mentor.com>
3Date: Wed, 25 Oct 2017 21:00:05 +0500
4Subject: [PATCH] dhcp: correct the intention for xml2 lib search
5
6A missing case breaks the build when libxml2 is
7required and found appropriately. The third argument
8to the function AC_SEARCH_LIB is action-if-found which
9was mistakenly been used for the case where the library
10is not found and hence breaks the configure phase
11where it shoud actually pass.
12We now pass on silently when action-if-found is
13executed.
14
15Upstream-Status: Pending
16
17Signed-off-by: Awais Belal <awais_belal@mentor.com>
18---
19 configure.ac | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22Index: dhcp-4.4.1/configure.ac
23===================================================================
24--- dhcp-4.4.1.orig/configure.ac
25+++ dhcp-4.4.1/configure.ac
26@@ -647,7 +647,7 @@ AC_ARG_WITH(libxml2,
27 with_libxml2="$withval", with_libxml2="no")
28
29 if test x$with_libxml2 != xno; then
30- AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],
31+ AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],,
32 [if test x$with_libxml2 != xauto; then
33 AC_MSG_FAILURE([*** Cannot find xmlTextWriterStartElement with -lxml2 and libxml2 was requested])
34 fi])
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0013-fixup_use_libbind.patch b/meta/recipes-connectivity/dhcp/dhcp/0013-fixup_use_libbind.patch
deleted file mode 100644
index fcec010bd0..0000000000
--- a/meta/recipes-connectivity/dhcp/dhcp/0013-fixup_use_libbind.patch
+++ /dev/null
@@ -1,64 +0,0 @@
1lib and include path is hardcoded for use_libbind
2
3use libdir and includedir vars
4
5Upstream-Status: Pending
6Signed-off-by: Armin Kuster <akuster808@gmail.com>
7
8Index: dhcp-4.4.1/configure.ac+lt
9===================================================================
10--- dhcp-4.4.1.orig/configure.ac+lt
11+++ dhcp-4.4.1/configure.ac+lt
12@@ -801,22 +801,22 @@ no)
13 if test ! -d "$use_libbind"; then
14 AC_MSG_ERROR([Cannot find bind directory at $use_libbind])
15 fi
16- if test ! -d "$use_libbind/include" -o \
17- ! -f "$use_libbind/include/isc/buffer.h"
18+ if test ! -d "$use_libbind/$includedir" -o \
19+ ! -f "$use_libbind/$includedir/isc/buffer.h"
20 then
21- AC_MSG_ERROR([Cannot find bind includes at $use_libbind/include])
22+ AC_MSG_ERROR([Cannot find bind includes at $use_libbind/$includedir])
23 fi
24- if test ! -d "$use_libbind/lib" -o \
25- \( ! -f "$use_libbind/lib/libisc.a" -a \
26- ! -f "$use_libbind/lib/libisc.la" \)
27+ if test ! -d "$use_libbind/$libdir" -o \
28+ \( ! -f "$use_libbind/$libdir/libisc.a" -a \
29+ ! -f "$use_libbind/$libdir/libisc.la" \)
30 then
31- AC_MSG_ERROR([Cannot find bind libraries at $use_libbind/lib])
32+ AC_MSG_ERROR([Cannot find bind libraries at $use_libbind/$libdir])
33 fi
34 BINDDIR="$use_libbind"
35- BINDLIBIRSDIR="$BINDDIR/lib"
36- BINDLIBDNSDIR="$BINDDIR/lib"
37- BINDLIBISCCFGDIR="$BINDDIR/lib"
38- BINDLIBISCDIR="$BINDDIR/lib"
39+ BINDLIBIRSDIR="$BINDDIR/$libdir"
40+ BINDLIBDNSDIR="$BINDDIR/$libdir"
41+ BINDLIBISCCFGDIR="$BINDDIR/$libdir"
42+ BINDLIBISCDIR="$BINDDIR/$libdir"
43 DISTCHECK_LIBBIND_CONFIGURE_FLAG="--with-libbind=$use_libbind"
44 ;;
45 esac
46@@ -856,14 +856,14 @@ AC_ARG_ENABLE(libtool,
47
48 if test "$use_libbind" != "no"; then
49 if test "$want_libtool" = "yes" -a \
50- ! -f "$use_libbind/lib/libisc.la"
51+ ! -f "$use_libbind/$libdir/libisc.la"
52 then
53- AC_MSG_ERROR([Cannot find dynamic libraries at $use_libbind/lib])
54+ AC_MSG_ERROR([Cannot find dynamic libraries at $use_libbind/$libdir])
55 fi
56 if test "$want_libtool" = "no" -a \
57- ! -f "$use_libbind/lib/libisc.a"
58+ ! -f "$use_libbind/$libdir/libisc.a"
59 then
60- AC_MSG_ERROR([Cannot find static libraries at $use_libbind/lib])
61+ AC_MSG_ERROR([Cannot find static libraries at $use_libbind/$libdir])
62 fi
63 fi
64
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb b/meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb
deleted file mode 100644
index cf4af82609..0000000000
--- a/meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb
+++ /dev/null
@@ -1,23 +0,0 @@
1require dhcp.inc
2
3SRC_URI += "file://0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch \
4 file://0002-dhclient-dbus.patch \
5 file://0003-link-with-lcrypto.patch \
6 file://0004-Fix-out-of-tree-builds.patch \
7 file://0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch \
8 file://0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch \
9 file://0009-remove-dhclient-script-bash-dependency.patch \
10 file://0012-dhcp-correct-the-intention-for-xml2-lib-search.patch \
11 file://0013-fixup_use_libbind.patch \
12 file://0001-workaround-busybox-limitation-in-linux-dhclient-script.patch \
13"
14
15SRC_URI[md5sum] = "2afdaf8498dc1edaf3012efdd589b3e1"
16SRC_URI[sha256sum] = "1a7ccd64a16e5e68f7b5e0f527fd07240a2892ea53fe245620f4f5f607004521"
17
18LDFLAGS_append = " -pthread"
19
20PACKAGECONFIG ?= ""
21PACKAGECONFIG[bind-httpstats] = "--with-libxml2,--without-libxml2,libxml2"
22
23CFLAGS += "-fcommon"
diff --git a/meta/recipes-connectivity/dhcp/files/default-relay b/meta/recipes-connectivity/dhcp/files/default-relay
deleted file mode 100644
index 7961f014be..0000000000
--- a/meta/recipes-connectivity/dhcp/files/default-relay
+++ /dev/null
@@ -1,12 +0,0 @@
1# Defaults for dhcp-relay initscript
2# sourced by /etc/init.d/dhcp-relay
3
4# What servers should the DHCP relay forward requests to?
5# e.g: SERVERS="192.168.0.1"
6SERVERS=""
7
8# On what interfaces should the DHCP relay (dhrelay) serve DHCP requests?
9INTERFACES=""
10
11# Additional options that are passed to the DHCP relay daemon?
12OPTIONS=""
diff --git a/meta/recipes-connectivity/dhcp/files/default-server b/meta/recipes-connectivity/dhcp/files/default-server
deleted file mode 100644
index 0385d16992..0000000000
--- a/meta/recipes-connectivity/dhcp/files/default-server
+++ /dev/null
@@ -1,7 +0,0 @@
1# Defaults for dhcp initscript
2# sourced by /etc/init.d/dhcp-server
3# installed at /etc/default/dhcp-server by the maintainer scripts
4
5# On what interfaces should the DHCP server (dhcpd) serve DHCP requests?
6# Separate multiple interfaces with spaces, e.g. "eth0 eth1".
7INTERFACES=""
diff --git a/meta/recipes-connectivity/dhcp/files/dhclient-systemd-wrapper b/meta/recipes-connectivity/dhcp/files/dhclient-systemd-wrapper
deleted file mode 100644
index 7d0e224a1d..0000000000
--- a/meta/recipes-connectivity/dhcp/files/dhclient-systemd-wrapper
+++ /dev/null
@@ -1,39 +0,0 @@
1#!/bin/sh
2
3# In case the interface is used for nfs, skip it.
4nfsroot=0
5interfaces=""
6exec 9<&0 < /proc/mounts
7while read dev mtpt fstype rest; do
8 if test $mtpt = "/" ; then
9 case $fstype in
10 nfs | nfs4)
11 nfsroot=1
12 nfs_addr=`echo $rest | sed -e 's/^.*addr=\([0-9.]*\).*$/\1/'`
13 break
14 ;;
15 *)
16 ;;
17 esac
18 fi
19done
20exec 0<&9 9<&-
21
22if [ $nfsroot -eq 0 ]; then
23 interfaces="$INTERFACES"
24else
25 if [ -x /bin/ip -o -x /sbin/ip ] ; then
26 nfs_iface=`ip route get $nfs_addr | grep dev | sed -e 's/^.*dev \([-a-z0-9.]*\).*$/\1/'`
27 fi
28 for i in $INTERFACES; do
29 if test "x$i" = "x$nfs_iface"; then
30 echo "dhclient skipping nfsroot interface $i"
31 else
32 interfaces="$interfaces $i"
33 fi
34 done
35fi
36
37if test "x$interfaces" != "x"; then
38 /sbin/dhclient -d -cf /etc/dhcp/dhclient.conf -q -lf /var/lib/dhcp/dhclient.leases $interfaces
39fi
diff --git a/meta/recipes-connectivity/dhcp/files/dhclient.conf b/meta/recipes-connectivity/dhcp/files/dhclient.conf
deleted file mode 100644
index 0e6dcf96c2..0000000000
--- a/meta/recipes-connectivity/dhcp/files/dhclient.conf
+++ /dev/null
@@ -1,50 +0,0 @@
1# Configuration file for /sbin/dhclient, which is included in Debian's
2# dhcp3-client package.
3#
4# This is a sample configuration file for dhclient. See dhclient.conf's
5# man page for more information about the syntax of this file
6# and a more comprehensive list of the parameters understood by
7# dhclient.
8#
9# Normally, if the DHCP server provides reasonable information and does
10# not leave anything out (like the domain name, for example), then
11# few changes must be made to this file, if any.
12#
13
14#send host-name "andare.fugue.com";
15#send dhcp-client-identifier 1:0:a0:24:ab:fb:9c;
16#send dhcp-lease-time 3600;
17#supersede domain-name "fugue.com home.vix.com";
18#prepend domain-name-servers 127.0.0.1;
19request subnet-mask, broadcast-address, time-offset, routers,
20 domain-name, domain-name-servers, host-name,
21 netbios-name-servers, netbios-scope;
22#require subnet-mask, domain-name-servers;
23#timeout 60;
24#retry 60;
25#reboot 10;
26#select-timeout 5;
27#initial-interval 2;
28#script "/etc/dhcp3/dhclient-script";
29#media "-link0 -link1 -link2", "link0 link1";
30#reject 192.33.137.209;
31
32#alias {
33# interface "eth0";
34# fixed-address 192.5.5.213;
35# option subnet-mask 255.255.255.255;
36#}
37
38#lease {
39# interface "eth0";
40# fixed-address 192.33.137.200;
41# medium "link0 link1";
42# option host-name "andare.swiftmedia.com";
43# option subnet-mask 255.255.255.0;
44# option broadcast-address 192.33.137.255;
45# option routers 192.33.137.250;
46# option domain-name-servers 127.0.0.1;
47# renew 2 2000/1/12 00:00:01;
48# rebind 2 2000/1/12 00:00:01;
49# expire 2 2000/1/12 00:00:01;
50#}
diff --git a/meta/recipes-connectivity/dhcp/files/dhclient.service b/meta/recipes-connectivity/dhcp/files/dhclient.service
deleted file mode 100644
index 9ddb4d1dfe..0000000000
--- a/meta/recipes-connectivity/dhcp/files/dhclient.service
+++ /dev/null
@@ -1,13 +0,0 @@
1[Unit]
2Description=Dynamic Host Configuration Protocol (DHCP)
3Wants=network.target
4Before=network.target
5After=systemd-udevd.service
6
7[Service]
8EnvironmentFile=-@SYSCONFDIR@/default/dhcp-client
9ExecStart=@BASE_SBINDIR@/dhclient-systemd-wrapper
10RemainAfterExit=yes
11
12[Install]
13WantedBy=multi-user.target
diff --git a/meta/recipes-connectivity/dhcp/files/dhcpd.conf b/meta/recipes-connectivity/dhcp/files/dhcpd.conf
deleted file mode 100644
index 0001c0f00e..0000000000
--- a/meta/recipes-connectivity/dhcp/files/dhcpd.conf
+++ /dev/null
@@ -1,108 +0,0 @@
1#
2# Sample configuration file for ISC dhcpd for Debian
3#
4# $Id: dhcpd.conf,v 1.1.1.1 2002/05/21 00:07:44 peloy Exp $
5#
6
7# The ddns-updates-style parameter controls whether or not the server will
8# attempt to do a DNS update when a lease is confirmed. We default to the
9# behavior of the version 2 packages ('none', since DHCP v2 didn't
10# have support for DDNS.)
11ddns-update-style none;
12
13# option definitions common to all supported networks...
14option domain-name "example.org";
15option domain-name-servers ns1.example.org, ns2.example.org;
16
17default-lease-time 600;
18max-lease-time 7200;
19
20# If this DHCP server is the official DHCP server for the local
21# network, the authoritative directive should be uncommented.
22#authoritative;
23
24# Use this to send dhcp log messages to a different log file (you also
25# have to hack syslog.conf to complete the redirection).
26log-facility local7;
27
28# No service will be given on this subnet, but declaring it helps the
29# DHCP server to understand the network topology.
30
31#subnet 10.152.187.0 netmask 255.255.255.0 {
32#}
33
34# This is a very basic subnet declaration.
35
36#subnet 10.254.239.0 netmask 255.255.255.224 {
37# range 10.254.239.10 10.254.239.20;
38# option routers rtr-239-0-1.example.org, rtr-239-0-2.example.org;
39#}
40
41# This declaration allows BOOTP clients to get dynamic addresses,
42# which we don't really recommend.
43
44#subnet 10.254.239.32 netmask 255.255.255.224 {
45# range dynamic-bootp 10.254.239.40 10.254.239.60;
46# option broadcast-address 10.254.239.31;
47# option routers rtr-239-32-1.example.org;
48#}
49
50# A slightly different configuration for an internal subnet.
51#subnet 10.5.5.0 netmask 255.255.255.224 {
52# range 10.5.5.26 10.5.5.30;
53# option domain-name-servers ns1.internal.example.org;
54# option domain-name "internal.example.org";
55# option routers 10.5.5.1;
56# option broadcast-address 10.5.5.31;
57# default-lease-time 600;
58# max-lease-time 7200;
59#}
60
61# Hosts which require special configuration options can be listed in
62# host statements. If no address is specified, the address will be
63# allocated dynamically (if possible), but the host-specific information
64# will still come from the host declaration.
65
66#host passacaglia {
67# hardware ethernet 0:0:c0:5d:bd:95;
68# filename "vmunix.passacaglia";
69# server-name "toccata.fugue.com";
70#}
71
72# Fixed IP addresses can also be specified for hosts. These addresses
73# should not also be listed as being available for dynamic assignment.
74# Hosts for which fixed IP addresses have been specified can boot using
75# BOOTP or DHCP. Hosts for which no fixed address is specified can only
76# be booted with DHCP, unless there is an address range on the subnet
77# to which a BOOTP client is connected which has the dynamic-bootp flag
78# set.
79#host fantasia {
80# hardware ethernet 08:00:07:26:c0:a5;
81# fixed-address fantasia.fugue.com;
82#}
83
84# You can declare a class of clients and then do address allocation
85# based on that. The example below shows a case where all clients
86# in a certain class get addresses on the 10.17.224/24 subnet, and all
87# other clients get addresses on the 10.0.29/24 subnet.
88
89#class "foo" {
90# match if substring (option vendor-class-identifier, 0, 4) = "SUNW";
91#}
92
93#shared-network 224-29 {
94# subnet 10.17.224.0 netmask 255.255.255.0 {
95# option routers rtr-224.example.org;
96# }
97# subnet 10.0.29.0 netmask 255.255.255.0 {
98# option routers rtr-29.example.org;
99# }
100# pool {
101# allow members of "foo";
102# range 10.17.224.10 10.17.224.250;
103# }
104# pool {
105# deny members of "foo";
106# range 10.0.29.10 10.0.29.230;
107# }
108#}
diff --git a/meta/recipes-connectivity/dhcp/files/dhcpd.service b/meta/recipes-connectivity/dhcp/files/dhcpd.service
deleted file mode 100644
index ae4f93eca5..0000000000
--- a/meta/recipes-connectivity/dhcp/files/dhcpd.service
+++ /dev/null
@@ -1,15 +0,0 @@
1[Unit]
2Description=DHCPv4 Server Daemon
3Documentation=man:dhcpd(8) man:dhcpd.conf(5)
4After=network.target
5After=time-sync.target
6
7[Service]
8PIDFile=@localstatedir@/run/dhcpd.pid
9EnvironmentFile=@SYSCONFDIR@/default/dhcp-server
10EnvironmentFile=-@SYSCONFDIR@/sysconfig/dhcp-server
11ExecStartPre=@base_bindir@/touch @localstatedir@/lib/dhcp/dhcpd.leases
12ExecStart=@SBINDIR@/dhcpd -f -cf @SYSCONFDIR@/dhcp/dhcpd.conf -pf @localstatedir@/run/dhcpd.pid $DHCPDARGS -q $INTERFACES
13
14[Install]
15WantedBy=multi-user.target
diff --git a/meta/recipes-connectivity/dhcp/files/dhcpd6.service b/meta/recipes-connectivity/dhcp/files/dhcpd6.service
deleted file mode 100644
index 52a6224dc2..0000000000
--- a/meta/recipes-connectivity/dhcp/files/dhcpd6.service
+++ /dev/null
@@ -1,15 +0,0 @@
1[Unit]
2Description=DHCPv6 Server Daemon
3Documentation=man:dhcpd(8) man:dhcpd.conf(5)
4After=network.target
5After=time-sync.target
6
7[Service]
8PIDFile=@localstatedir@/run/dhcpd6.pid
9EnvironmentFile=@SYSCONFDIR@/default/dhcp-server
10EnvironmentFile=-@SYSCONFDIR@/sysconfig/dhcpd6
11ExecStartPre=@base_bindir@/touch @localstatedir@/lib/dhcp/dhcpd6.leases
12ExecStart=@SBINDIR@/dhcpd -f -6 -cf @SYSCONFDIR@/dhcp/dhcpd6.conf -pf @localstatedir@/run/dhcpd6.pid $DHCPDARGS -q $INTERFACES
13
14[Install]
15WantedBy=multi-user.target
diff --git a/meta/recipes-connectivity/dhcp/files/dhcrelay.service b/meta/recipes-connectivity/dhcp/files/dhcrelay.service
deleted file mode 100644
index 15ff927d34..0000000000
--- a/meta/recipes-connectivity/dhcp/files/dhcrelay.service
+++ /dev/null
@@ -1,10 +0,0 @@
1[Unit]
2Description=DHCP Relay Agent Daemon
3After=network.target
4
5[Service]
6EnvironmentFile=@SYSCONFDIR@/default/dhcp-relay
7ExecStart=@SBINDIR@/dhcrelay -d --no-pid -q $SERVERS
8
9[Install]
10WantedBy=multi-user.target
diff --git a/meta/recipes-connectivity/dhcp/files/init-relay b/meta/recipes-connectivity/dhcp/files/init-relay
deleted file mode 100644
index 019a7e84cf..0000000000
--- a/meta/recipes-connectivity/dhcp/files/init-relay
+++ /dev/null
@@ -1,44 +0,0 @@
1#!/bin/sh
2#
3# $Id: dhcp3-relay,v 1.1 2004/04/16 15:41:08 ml Exp $
4#
5
6# It is not safe to start if we don't have a default configuration...
7if [ ! -f /etc/default/dhcp-relay ]; then
8 echo "/etc/default/dhcp-relay does not exist! - Aborting..."
9 echo "create this file to fix the problem."
10 exit 1
11fi
12
13# Read init script configuration (interfaces the daemon should listen on
14# and the DHCP server we should forward requests to.)
15. /etc/default/dhcp-relay
16
17# Build command line for interfaces (will be passed to dhrelay below.)
18IFCMD=""
19if test "$INTERFACES" != ""; then
20 for I in $INTERFACES; do
21 IFCMD=${IFCMD}"-i "${I}" "
22 done
23fi
24
25DHCRELAYPID=/var/run/dhcrelay.pid
26
27case "$1" in
28 start)
29 start-stop-daemon -S -x /usr/sbin/dhcrelay -- -q $OPTIONS $IFCMD $SERVERS
30 ;;
31 stop)
32 start-stop-daemon -K -x /usr/sbin/dhcrelay
33 ;;
34 restart | force-reload)
35 $0 stop
36 sleep 2
37 $0 start
38 ;;
39 *)
40 echo "Usage: /etc/init.d/dhcp-relay {start|stop|restart|force-reload}"
41 exit 1
42esac
43
44exit 0
diff --git a/meta/recipes-connectivity/dhcp/files/init-server b/meta/recipes-connectivity/dhcp/files/init-server
deleted file mode 100644
index 5e693adf78..0000000000
--- a/meta/recipes-connectivity/dhcp/files/init-server
+++ /dev/null
@@ -1,44 +0,0 @@
1#!/bin/sh
2#
3# $Id: dhcp3-server.init.d,v 1.4 2003/07/13 19:12:41 mdz Exp $
4#
5
6test -f /usr/sbin/dhcpd || exit 0
7
8# It is not safe to start if we don't have a default configuration...
9if [ ! -f /etc/default/dhcp-server ]; then
10 echo "/etc/default/dhcp-server does not exist! - Aborting..."
11 exit 0
12fi
13
14# Read init script configuration (so far only interfaces the daemon
15# should listen on.)
16. /etc/default/dhcp-server
17
18case "$1" in
19 start)
20 echo -n "Starting DHCP server: "
21 test -d /var/lib/dhcp/ || mkdir -p /var/lib/dhcp/
22 test -f /var/lib/dhcp/dhcpd.leases || touch /var/lib/dhcp/dhcpd.leases
23 start-stop-daemon -S -x /usr/sbin/dhcpd -- -q $INTERFACES -user dhcp -group dhcp
24 echo "."
25 ;;
26 stop)
27 echo -n "Stopping DHCP server: dhcpd3"
28 start-stop-daemon -K -x /usr/sbin/dhcpd
29 echo "."
30 ;;
31 restart | force-reload)
32 $0 stop
33 sleep 2
34 $0 start
35 if [ "$?" != "0" ]; then
36 exit 1
37 fi
38 ;;
39 *)
40 echo "Usage: /etc/init.d/dhcp-server {start|stop|restart|force-reload}"
41 exit 1
42esac
43
44exit 0
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 11:42:49 +0000