dhcp: Fix unshipped WARNINGS

This fixes:
WARNING: QA Issue: dhcp: Files/directories were installed but not shipped
  /etc/dhcpd.conf.example
  /etc/dhclient.conf.example

(From OE-Core rev: 209c7a31ff62291a1aa21dfa4062c7fd3d1a6155)

(From OE-Core rev: d3c6125001516955faf8fa52032cb18681238916)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 3 insertions, 3 deletions

diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc b/meta/recipes-connectivity/dhcp/dhcp.inc
index 3159f93850..ad82b57669 100644
--- a/meta/recipes-connectivity/dhcp/dhcp.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp.inc
@@ -41,8 +41,8 @@ do_install_append () {
         install -m 0755 ${WORKDIR}/init-server ${D}${sysconfdir}/init.d/dhcp-server
         install -m 0644 ${WORKDIR}/default-server ${D}${sysconfdir}/default/dhcp-server
 
-        rm -f ${D}${sysconfdir}/dhclient.conf
-        rm -f ${D}${sysconfdir}/dhcpd.conf
+        rm -f ${D}${sysconfdir}/dhclient.conf*
+        rm -f ${D}${sysconfdir}/dhcpd.conf*
         install -m 0644 ${WORKDIR}/dhclient.conf ${D}${sysconfdir}/dhcp/dhclient.conf
         install -m 0644 ${WORKDIR}/dhcpd.conf ${D}${sysconfdir}/dhcp/dhcpd.conf
 
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.2.5.bb b/meta/recipes-connectivity/dhcp/dhcp_4.2.5.bb
index af60763016..0f247ae055 100644
--- a/meta/recipes-connectivity/dhcp/dhcp_4.2.5.bb
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.2.5.bb
@@ -1,6 +1,6 @@
 require dhcp.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI += "file://fixincludes.patch \
             file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \