From b8fd1f0fef43ff5bb1df086282715f7d4a83a76b Mon Sep 17 00:00:00 2001 From: Guojian Date: Sat, 19 Aug 2017 15:17:38 +0800 Subject: keyutils: Fix keyutils man7 files conflict with man-pages same name files (#3) The keyutils-doc package supply some same name man7 files with man-pages, it will cause the rpm package installation or upgrade failed. The keyutils-doc and man-pages rpm packages' transction check error information is as following: -------------------------------------------------------------------- Running transaction test Error: Transaction check error: file /usr/share/man/man7/keyrings.7 from install of keyutils-doc-1.5.9+git0+9209a0c8fd-r0.0.core2_64 conflicts with file from package man-pages-4.11-r0.0.core2_64 file /usr/share/man/man7/persistent-keyring.7 from install of keyutils-doc-1.5.9+git0+9209a0c8fd-r0.0.core2_64 conflicts with file from package man-pages-4.11-r0.0.core2_64 file /usr/share/man/man7/process-keyring.7 from install of keyutils-doc-1.5.9+git0+9209a0c8fd-r0.0.core2_64 conflicts with file from package man-pages-4.11-r0.0.core2_64 file /usr/share/man/man7/session-keyring.7 from install of keyutils-doc-1.5.9+git0+9209a0c8fd-r0.0.core2_64 conflicts with file from package man-pages-4.11-r0.0.core2_64 file /usr/share/man/man7/thread-keyring.7 from install of keyutils-doc-1.5.9+git0+9209a0c8fd-r0.0.core2_64 conflicts with file from package man-pages-4.11-r0.0.core2_64 file /usr/share/man/man7/user-keyring.7 from install of keyutils-doc-1.5.9+git0+9209a0c8fd-r0.0.core2_64 conflicts with file from package man-pages-4.11-r0.0.core2_64 file /usr/share/man/man7/user-session-keyring.7 from install of keyutils-doc-1.5.9+git0+9209a0c8fd-r0.0.core2_64 conflicts with file from package man-pages-4.11-r0.0.core2_64 Signed-off-by: Guojian Zhou --- meta-integrity/recipes-support/keyutils/keyutils_git.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'meta-integrity') diff --git a/meta-integrity/recipes-support/keyutils/keyutils_git.bb b/meta-integrity/recipes-support/keyutils/keyutils_git.bb index e88e75b..325bb7c 100644 --- a/meta-integrity/recipes-support/keyutils/keyutils_git.bb +++ b/meta-integrity/recipes-support/keyutils/keyutils_git.bb @@ -47,3 +47,18 @@ do_install() { FILES_${PN} += "${datadir}/request-key-debug.sh" BBCLASSEXTEND = "native nativesdk" + +inherit update-alternatives + +ALTERNATIVE_PRIORITY = "200" +ALTERNATIVE_${PN}-doc = "keyrings.7 persistent-keyring.7 process-keyring.7 \ + session-keyring.7 thread-keyring.7 user-keyring.7 \ + user-session-keyring.7 \ +" +ALTERNATIVE_LINK_NAME[keyrings.7] = "${mandir}/man7/keyrings.7" +ALTERNATIVE_LINK_NAME[persistent-keyring.7] = "${mandir}/man7/persistent-keyring.7" +ALTERNATIVE_LINK_NAME[process-keyring.7] = "${mandir}/man7/process-keyring.7" +ALTERNATIVE_LINK_NAME[session-keyring.7] = "${mandir}/man7/session-keyring.7" +ALTERNATIVE_LINK_NAME[thread-keyring.7] = "${mandir}/man7/thread-keyring.7" +ALTERNATIVE_LINK_NAME[user-keyring.7] = "${mandir}/man7/user-keyring.7" +ALTERNATIVE_LINK_NAME[user-session-keyring.7] = "${mandir}/man7/user-session-keyring.7" -- cgit v1.2.3-54-g00ecf