From 193f76b8ab7ac3539653920e9358e09d028c3db2 Mon Sep 17 00:00:00 2001 From: Josep Puigdemont Date: Thu, 10 Sep 2015 11:15:45 +0200 Subject: dhcp: fix QA issue files installed but not shipped The value of FILES set in this bbappend was overriden after bitbake expanded it from the value set in the recipe. This patch solves this issue: WARNING: Variable key FILES_${PN}-client (${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${sysconfdir}/dhcp/dhclient.conf) replaces original key FILES_dhcp-client ( ${sysconfdir}/dhcp/dhclient-exit-hooks ). WARNING: Variable key FILES_${PN}-client (${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${sysconfdir}/dhcp/dhclient.conf) replaces original key FILES_dhcp-client ( ${sysconfdir}/dhcp/dhclient-exit-hooks ). ERROR: QA Issue: dhcp: Files/directories were installed but not shipped /etc/dhcp/dhclient-exit-hooks [installed-vs-shipped] WARNING: Variable key FILES_${PN}-client (${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${sysconfdir}/dhcp/dhclient.conf) replaces original key FILES_dhcp-client ( ${sysconfdir}/dhcp/dhclient-exit-hooks ). WARNING: Variable key FILES_${PN}-client (${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${sysconfdir}/dhcp/dhclient.conf) replaces original key FILES_dhcp-client ( ${sysconfdir}/dhcp/dhclient-exit-hooks ). WARNING: Variable key FILES_${PN}-client (${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${sysconfdir}/dhcp/dhclient.conf) replaces original key FILES_dhcp-client ( ${sysconfdir}/dhcp/dhclient-exit-hooks ). Signed-off-by: Josep Puigdemont Signed-off-by: Bruce Ashfield --- recipes-connectivity/dhcp/dhcp_%.bbappend | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'recipes-connectivity') diff --git a/recipes-connectivity/dhcp/dhcp_%.bbappend b/recipes-connectivity/dhcp/dhcp_%.bbappend index a23f7c9..2babae9 100644 --- a/recipes-connectivity/dhcp/dhcp_%.bbappend +++ b/recipes-connectivity/dhcp/dhcp_%.bbappend @@ -12,5 +12,6 @@ do_install_append () { } -FILES_dhcp-client += "${sysconfdir}/dhcp/dhclient-exit-hooks \ - " +FILES_${PN}-client += " \ + ${sysconfdir}/dhcp/dhclient-exit-hooks \ + " -- cgit v1.2.3-54-g00ecf