RE: [OE-core] [PATCH] meta: use ln -rs instead of lnr

[Peter Kjellerstedt <peter.kjellerstedt@axis.com>]

> -----Original Message-----
> From: openembedded-core@lists.openembedded.org <openembedded-
> core@lists.openembedded.org> On Behalf Of Ross Burton
> Sent: den 10 november 2021 12:13
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [PATCH] meta: use ln -rs instead of lnr
> 
> lnr is a script in oe-core that creates relative symlinks, with the same
> behaviour as `ln --relative --symlink`.  It was added back in 2014[1] as
> not all of the supported host distributions at the time shipped
> coreutils 8.16, the first release with --relative.
> 
> However the oldest coreutils release in the supported distributions is
> now 8.22 in CentOS 7, so lnr can be deprecated and users switched to ln.
> 
> [1] 6ae3b85eaffd1b0b6914422e8de7c1230723157d
> 
> Signed-off-by: Ross Burton <ross.burton@arm.com>
> ---
>  meta/classes/image.bbclass                             | 10 +++++-----
>  meta/classes/populate_sdk_ext.bbclass                  |  4 ++--
>  meta/recipes-core/glibc/glibc-package.inc              |  4 ++--
>  .../images/build-appliance-image_15.0.0.bb             |  2 +-
>  meta/recipes-core/musl/gcompat_git.bb                  |  2 +-
>  meta/recipes-core/musl/musl_git.bb                     |  2 +-
>  meta/recipes-core/ncurses/ncurses.inc                  |  4 ++--
>  meta/recipes-core/os-release/os-release.bb             |  2 +-
>  meta/recipes-devtools/dnf/dnf_4.10.0.bb                |  4 ++--
>  meta/recipes-devtools/pkgconf/pkgconf_1.8.0.bb         |  2 +-
>  meta/recipes-devtools/pkgconfig/pkgconfig_git.bb       |  2 +-
>  meta/recipes-kernel/kmod/kmod_git.bb                   |  4 ++--
>  meta/recipes-kernel/linux/kernel-devsrc.bb             |  2 +-
>  13 files changed, 22 insertions(+), 22 deletions(-)
> 

[cut]

> diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
> index 64cce329aa..3f04545465 100644
> --- a/meta/recipes-core/ncurses/ncurses.inc
> +++ b/meta/recipes-core/ncurses/ncurses.inc
> @@ -242,10 +242,10 @@ do_install() {
>              mv ${D}${libdir}/libtinfo.so.* ${D}${base_libdir}
>              rm ${D}${libdir}/libtinfo.so
> 
> -            # Use lnr to ensure this is a relative link despite absolute paths
> +            # Use ln -rs to ensure this is a relative link despite absolute paths
>              # (as we can't know the relationship between base_libdir and libdir).
>              # At some point we can rely on coreutils 8.16 which has ln -r.

The last line of the comment can be removed.

> -            lnr ${D}${base_libdir}/libtinfo.so.5 ${D}${libdir}/libtinfo.so
> +            ln -rs ${D}${base_libdir}/libtinfo.so.5 ${D}${libdir}/libtinfo.so
>          fi
>          if [ -d "${D}${includedir}/ncurses" ]; then
>              for f in `find ${D}${includedir}/ncurses -name "*.h"`

[cut]

//Peter