From bbd6999a7249b7b99e434a4a01c8cedf540279bd Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Thu, 21 Apr 2011 15:04:58 +0100 Subject: Remove distro-specific metadata for distros not in oe-core (From OE-Core rev: ea2cd4b8e9bc013a007fe2a1a605ecb59db5a896) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/recipes-connectivity/dhcp/dhcp3.inc | 4 ---- meta/recipes-connectivity/dhcp/dhcp4.inc | 4 ---- meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb | 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) (limited to 'meta/recipes-connectivity/dhcp') 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 ${ RDEPENDS_dhcp-client = "bash" FILES_dhcp-omshell = "${bindir}/omshell" - -CONFFILES_dhcp-server_nylon = "/etc/dhcp/dhcpd.conf" -CONFFILES_dhcp-relay_nylon = "/etc/default/dhcp-relay" -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 ${ RDEPENDS_dhcp-client = "bash" FILES_dhcp-omshell = "${bindir}/omshell" - -CONFFILES_dhcp-server_nylon = "/etc/dhcp/dhcpd.conf" -CONFFILES_dhcp-relay_nylon = "/etc/default/dhcp-relay" -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 @@ require dhcp4.inc -PR = "r1" +PR = "r2" SRC_URI += "file://fixincludes.patch \ file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \ -- cgit v1.2.3-54-g00ecf