[oe-commits] Saul Wold : dhcp: Fix unshipped WARNINGS

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 209c7a31ff62291a1aa21dfa4062c7fd3d1a6155
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=209c7a31ff62291a1aa21dfa4062c7fd3d1a6155

Author: Saul Wold <sgw at linux.intel.com>
Date:   Wed Jan 30 15:48:37 2013 -0800

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

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

---

 meta/recipes-connectivity/dhcp/dhcp.inc      |    4 ++--
 meta/recipes-connectivity/dhcp/dhcp_4.2.5.bb |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc b/meta/recipes-connectivity/dhcp/dhcp.inc
index 3159f93..ad82b57 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 af60763..0f247ae 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 \