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-09 16:37:44 -0700 |
commit | 66941f0c08ecd81f7a66b62b9d42d5a139f9484c (patch) | |
tree | 40ff608f8e0c5fec99e4ffacc869d2e90444878a /meta | |
parent | 13e7544ae9191d2c3eca5e6ae52eb7c22f9bfebf (diff) | |
download | poky-66941f0c08ecd81f7a66b62b9d42d5a139f9484c.tar.gz |
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.
(From OE-Core rev: c758dcc3109a5b491d13373073214bf526943497)
(From OE-Core rev: 7436d12c9b40502a5e1ec670d76cc9ab755cbaba)
Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 6ced77500a..d6384e4601 100644 --- a/meta/recipes-connectivity/dhcp/dhcp.inc +++ b/meta/recipes-connectivity/dhcp/dhcp.inc | |||
@@ -70,17 +70,17 @@ FILES_${PN} = "" | |||
70 | RDEPENDS_${PN}-dev = "" | 70 | RDEPENDS_${PN}-dev = "" |
71 | RDEPENDS_${PN}-staticdev = "" | 71 | RDEPENDS_${PN}-staticdev = "" |
72 | 72 | ||
73 | FILES_dhcp-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server" | 73 | FILES_${PN}-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server" |
74 | RRECOMMENDS_dhcp-server = "dhcp-server-config" | 74 | RRECOMMENDS_${PN}-server = "dhcp-server-config" |
75 | 75 | ||
76 | FILES_dhcp-server-config = "${sysconfdir}/default/dhcp-server ${sysconfdir}/dhcp/dhcpd.conf" | 76 | FILES_${PN}-server-config = "${sysconfdir}/default/dhcp-server ${sysconfdir}/dhcp/dhcpd.conf" |
77 | 77 | ||
78 | FILES_dhcp-relay = "${sbindir}/dhcrelay ${sysconfdir}/init.d/dhcp-relay ${sysconfdir}/default/dhcp-relay" | 78 | FILES_${PN}-relay = "${sbindir}/dhcrelay ${sysconfdir}/init.d/dhcp-relay ${sysconfdir}/default/dhcp-relay" |
79 | 79 | ||
80 | FILES_dhcp-client = "${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${sysconfdir}/dhcp/dhclient.conf" | 80 | FILES_${PN}-client = "${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${sysconfdir}/dhcp/dhclient.conf" |
81 | RDEPENDS_dhcp-client = "bash" | 81 | RDEPENDS_${PN}-client = "bash" |
82 | 82 | ||
83 | FILES_dhcp-omshell = "${bindir}/omshell" | 83 | FILES_${PN}-omshell = "${bindir}/omshell" |
84 | 84 | ||
85 | pkg_postinst_dhcp-server() { | 85 | pkg_postinst_dhcp-server() { |
86 | mkdir -p $D/${localstatedir}/lib/dhcp | 86 | mkdir -p $D/${localstatedir}/lib/dhcp |