From: <changqing.li@windriver.com>
To: <openembedded-core@lists.openembedded.org>
Subject: [PATCH] libxcrypt.inc: use alternatives to resolve crypt.3 conflict
Date: Tue, 5 Dec 2023 09:41:55 +0800 [thread overview]
Message-ID: <20231205014155.3991250-1-changqing.li@windriver.com> (raw)
From: Changqing Li <changqing.li@windriver.com>
To fix:
Error: Transaction test error:
file /usr/share/man/man3/crypt.3 from install of
libcrypt-doc-4.4.33-r0.x86_64 conflicts with file from package
man-pages-6.04-r0.x86_64
Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
meta/recipes-core/libxcrypt/libxcrypt.inc | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc
index ba93d91aef..fe90ef4762 100644
--- a/meta/recipes-core/libxcrypt/libxcrypt.inc
+++ b/meta/recipes-core/libxcrypt/libxcrypt.inc
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSING;md5=c0a30e2b1502c55a7f37e412cd6c6a4b \
file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
"
-inherit autotools pkgconfig
+inherit autotools pkgconfig update-alternatives
SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH};protocol=https"
SRCREV = "f531a36aa916a22ef2ce7d270ba381e264250cbf"
@@ -26,4 +26,9 @@ CPPFLAGS:append:class-nativesdk = " -Wno-error"
API = "--disable-obsolete-api"
EXTRA_OECONF += "${API}"
+ALTERNATIVE_PRIORITY = "90"
+ALTERNATIVE:${PN}-doc = "crypt.3 crypt_r.3"
+ALTERNATIVE_LINK_NAME[crypt.3] = "${mandir}/man3/crypt.3"
+ALTERNATIVE_LINK_NAME[crypt_r.2] = "${mandir}/man3/crypt_r.3"
+
BBCLASSEXTEND = "native nativesdk"
--
2.25.1
next reply other threads:[~2023-12-05 1:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-05 1:41 changqing.li [this message]
2023-12-05 11:35 ` [OE-core] [PATCH] libxcrypt.inc: use alternatives to resolve crypt.3 conflict Alexandre Belloni
2023-12-05 11:47 ` Ross Burton
2023-12-05 18:27 ` Khem Raj
2023-12-06 5:33 ` Changqing Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231205014155.3991250-1-changqing.li@windriver.com \
--to=changqing.li@windriver.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.