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>
This commit is contained in:
parent
5398b9d95f
commit
52328c26d9
|
@ -74,17 +74,17 @@ FILES_${PN} = ""
|
||||||
RDEPENDS_${PN}-dev = ""
|
RDEPENDS_${PN}-dev = ""
|
||||||
RDEPENDS_${PN}-staticdev = ""
|
RDEPENDS_${PN}-staticdev = ""
|
||||||
|
|
||||||
FILES_dhcp-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server"
|
FILES_${PN}-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server"
|
||||||
RRECOMMENDS_dhcp-server = "dhcp-server-config"
|
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"
|
FILES_${PN}-client = "${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${sysconfdir}/dhcp/dhclient.conf"
|
||||||
RDEPENDS_dhcp-client = "bash"
|
RDEPENDS_${PN}-client = "bash"
|
||||||
|
|
||||||
FILES_dhcp-omshell = "${bindir}/omshell"
|
FILES_${PN}-omshell = "${bindir}/omshell"
|
||||||
|
|
||||||
pkg_postinst_dhcp-server() {
|
pkg_postinst_dhcp-server() {
|
||||||
mkdir -p $D/${localstatedir}/lib/dhcp
|
mkdir -p $D/${localstatedir}/lib/dhcp
|
||||||
|
|
Loading…
Reference in New Issue