diff options
| author |   Li xin <lixin.fnst@cn.fujitsu.com> | 2016-04-26 12:52:52 +0300 |
|---|---|---|
| committer |   Joe MacDonald <joe_macdonald@mentor.com> | 2016-05-05 11:41:28 -0400 |
| commit | abc6e4965e758074b6ceb1f39809bb91c177ba95 (patch) | |
| tree | e7f3001558fa0fd88ef882a11a3105cc19e0d45e | |
| parent | 129681721827cdca51c288c359a0fc3aae3b3588 (diff) | |
| download | meta-openembedded-contrib-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.bb | 4 |
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 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() { |