[PATCH] man-pages: use alternatives to resolve crypt.3 conflict

[PATCH] man-pages: use alternatives to resolve crypt.3 conflict

[Mark Asselstine]

From: mark asselstine <masselst@yow-cube2.wrs.com>

To fix:

  Error: Transaction check error:
    file /usr/share/man/man3/crypt.3 conflicts between attempted installs
    of libcrypt-doc-4.4.1-r0.core2_64 and man-pages-4.16-r0.core2_64

This issue came about after commit 59be9254df9f [libxcrypt: Upgrade to
4.4.1 release].

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
---
 meta/recipes-extended/man-pages/man-pages_4.16.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-extended/man-pages/man-pages_4.16.bb b/meta/recipes-extended/man-pages/man-pages_4.16.bb
index a64587c..1f14c89 100644
--- a/meta/recipes-extended/man-pages/man-pages_4.16.bb
+++ b/meta/recipes-extended/man-pages/man-pages_4.16.bb
@@ -31,6 +31,7 @@ FILES_${PN} = "${mandir}/*"
 inherit update-alternatives
 
 ALTERNATIVE_PRIORITY = "100"
-ALTERNATIVE_${PN} = "passwd.5 getspnam.3"
+ALTERNATIVE_${PN} = "passwd.5 getspnam.3 crypt.3"
 ALTERNATIVE_LINK_NAME[passwd.5] = "${mandir}/man5/passwd.5"
 ALTERNATIVE_LINK_NAME[getspnam.3] = "${mandir}/man3/getspnam.3"
+ALTERNATIVE_LINK_NAME[crypt.3] = "${mandir}/man3/crypt.3"
-- 
2.7.4

Re: [PATCH] man-pages: use alternatives to resolve crypt.3 conflict

[Mark Asselstine]

On Thursday, December 20, 2018 10:34:54 AM EST Mark Asselstine wrote:
> From: mark asselstine <masselst@yow-cube2.wrs.com>
> 
> To fix:
> 
>   Error: Transaction check error:
>     file /usr/share/man/man3/crypt.3 conflicts between attempted installs
>     of libcrypt-doc-4.4.1-r0.core2_64 and man-pages-4.16-r0.core2_64
> 
> This issue came about after commit 59be9254df9f [libxcrypt: Upgrade to
> 4.4.1 release].
> 
> Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
> ---

This issue is still persisting. Any reason for this not being picked up yet?

Mark

>  meta/recipes-extended/man-pages/man-pages_4.16.bb | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-extended/man-pages/man-pages_4.16.bb
> b/meta/recipes-extended/man-pages/man-pages_4.16.bb index a64587c..1f14c89
> 100644
> --- a/meta/recipes-extended/man-pages/man-pages_4.16.bb
> +++ b/meta/recipes-extended/man-pages/man-pages_4.16.bb
> @@ -31,6 +31,7 @@ FILES_${PN} = "${mandir}/*"
>  inherit update-alternatives
> 
>  ALTERNATIVE_PRIORITY = "100"
> -ALTERNATIVE_${PN} = "passwd.5 getspnam.3"
> +ALTERNATIVE_${PN} = "passwd.5 getspnam.3 crypt.3"
>  ALTERNATIVE_LINK_NAME[passwd.5] = "${mandir}/man5/passwd.5"
>  ALTERNATIVE_LINK_NAME[getspnam.3] = "${mandir}/man3/getspnam.3"
> +ALTERNATIVE_LINK_NAME[crypt.3] = "${mandir}/man3/crypt.3"

Re: [PATCH] man-pages: use alternatives to resolve crypt.3 conflict

[richard.purdie]

On Wed, 2019-01-02 at 13:39 -0500, Mark Asselstine wrote:
> On Thursday, December 20, 2018 10:34:54 AM EST Mark Asselstine wrote:
> > From: mark asselstine <masselst@yow-cube2.wrs.com>
> > 
> > To fix:
> > 
> >   Error: Transaction check error:
> >     file /usr/share/man/man3/crypt.3 conflicts between attempted
> > installs
> >     of libcrypt-doc-4.4.1-r0.core2_64 and man-pages-4.16-
> > r0.core2_64
> > 
> > This issue came about after commit 59be9254df9f [libxcrypt: Upgrade
> > to
> > 4.4.1 release].
> > 
> > Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
> > ---
> 
> This issue is still persisting. Any reason for this not being picked
> up yet?

Vacation and being human :)

Its queued in -next, I thought I'd picked it up previously...

Cheers,

Richard

Re: [PATCH] man-pages: use alternatives to resolve crypt.3 conflict

[Mark Asselstine]

On Wednesday, January 2, 2019 4:23:58 PM EST 
richard.purdie@linuxfoundation.org wrote:
> On Wed, 2019-01-02 at 13:39 -0500, Mark Asselstine wrote:
> > On Thursday, December 20, 2018 10:34:54 AM EST Mark Asselstine wrote:
> > > From: mark asselstine <masselst@yow-cube2.wrs.com>
> > > 
> > > To fix:
> > >   Error: Transaction check error:
> > >     file /usr/share/man/man3/crypt.3 conflicts between attempted
> > > 
> > > installs
> > > 
> > >     of libcrypt-doc-4.4.1-r0.core2_64 and man-pages-4.16-
> > > 
> > > r0.core2_64
> > > 
> > > This issue came about after commit 59be9254df9f [libxcrypt: Upgrade
> > > to
> > > 4.4.1 release].
> > > 
> > > Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
> > > ---
> > 
> > This issue is still persisting. Any reason for this not being picked
> > up yet?
> 
> Vacation and being human :)
> 
> Its queued in -next, I thought I'd picked it up previously...

Thanks Richard. I knew that it was getting close to the holidays when I sent 
it out, I guess I cut it too close

MarkA

> 
> Cheers,
> 
> Richard