diff options
author | Guojian <guojian.zhou@windriver.com> | 2017-08-19 15:17:38 +0800 |
---|---|---|
committer | Lans Zhang <lans.zhang2008@gmail.com> | 2017-08-19 15:17:38 +0800 |
commit | b8fd1f0fef43ff5bb1df086282715f7d4a83a76b (patch) | |
tree | d9116fb2e5cce1721c4a0192c16446706f092f3f | |
parent | 8544d2a4a570ea109bc6b78c1e51ebc1d57b985d (diff) | |
download | meta-secure-core-b8fd1f0fef43ff5bb1df086282715f7d4a83a76b.tar.gz |
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 <guojian.zhou@windriver.com>
-rw-r--r-- | meta-integrity/recipes-support/keyutils/keyutils_git.bb | 15 |
1 files changed, 15 insertions, 0 deletions
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() { | |||
47 | FILES_${PN} += "${datadir}/request-key-debug.sh" | 47 | FILES_${PN} += "${datadir}/request-key-debug.sh" |
48 | 48 | ||
49 | BBCLASSEXTEND = "native nativesdk" | 49 | BBCLASSEXTEND = "native nativesdk" |
50 | |||
51 | inherit update-alternatives | ||
52 | |||
53 | ALTERNATIVE_PRIORITY = "200" | ||
54 | ALTERNATIVE_${PN}-doc = "keyrings.7 persistent-keyring.7 process-keyring.7 \ | ||
55 | session-keyring.7 thread-keyring.7 user-keyring.7 \ | ||
56 | user-session-keyring.7 \ | ||
57 | " | ||
58 | ALTERNATIVE_LINK_NAME[keyrings.7] = "${mandir}/man7/keyrings.7" | ||
59 | ALTERNATIVE_LINK_NAME[persistent-keyring.7] = "${mandir}/man7/persistent-keyring.7" | ||
60 | ALTERNATIVE_LINK_NAME[process-keyring.7] = "${mandir}/man7/process-keyring.7" | ||
61 | ALTERNATIVE_LINK_NAME[session-keyring.7] = "${mandir}/man7/session-keyring.7" | ||
62 | ALTERNATIVE_LINK_NAME[thread-keyring.7] = "${mandir}/man7/thread-keyring.7" | ||
63 | ALTERNATIVE_LINK_NAME[user-keyring.7] = "${mandir}/man7/user-keyring.7" | ||
64 | ALTERNATIVE_LINK_NAME[user-session-keyring.7] = "${mandir}/man7/user-session-keyring.7" | ||