From: Li xin <[email protected]> error: file /usr/share/doc/README from install of rp-pppoe-doc-3.11-* conflicts with file from package dmidecode-doc-2.12*
Signed-off-by: Li Xin <[email protected]> Signed-off-by: Martin Jansa <[email protected]> Signed-off-by: Joe MacDonald <[email protected]> Signed-off-by: Otavio Salvador <[email protected]> --- meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb index d5f4a20..e1ca17f 100644 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb @@ -29,6 +29,10 @@ do_install_append() { install -m 0644 ${WORKDIR}/pppoe-server.service ${D}${systemd_unitdir}/system sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/pppoe-server.service sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/pppoe-server.service + install -d ${D}${datadir}/doc/${PN} + if [ -f ${D}${datadir}/doc/README ]; then + mv ${D}${datadir}/doc/README ${D}${datadir}/doc/${PN}/ + fi } do_install() { -- 2.8.2 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
