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/populate_sdk_ext.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/populate_sdk_ext.bbclass')
-rw-r--r-- | meta/classes/populate_sdk_ext.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index 9187f53f13..ef93b6a826 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass | |||
@@ -626,7 +626,7 @@ install_tools() { | |||
626 | for script in $scripts; do | 626 | for script in $scripts; do |
627 | for scriptfn in `find ${SDK_OUTPUT}/${SDKPATH}/${scriptrelpath} -maxdepth 1 -executable -name "$script"`; do | 627 | for scriptfn in `find ${SDK_OUTPUT}/${SDKPATH}/${scriptrelpath} -maxdepth 1 -executable -name "$script"`; do |
628 | targetscriptfn="${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/$(basename $scriptfn)" | 628 | targetscriptfn="${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/$(basename $scriptfn)" |
629 | test -e ${targetscriptfn} || lnr ${scriptfn} ${targetscriptfn} | 629 | test -e ${targetscriptfn} || ln -rs ${scriptfn} ${targetscriptfn} |
630 | done | 630 | done |
631 | done | 631 | done |
632 | # We can't use the same method as above because files in the sysroot won't exist at this point | 632 | # We can't use the same method as above because files in the sysroot won't exist at this point |
@@ -634,7 +634,7 @@ install_tools() { | |||
634 | unfsd_path="${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/unfsd" | 634 | unfsd_path="${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/unfsd" |
635 | if [ "${SDK_INCLUDE_TOOLCHAIN}" = "1" -a ! -e $unfsd_path ] ; then | 635 | if [ "${SDK_INCLUDE_TOOLCHAIN}" = "1" -a ! -e $unfsd_path ] ; then |
636 | binrelpath=${@os.path.relpath(d.getVar('STAGING_BINDIR_NATIVE'), d.getVar('TMPDIR'))} | 636 | binrelpath=${@os.path.relpath(d.getVar('STAGING_BINDIR_NATIVE'), d.getVar('TMPDIR'))} |
637 | lnr ${SDK_OUTPUT}/${SDKPATH}/tmp/$binrelpath/unfsd $unfsd_path | 637 | ln -rs ${SDK_OUTPUT}/${SDKPATH}/tmp/$binrelpath/unfsd $unfsd_path |
638 | fi | 638 | fi |
639 | touch ${SDK_OUTPUT}/${SDKPATH}/.devtoolbase | 639 | touch ${SDK_OUTPUT}/${SDKPATH}/.devtoolbase |
640 | 640 | ||