summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLi xin <lixin.fnst@cn.fujitsu.com>2016-04-26 12:52:52 +0300
committerJoe MacDonald <joe_macdonald@mentor.com>2016-05-05 11:41:28 -0400
commitabc6e4965e758074b6ceb1f39809bb91c177ba95 (patch)
treee7f3001558fa0fd88ef882a11a3105cc19e0d45e
parent129681721827cdca51c288c359a0fc3aae3b3588 (diff)
downloadmeta-openembedded-abc6e4965e758074b6ceb1f39809bb91c177ba95.tar.gz
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@cn.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
-rw-r--r--meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb4
1 files changed, 4 insertions, 0 deletions
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 d5f4a2025..e1ca17fb3 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() {
29 install -m 0644 ${WORKDIR}/pppoe-server.service ${D}${systemd_unitdir}/system 29 install -m 0644 ${WORKDIR}/pppoe-server.service ${D}${systemd_unitdir}/system
30 sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/pppoe-server.service 30 sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/pppoe-server.service
31 sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/pppoe-server.service 31 sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/pppoe-server.service
32 install -d ${D}${datadir}/doc/${PN}
33 if [ -f ${D}${datadir}/doc/README ]; then
34 mv ${D}${datadir}/doc/README ${D}${datadir}/doc/${PN}/
35 fi
32} 36}
33 37
34do_install() { 38do_install() {