[oe-commits] [meta-openembedded] 10/11: rp-pppoe: Fix rootfs creation errors

[git at git.openembedded.org]

martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.

commit 8f48a1067cab14495e1d4b1925c3fe0130caeeab
Author: Li xin <lixin.fnst at cn.fujitsu.com>
AuthorDate: Tue Apr 26 12:52:52 2016 +0300

    rp-pppoe: Fix rootfs creation errors
    
    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 <lixin.fnst at cn.fujitsu.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 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() {

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.