summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorZhixiong Chi <zhixiong.chi@windriver.com>2015-07-31 10:20:25 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-01 22:24:13 +0100
commit52328c26d996f3086389559d8f70aac890d94f2f (patch)
tree31cc691ffbd254d8707e019ce042d0614129ecb8 /meta
parent5398b9d95feb6d52eaf28d5ce068f49b7b1e67a6 (diff)
downloadpoky-52328c26d996f3086389559d8f70aac890d94f2f.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) 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.inc14
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} = ""
74RDEPENDS_${PN}-dev = "" 74RDEPENDS_${PN}-dev = ""
75RDEPENDS_${PN}-staticdev = "" 75RDEPENDS_${PN}-staticdev = ""
76 76
77FILES_dhcp-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server" 77FILES_${PN}-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server"
78RRECOMMENDS_dhcp-server = "dhcp-server-config" 78RRECOMMENDS_${PN}-server = "dhcp-server-config"
79 79
80FILES_dhcp-server-config = "${sysconfdir}/default/dhcp-server ${sysconfdir}/dhcp/dhcpd.conf" 80FILES_${PN}-server-config = "${sysconfdir}/default/dhcp-server ${sysconfdir}/dhcp/dhcpd.conf"
81 81
82FILES_dhcp-relay = "${sbindir}/dhcrelay ${sysconfdir}/init.d/dhcp-relay ${sysconfdir}/default/dhcp-relay" 82FILES_${PN}-relay = "${sbindir}/dhcrelay ${sysconfdir}/init.d/dhcp-relay ${sysconfdir}/default/dhcp-relay"
83 83
84FILES_dhcp-client = "${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${sysconfdir}/dhcp/dhclient.conf" 84FILES_${PN}-client = "${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${sysconfdir}/dhcp/dhclient.conf"
85RDEPENDS_dhcp-client = "bash" 85RDEPENDS_${PN}-client = "bash"
86 86
87FILES_dhcp-omshell = "${bindir}/omshell" 87FILES_${PN}-omshell = "${bindir}/omshell"
88 88
89pkg_postinst_dhcp-server() { 89pkg_postinst_dhcp-server() {
90 mkdir -p $D/${localstatedir}/lib/dhcp 90 mkdir -p $D/${localstatedir}/lib/dhcp