diff options
| author |   Li xin <lixin.fnst@cn.fujitsu.com> | 2016-05-06 11:00:42 -0300 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2016-05-09 19:05:02 -0700 |
| commit | d82468252acc074b0cbddf5e425847403da1569d (patch) | |
| tree | 8e6ce7227e886d2f386d282cfbcba38274e805c4 /meta-networking | |
| parent | 6812a4a40aa572f994794d6fb74231b1042902d3 (diff) | |
| download | meta-openembedded-contrib-d82468252acc074b0cbddf5e425847403da1569d.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>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-networking')
| -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() { |