diff options
| author | Zhixiong Chi <zhixiong.chi@windriver.com> | 2015-07-31 10:20:25 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-01 10:45:58 +0100 |
| commit | c758dcc3109a5b491d13373073214bf526943497 (patch) | |
| tree | d22049b1970d8d9917129c6167ae7a0b0ce25350 /meta/recipes-connectivity/dhcp/dhcp.inc | |
| parent | 6ffb07715a289e2d3f57f4262beb92acb7280ea0 (diff) | |
| download | openembedded-core-c758dcc3109a5b491d13373073214bf526943497.tar.gz openembedded-core-c758dcc3109a5b491d13373073214bf526943497.tar.bz2 openembedded-core-c758dcc3109a5b491d13373073214bf526943497.zip | |
dhcp: fix installed not shipped warning for lib32
Modify the dhcp.inc with using the variable ${PN} instead of direct
packagename, so that the content will not be override after expanding
while we build the lib32-dhcp package with FILES_${PN}-xxxx_append.
Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/dhcp/dhcp.inc')
| -rw-r--r-- | meta/recipes-connectivity/dhcp/dhcp.inc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc b/meta/recipes-connectivity/dhcp/dhcp.inc index 3bf1ea958d..d883a8df48 100644 --- a/meta/recipes-connectivity/dhcp/dhcp.inc +++ b/meta/recipes-connectivity/dhcp/dhcp.inc @@ -74,17 +74,17 @@ FILES_${PN} = "" RDEPENDS_${PN}-dev = "" RDEPENDS_${PN}-staticdev = "" -FILES_dhcp-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server" -RRECOMMENDS_dhcp-server = "dhcp-server-config" +FILES_${PN}-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server" +RRECOMMENDS_${PN}-server = "dhcp-server-config" -FILES_dhcp-server-config = "${sysconfdir}/default/dhcp-server ${sysconfdir}/dhcp/dhcpd.conf" +FILES_${PN}-server-config = "${sysconfdir}/default/dhcp-server ${sysconfdir}/dhcp/dhcpd.conf" -FILES_dhcp-relay = "${sbindir}/dhcrelay ${sysconfdir}/init.d/dhcp-relay ${sysconfdir}/default/dhcp-relay" +FILES_${PN}-relay = "${sbindir}/dhcrelay ${sysconfdir}/init.d/dhcp-relay ${sysconfdir}/default/dhcp-relay" -FILES_dhcp-client = "${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${sysconfdir}/dhcp/dhclient.conf" -RDEPENDS_dhcp-client = "bash" +FILES_${PN}-client = "${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${sysconfdir}/dhcp/dhclient.conf" +RDEPENDS_${PN}-client = "bash" -FILES_dhcp-omshell = "${bindir}/omshell" +FILES_${PN}-omshell = "${bindir}/omshell" pkg_postinst_dhcp-server() { mkdir -p $D/${localstatedir}/lib/dhcp |