On Wed, 2023-03-08 at 09:40 +0800, wangmy wrote:
> From: Wang Mingyu <wan...@fujitsu.com>
>
> Error: Transaction test error:
> file /usr/share/man/man8/dhcpcd.8 conflicts between attempted installs of
> dhcpcd-doc-9.4.1-r0.cortexa57 and lib32-dhcpcd-doc-9.4.1-r0.armv7ahf_neon
>
> The differences between the two files are as follows:
> @@ -821,7 +821,7 @@
> If you always use the same options, put them here.
> .It Pa /usr/libexec/dhcpcd-run-hooks
> Bourne shell script that is run to configure or de-configure an interface.
> -.It Pa /usr/lib64/dhcpcd/dev
> +.It Pa /usr/lib/dhcpcd/dev
> Linux
> .Pa /dev
> management modules.
>
>
> Signed-off-by: Wang Mingyu <wan...@fujitsu.com>
> ---
> meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb
> b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb
> index 39e689d2f6..03dbf31b35 100644
> --- a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb
> +++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb
> @@ -62,3 +62,6 @@ do_install:append () {
> }
>
> FILES:${PN}-dbg += "${libdir}/dhcpcd/dev/.debug"
> +
> +inherit multilib_script
> +MULTILIB_SCRIPTS = "${PN}-doc:${datadir}/man/man8/dhcpcd.8"
For something as simple as that we should just patch the docs to say
/usr/<libdir>/dhcpcd/dev rather than trying to manage multiple
versions.
Cheers,
Richard
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#178157):
https://lists.openembedded.org/g/openembedded-core/message/178157
Mute This Topic: https://lists.openembedded.org/mt/97464365/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
