From abc6e4965e758074b6ceb1f39809bb91c177ba95 Mon Sep 17 00:00:00 2001 From: Li xin Date: Tue, 26 Apr 2016 12:52:52 +0300 Subject: 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 Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald --- meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'meta-networking') 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 d5f4a2025d..e1ca17fb32 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() { -- cgit 1.2.3-korg