Skip to contentSkip to conversation

libxcrypt.inc: use alternatives to resolve crypt.3 conflict

PATCH New [email protected] 2 participants 4 messages Dec 6, 2023 – Dec 21, 2023 2 messages not in the archive

lore
Share & tools
lore
#1 lore raw

PATCH v2 1/1 libxcrypt.inc: use alternatives to resolve crypt.3 conflict

In reply to a message not in the archive

From: Changqing Li <[email protected]>

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

---
 meta/recipes-core/libxcrypt/libxcrypt.inc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
meta/recipes-core/libxcrypt/libxcrypt.inc +6 -1
index ba93d91aef..1a45df2618 100644
@@ -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 = "200"
+ALTERNATIVE:${PN}-doc = "crypt.3 crypt_r.3"
+ALTERNATIVE_LINK_NAME[crypt.3] = "${mandir}/man3/crypt.3"
+ALTERNATIVE_LINK_NAME[crypt_r.3] = "${mandir}/man3/crypt_r.3"
+
 BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.25.1
#3 lore raw
In reply to a message not in the archive

Kindly ping

And why have this change:

In old version of man-pages's README,  it mentioned:

Note that sometimes these pages are duplicates of pages also distributed in other packages. Be careful not to overwrite more up-to-date versions.

So we set man-pages to lower priority,  so the doc in the related packages are used.

And if we delete them from man-pages recipes, it will make man-pages missing these docs

when eg: libcrypt-doc is not installed.

in man-pages recipe, ALTERNATIVE_PRIORITY set to 100. So I send an V2 to update

ALTERNATIVE_PRIORITY of libcrypt-doc to 200.

Regards

Changqing

Quoted 46 lines · Changqing Li

From: Changqing Li <[email protected]>

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

---
  meta/recipes-core/libxcrypt/libxcrypt.inc | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
meta/recipes-core/libxcrypt/libxcrypt.inc +6 -2
index ba93d91aef..1a45df2618 100644
@@ -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 = "200"
+ALTERNATIVE:${PN}-doc = "crypt.3 crypt_r.3"
+ALTERNATIVE_LINK_NAME[crypt.3] = "${mandir}/man3/crypt.3"
+ALTERNATIVE_LINK_NAME[crypt_r.3] = "${mandir}/man3/crypt_r.3"
+
  BBCLASSEXTEND = "native nativesdk"
 
-=-=-=-=-=-=-=-=-=-=-=-

Links: You receive all messages sent to this group.
View/Reply Online (#191868): https://lists.openembedded.org/g/openembedded-core/message/191868
Mute This Topic: https://lists.openembedded.org/mt/103008188/3616873
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#4 lore raw
Quoted 18 lines · Changqing Li

Kindly ping

And why have this change:

In old version of man-pages's README,  it mentioned:

Note that sometimes these pages are duplicates of pages also distributed in other
packages. Be careful not to overwrite more up-to-date versions.

So we set man-pages to lower priority,  so the doc in the related packages are used.

And if we delete them from man-pages recipes, it will make man-pages missing these docs

Quoted 6 lines

when eg: libcrypt-doc is not installed.

in man-pages recipe, ALTERNATIVE_PRIORITY set to 100. So I send an V2 to update

ALTERNATIVE_PRIORITY of libcrypt-doc to 200.

Please delete the version from man-pages. Those are only added there if the upstream doesn't have a man page. libxcrypt does now have this so the doc isn't needed from there.

I suspect a future version of man-pages will do this anyway.

Cheers,

Richard

#5 lore raw
Quoted 24 lines · Richard Purdie

CAUTION: This email comes from a non Wind River email account!
Do not click links or open attachments unless you recognize the sender and know the content is safe.

Quoted 20 lines · Changqing Li

Kindly ping

And why have this change:

In old version of man-pages's README, it mentioned:

Note that sometimes these pages are duplicates of pages also distributed in other
packages. Be careful not to overwrite more up-to-date versions.

So we set man-pages to lower priority, so the doc in the related packages are used.

And if we delete them from man-pages recipes, it will make man-pages missing these docs

when eg: libcrypt-doc is not installed.

Quoted 7 lines
Quoted 4 lines

in man-pages recipe, ALTERNATIVE_PRIORITY set to 100. So I send an V2 to update

ALTERNATIVE_PRIORITY of libcrypt-doc to 200.

Please delete the version from man-pages. Those are only added there if the upstream doesn't have a man page. libxcrypt does now have this so the doc isn't needed from there.

Thanks for explaining this,   V3 is sent.

Regards

Changqing

Quoted 15 lines

I suspect a future version of man-pages will do this anyway.

Cheers,

Richard

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192694): https://lists.openembedded.org/g/openembedded-core/message/192694
Mute This Topic: https://lists.openembedded.org/mt/103008188/3616873
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-