[oe-commits] [meta-openembedded] 03/03: eject: use update-alternatives for manpage

git at git.openembedded.org git at git.openembedded.org
Wed Mar 22 12:44:52 UTC 2017


This is an automated email from the git hooks/post-receive script.

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

commit d63e5687c7bf6b054c6ed2fc4790e4970b023219
Author: Paul Gortmaker <paul.gortmaker at windriver.com>
AuthorDate: Thu Mar 16 10:29:52 2017 -0400

    eject: use update-alternatives for manpage
    
    To fix:
    
       file /usr/share/man/man1/eject.1 conflicts between attempted installs
       of util-linux-doc-2.29.1-r0.core2_64 and eject-doc-2.1.5-r1.core2_64
    
    Signed-off-by: Paul Gortmaker <paul.gortmaker at windriver.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 meta-oe/recipes-support/eject/eject_2.1.5.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-oe/recipes-support/eject/eject_2.1.5.bb b/meta-oe/recipes-support/eject/eject_2.1.5.bb
index 0440f0c..49a3d74 100644
--- a/meta-oe/recipes-support/eject/eject_2.1.5.bb
+++ b/meta-oe/recipes-support/eject/eject_2.1.5.bb
@@ -33,3 +33,5 @@ ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
 ALTERNATIVE_PRIORITY[volname] = "100"
 ALTERNATIVE_PRIORITY[eject] = "100"
 
+ALTERNATIVE_${PN}-doc = "eject.1"
+ALTERNATIVE_LINK_NAME[eject.1] = "${mandir}/man1/eject.1"

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


More information about the Openembedded-commits mailing list