Re: [meta-arago] [master/kirkstone][PATCH] all: unbreak populate_sdk task (again)

* Re: [meta-arago] [master/kirkstone][PATCH] all: unbreak populate_sdk task (again)
       [not found] <17474F7B5189B28F.29542@lists.yoctoproject.org>
@ 2023-03-06 21:02 ` Denys Dmytriyenko
  2023-03-06 21:43   ` Ryan Eatmon
       [not found]   ` <1749F28D254109F2.1452@lists.yoctoproject.org>
  0 siblings, 2 replies; 3+ messages in thread
From: Denys Dmytriyenko @ 2023-03-06 21:02 UTC (permalink / raw)
  To: meta-arago

Ping.

On Sun, Feb 26, 2023 at 07:32:51AM +0000, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko <denys@konsulko.com>
> 
> Being able to run populate_sdk task against minimal and base images
> has always been supported by Arago, though needed to get fixed once
> in a while, e.g.:
> https://git.yoctoproject.org/meta-arago/commit/?id=d47710c8219e036cb7005bc0a22099e63c5e1901
> 
> This time around the issue is due to upstream packages lmbench and
> mbedtls both installing /usr/bin/hello binary and causing a conflict
> when the files collide in the sysroot.
> 
> The fix has been submitted upstream to meta-oe and meta-networking
> layers of the meta-openembedded repo:
> https://patchwork.yoctoproject.org/project/oe/list/?series=10748
> 
> For now add local bbappends with the same fix, which can be removed
> when the fix is merged upstream and backported to kirkstone.
> 
> While at it, also look into the conflict caused by matrix launcher
> packaging function being reused by multiple subpackages, resulting
> in lots of file conflicts between them. There's a lot of rework
> required for the matrix (and it might get moved to another layer
> altogether), but for now just cutoff the reverse dependency from
> development -dev packages.
> 
> With this simple change it is now possible to run populate_sdk task
> even against the default full/graphics tisdk-default-image.
> 
> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
> ---
>  .../recipes-benchmark/lmbench/lmbench_%.bbappend              | 2 ++
>  .../recipes-connectivity/mbedtls/mbedtls_%.bbappend           | 4 ++++
>  meta-arago-extras/recipes-core/matrix/matrix-gui-apps.inc     | 3 +++
>  3 files changed, 9 insertions(+)
>  create mode 100644 meta-arago-distro/recipes-benchmark/lmbench/lmbench_%.bbappend
>  create mode 100644 meta-arago-distro/recipes-connectivity/mbedtls/mbedtls_%.bbappend
> 
> diff --git a/meta-arago-distro/recipes-benchmark/lmbench/lmbench_%.bbappend b/meta-arago-distro/recipes-benchmark/lmbench/lmbench_%.bbappend
> new file mode 100644
> index 00000000..96dd2010
> --- /dev/null
> +++ b/meta-arago-distro/recipes-benchmark/lmbench/lmbench_%.bbappend
> @@ -0,0 +1,2 @@
> +ALTERNATIVE:${PN} += "hello"
> +ALTERNATIVE_LINK_NAME[hello] = "${bindir}/hello"
> diff --git a/meta-arago-distro/recipes-connectivity/mbedtls/mbedtls_%.bbappend b/meta-arago-distro/recipes-connectivity/mbedtls/mbedtls_%.bbappend
> new file mode 100644
> index 00000000..f3c16796
> --- /dev/null
> +++ b/meta-arago-distro/recipes-connectivity/mbedtls/mbedtls_%.bbappend
> @@ -0,0 +1,4 @@
> +inherit update-alternatives
> +
> +ALTERNATIVE:${PN}-programs += "hello"
> +ALTERNATIVE_LINK_NAME[hello] = "${bindir}/hello"
> diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-apps.inc b/meta-arago-extras/recipes-core/matrix/matrix-gui-apps.inc
> index 2bcc908b..adb998e1 100644
> --- a/meta-arago-extras/recipes-core/matrix/matrix-gui-apps.inc
> +++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-apps.inc
> @@ -38,3 +38,6 @@ do_install:append(){
>      # other appends.
>      cd -
>  }
> +
> +RDEPENDS:${PN}-dev = ""
> +RRECOMMENDS:${PN}-dev = ""
> -- 
> 2.25.1

^ permalink raw reply	[flat|nested] 3+ messages in thread