Skip to contentSkip to conversation

dhcp: Fix unshipped WARNINGS

PATCH New Saul Wold 1 participant 1 message Jan 31, 2013

lore
Share & tools
lore

Saul Wold

author
#0 lore raw

PATCH 1/1 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

---
 meta/recipes-connectivity/dhcp/dhcp.inc      | 4 ++--
 meta/recipes-connectivity/dhcp/dhcp_4.2.5.bb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-connectivity/dhcp/dhcp.inc +2 -2
index 3159f93..ad82b57 100644
@@ -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
 
meta/recipes-connectivity/dhcp/dhcp_4.2.5.bb +1 -1
index af60763..0f247ae 100644
@@ -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 \
Signature · 1 line
1.8.0.2