From: Jacob Kroon <jacob.kroon@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: Re: [PATCH] readline/ediline: Fix conflicting manpages.
Date: Tue, 25 Feb 2020 14:08:52 +0100 [thread overview]
Message-ID: <a133657b-8b8f-a4e9-5999-41781f74db6d@gmail.com> (raw)
In-Reply-To: <20200222185400.32136-1-jpuhlman@mvista.com>
On 2/22/20 7:54 PM, Jeremy A. Puhlman wrote:
> From: Jeremy Puhlman <jpuhlman@mvista.com>
>
> file /usr/share/man/man3/history.3 conflicts between attempted installs of libedit-doc-20191231+3.1-r0.corei7_64 and readline-doc-8.0-r0.corei7_64
>
> Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com>
> ---
> meta/recipes-core/readline/readline.inc | 8 +++++++-
> meta/recipes-devtools/libedit/libedit_20191231-3.1.bb | 6 ++++++
> 2 files changed, 13 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-core/readline/readline.inc b/meta/recipes-core/readline/readline.inc
> index 07f54a76f1..4babcbd69a 100644
> --- a/meta/recipes-core/readline/readline.inc
> +++ b/meta/recipes-core/readline/readline.inc
> @@ -44,7 +44,13 @@ BBCLASSEXTEND = "native nativesdk"
>
> CONFFILES_${PN} += "${sysconfdir}/inputrc"
>
> +inherit update-alternatives
> +
> +ALTERNATIVE_PRIORITY = "100"
> +ALTERNATIVE_${PN} = "history.3"
> +ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3"
> +
> # OpenSuse injects versions into libreadline leading to conficits between our native one and theirs
> # see their spec file for where this is injected. Extra versioning is harmless so we just do the same.
> SRC_URI_append_class-native = " file://rl-native.map"
> -LDFLAGS_append_class-native = " -Wl,--version-script=${WORKDIR}/rl-native.map"
> \ No newline at end of file
> +LDFLAGS_append_class-native = " -Wl,--version-script=${WORKDIR}/rl-native.map"
> diff --git a/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb b/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb
> index 7116c9ddbc..267fdcc54a 100644
> --- a/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb
> +++ b/meta/recipes-devtools/libedit/libedit_20191231-3.1.bb
> @@ -17,3 +17,9 @@ SRC_URI[md5sum] = "2e22a51131de94ff2df24901f7cfe416"
> SRC_URI[sha256sum] = "dbb82cb7e116a5f8025d35ef5b4f7d4a3cdd0a3909a146a39112095a2d229071"
>
> BBCLASSEXTEND = "native nativesdk"
> +
> +inherit update-alternatives
> +
> +ALTERNATIVE_PRIORITY = "90"
> +ALTERNATIVE_${PN} = "history.3"
> +ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3"
>
With this change (I think), I now get a file
> +lrwxrwxrwx root root 38 ./usr/share/man/man3/history.3 -> /usr/share/man/man3/history.3.readline
in my rootfs, which is wierd since I don't have any other man pages in
my image..
/Jacob
next prev parent reply other threads:[~2020-02-25 13:08 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-22 18:54 [PATCH] readline/ediline: Fix conflicting manpages Jeremy A. Puhlman
2020-02-25 13:08 ` Jacob Kroon [this message]
2020-02-25 13:33 ` Richard Purdie
2020-02-25 14:34 ` Jacob Kroon
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=a133657b-8b8f-a4e9-5999-41781f74db6d@gmail.com \
--to=jacob.kroon@gmail.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.