diff options
author | Ross Burton <ross@burtonini.com> | 2021-11-10 11:12:34 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-11-10 19:27:29 +0000 |
commit | c0583c6bfc13c0f3031b8bc87407485b3fe9856f (patch) | |
tree | 3edadc5eeef4a38998b28c29c30e39738dcc01f3 /meta/classes/image.bbclass | |
parent | 974df2f61c9c7fbdb79f825f1b8d70299b72fa2c (diff) | |
download | poky-c0583c6bfc13c0f3031b8bc87407485b3fe9856f.tar.gz |
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
(From OE-Core rev: 1ca455a98de4c713f58df0a537d4c982d256cd68)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/image.bbclass')
-rw-r--r-- | meta/classes/image.bbclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 2fa69a40d1..6c759fdf70 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
@@ -622,20 +622,20 @@ deltask do_package_write_rpm | |||
622 | create_merged_usr_symlinks() { | 622 | create_merged_usr_symlinks() { |
623 | root="$1" | 623 | root="$1" |
624 | install -d $root${base_bindir} $root${base_sbindir} $root${base_libdir} | 624 | install -d $root${base_bindir} $root${base_sbindir} $root${base_libdir} |
625 | lnr $root${base_bindir} $root/bin | 625 | ln -rs $root${base_bindir} $root/bin |
626 | lnr $root${base_sbindir} $root/sbin | 626 | ln -rs $root${base_sbindir} $root/sbin |
627 | lnr $root${base_libdir} $root/${baselib} | 627 | ln -rs $root${base_libdir} $root/${baselib} |
628 | 628 | ||
629 | if [ "${nonarch_base_libdir}" != "${base_libdir}" ]; then | 629 | if [ "${nonarch_base_libdir}" != "${base_libdir}" ]; then |
630 | install -d $root${nonarch_base_libdir} | 630 | install -d $root${nonarch_base_libdir} |
631 | lnr $root${nonarch_base_libdir} $root/lib | 631 | ln -rs $root${nonarch_base_libdir} $root/lib |
632 | fi | 632 | fi |
633 | 633 | ||
634 | # create base links for multilibs | 634 | # create base links for multilibs |
635 | multi_libdirs="${@d.getVar('MULTILIB_VARIANTS')}" | 635 | multi_libdirs="${@d.getVar('MULTILIB_VARIANTS')}" |
636 | for d in $multi_libdirs; do | 636 | for d in $multi_libdirs; do |
637 | install -d $root${exec_prefix}/$d | 637 | install -d $root${exec_prefix}/$d |
638 | lnr $root${exec_prefix}/$d $root/$d | 638 | ln -rs $root${exec_prefix}/$d $root/$d |
639 | done | 639 | done |
640 | } | 640 | } |
641 | 641 | ||