| Submitter | Saul Wold |
|---|---|
| Date | Jan. 30, 2013, 11:48 p.m. |
| Message ID | <1359589717-30779-1-git-send-email-sgw@linux.intel.com> |
| Download | mbox | patch |
| Permalink | /patch/43725/ |
| State | Accepted |
| Commit | d3c6125001516955faf8fa52032cb18681238916 |
| Headers | show |
Comments
Patch
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 \
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@linux.intel.com> --- meta/recipes-connectivity/dhcp/dhcp.inc | 4 ++-- meta/recipes-connectivity/dhcp/dhcp_4.2.5.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)