diff options
Diffstat (limited to 'meta/recipes-connectivity/dhcp')
-rw-r--r-- | meta/recipes-connectivity/dhcp/dhcp3.inc | 4 | ||||
-rw-r--r-- | meta/recipes-connectivity/dhcp/dhcp4.inc | 4 | ||||
-rw-r--r-- | meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb | 2 |
3 files changed, 1 insertions, 9 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp3.inc b/meta/recipes-connectivity/dhcp/dhcp3.inc index 3f68f452d2..6c7483eae1 100644 --- a/meta/recipes-connectivity/dhcp/dhcp3.inc +++ b/meta/recipes-connectivity/dhcp/dhcp3.inc | |||
@@ -47,7 +47,3 @@ FILES_dhcp-client = "${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${ | |||
47 | RDEPENDS_dhcp-client = "bash" | 47 | RDEPENDS_dhcp-client = "bash" |
48 | 48 | ||
49 | FILES_dhcp-omshell = "${bindir}/omshell" | 49 | FILES_dhcp-omshell = "${bindir}/omshell" |
50 | |||
51 | CONFFILES_dhcp-server_nylon = "/etc/dhcp/dhcpd.conf" | ||
52 | CONFFILES_dhcp-relay_nylon = "/etc/default/dhcp-relay" | ||
53 | CONFFILES_dhcp-client_nylon = "/etc/dhcp/dhclient.conf" | ||
diff --git a/meta/recipes-connectivity/dhcp/dhcp4.inc b/meta/recipes-connectivity/dhcp/dhcp4.inc index e7cff3e038..159ae89354 100644 --- a/meta/recipes-connectivity/dhcp/dhcp4.inc +++ b/meta/recipes-connectivity/dhcp/dhcp4.inc | |||
@@ -60,7 +60,3 @@ FILES_dhcp-client = "${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${ | |||
60 | RDEPENDS_dhcp-client = "bash" | 60 | RDEPENDS_dhcp-client = "bash" |
61 | 61 | ||
62 | FILES_dhcp-omshell = "${bindir}/omshell" | 62 | FILES_dhcp-omshell = "${bindir}/omshell" |
63 | |||
64 | CONFFILES_dhcp-server_nylon = "/etc/dhcp/dhcpd.conf" | ||
65 | CONFFILES_dhcp-relay_nylon = "/etc/default/dhcp-relay" | ||
66 | CONFFILES_dhcp-client_nylon = "/etc/dhcp/dhclient.conf" | ||
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb b/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb index c273b2c0b9..85f473df17 100644 --- a/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb +++ b/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require dhcp4.inc | 1 | require dhcp4.inc |
2 | 2 | ||
3 | PR = "r1" | 3 | PR = "r2" |
4 | 4 | ||
5 | SRC_URI += "file://fixincludes.patch \ | 5 | SRC_URI += "file://fixincludes.patch \ |
6 | file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \ | 6 | file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \ |