On Wed, Nov 10, 2021 at 3:12 AM Ross Burton <r...@burtonini.com> wrote:
>
> 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.bur...@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(-)
>
> 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
> create_merged_usr_symlinks() {
> root="$1"
> install -d $root${base_bindir} $root${base_sbindir} $root${base_libdir}
> - lnr $root${base_bindir} $root/bin
> - lnr $root${base_sbindir} $root/sbin
> - lnr $root${base_libdir} $root/${baselib}
> + ln -rs $root${base_bindir} $root/bin
> + ln -rs $root${base_sbindir} $root/sbin
> + ln -rs $root${base_libdir} $root/${baselib}
>
> if [ "${nonarch_base_libdir}" != "${base_libdir}" ]; then
> install -d $root${nonarch_base_libdir}
> - lnr $root${nonarch_base_libdir} $root/lib
> + ln -rs $root${nonarch_base_libdir} $root/lib
> fi
>
> # create base links for multilibs
> multi_libdirs="${@d.getVar('MULTILIB_VARIANTS')}"
> for d in $multi_libdirs; do
> install -d $root${exec_prefix}/$d
> - lnr $root${exec_prefix}/$d $root/$d
> + ln -rs $root${exec_prefix}/$d $root/$d
> done
> }
>
> 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() {
> for script in $scripts; do
> for scriptfn in `find
> ${SDK_OUTPUT}/${SDKPATH}/${scriptrelpath} -maxdepth 1 -executable -name
> "$script"`; do
>
> targetscriptfn="${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/$(basename
> $scriptfn)"
> - test -e ${targetscriptfn} || lnr ${scriptfn}
> ${targetscriptfn}
> + test -e ${targetscriptfn} || ln -rs ${scriptfn}
> ${targetscriptfn}
> done
> done
> # 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() {
> unfsd_path="${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/unfsd"
> if [ "${SDK_INCLUDE_TOOLCHAIN}" = "1" -a ! -e $unfsd_path ] ; then
>
> binrelpath=${@os.path.relpath(d.getVar('STAGING_BINDIR_NATIVE'),
> d.getVar('TMPDIR'))}
> - lnr ${SDK_OUTPUT}/${SDKPATH}/tmp/$binrelpath/unfsd $unfsd_path
> + ln -rs ${SDK_OUTPUT}/${SDKPATH}/tmp/$binrelpath/unfsd
> $unfsd_path
> fi
> touch ${SDK_OUTPUT}/${SDKPATH}/.devtoolbase
>
> diff --git a/meta/recipes-core/glibc/glibc-package.inc
> b/meta/recipes-core/glibc/glibc-package.inc
> index 571ae7ae09..54e2a08906 100644
> --- a/meta/recipes-core/glibc/glibc-package.inc
> +++ b/meta/recipes-core/glibc/glibc-package.inc
> @@ -119,8 +119,8 @@ do_install() {
> ln -s ${@oe.path.relative('${root_prefix}/lib',
> '${base_libdir}')}/${ARCH_DYNAMIC_LOADER} \
> ${D}${root_prefix}/lib/${ARCH_DYNAMIC_LOADER}
> fi
> - lnr ${D}${base_libdir}/libpthread.so.0 ${D}${libdir}/libpthread.so
> - lnr ${D}${base_libdir}/librt.so.1 ${D}${libdir}/librt.so
> + ln -rs ${D}${base_libdir}/libpthread.so.0 ${D}${libdir}/libpthread.so
> + ln -rs ${D}${base_libdir}/librt.so.1 ${D}${libdir}/librt.so
> }
>
> def get_libc_fpu_setting(bb, d):
> diff --git a/meta/recipes-core/images/build-appliance-image_15.0.0.bb
> b/meta/recipes-core/images/build-appliance-image_15.0.0.bb
> index 94cafdbbe4..8cac636581 100644
> --- a/meta/recipes-core/images/build-appliance-image_15.0.0.bb
> +++ b/meta/recipes-core/images/build-appliance-image_15.0.0.bb
> @@ -87,7 +87,7 @@ fakeroot do_populate_poky_src () {
>
> # Load tap/tun at startup
> rm -f ${IMAGE_ROOTFS}/sbin/iptables
> - lnr ${IMAGE_ROOTFS}/usr/sbin/iptables ${IMAGE_ROOTFS}/sbin/iptables
> + ln -rs ${IMAGE_ROOTFS}/usr/sbin/iptables ${IMAGE_ROOTFS}/sbin/iptables
As a further improvement you can drop the rm -f
${IMAGE_ROOTFS}/sbin/iptables and add -f to the ln command.
> echo "tun" >> ${IMAGE_ROOTFS}/etc/modules
>
> # Use Clearlooks GTK+ theme
> diff --git a/meta/recipes-core/musl/gcompat_git.bb
> b/meta/recipes-core/musl/gcompat_git.bb
> index 6e5cc11d5d..955cc3c010 100644
> --- a/meta/recipes-core/musl/gcompat_git.bb
> +++ b/meta/recipes-core/musl/gcompat_git.bb
> @@ -37,7 +37,7 @@ do_install () {
> oe_runmake install 'DESTDIR=${D}'
> if [ "${SITEINFO_BITS}" = "64" ]; then
> install -d ${D}/lib64
> - lnr ${D}${GLIBC_LDSO} ${D}/lib64/`basename ${GLIBC_LDSO}`
> + ln -rs ${D}${GLIBC_LDSO} ${D}/lib64/`basename ${GLIBC_LDSO}`
> fi
> }
>
> diff --git a/meta/recipes-core/musl/musl_git.bb
> b/meta/recipes-core/musl/musl_git.bb
> index 03ab0a449f..50daca1eff 100644
> --- a/meta/recipes-core/musl/musl_git.bb
> +++ b/meta/recipes-core/musl/musl_git.bb
> @@ -66,7 +66,7 @@ do_install() {
> echo "${base_libdir}" >
> ${D}${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path
> echo "${libdir}" >> ${D}${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path
> rm -f ${D}${bindir}/ldd ${D}${GLIBC_LDSO}
> - lnr ${D}${libdir}/libc.so ${D}${bindir}/ldd
> + ln -rs ${D}${libdir}/libc.so ${D}${bindir}/ldd
Same comment here: you can drop the rm -f and use ln -rsf.
> }
>
> FILES:${PN} += "/lib/ld-musl-${MUSL_LDSO_ARCH}.so.1
> ${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path"
> 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.
> - 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"`
> diff --git a/meta/recipes-core/os-release/os-release.bb
> b/meta/recipes-core/os-release/os-release.bb
> index 38ee4f993b..8847fe30c3 100644
> --- a/meta/recipes-core/os-release/os-release.bb
> +++ b/meta/recipes-core/os-release/os-release.bb
> @@ -47,7 +47,7 @@ do_compile[vardeps] += "${OS_RELEASE_FIELDS}"
> do_install () {
> install -d ${D}${nonarch_libdir} ${D}${sysconfdir}
> install -m 0644 os-release ${D}${nonarch_libdir}/
> - lnr ${D}${nonarch_libdir}/os-release ${D}${sysconfdir}/os-release
> + ln -rs ${D}${nonarch_libdir}/os-release ${D}${sysconfdir}/os-release
> }
>
> FILES:${PN} += "${nonarch_libdir}/os-release"
> diff --git a/meta/recipes-devtools/dnf/dnf_4.10.0.bb
> b/meta/recipes-devtools/dnf/dnf_4.10.0.bb
> index e4432c7f09..cef2c03e4e 100644
> --- a/meta/recipes-devtools/dnf/dnf_4.10.0.bb
> +++ b/meta/recipes-devtools/dnf/dnf_4.10.0.bb
> @@ -63,8 +63,8 @@ RRECOMMENDS:${PN}:class-target += "gnupg"
> # .spec file in dnf source tree does (and then Fedora and dnf documentation
> # says that dnf binary is plain 'dnf').
> do_install:append() {
> - lnr ${D}/${bindir}/dnf-3 ${D}/${bindir}/dnf
> - lnr ${D}/${bindir}/dnf-automatic-3 ${D}/${bindir}/dnf-automatic
> + ln -rs ${D}/${bindir}/dnf-3 ${D}/${bindir}/dnf
> + ln -rs ${D}/${bindir}/dnf-automatic-3 ${D}/${bindir}/dnf-automatic
> }
>
> # Direct dnf-native to read rpm configuration from our sysroot, not the one
> it was compiled in
> diff --git a/meta/recipes-devtools/pkgconf/pkgconf_1.8.0.bb
> b/meta/recipes-devtools/pkgconf/pkgconf_1.8.0.bb
> index 29cf4a6a94..887e15e28c 100644
> --- a/meta/recipes-devtools/pkgconf/pkgconf_1.8.0.bb
> +++ b/meta/recipes-devtools/pkgconf/pkgconf_1.8.0.bb
> @@ -59,7 +59,7 @@ pkgconf_sstate_fixup_esdk () {
> if [ "${BB_CURRENTTASK}" = "populate_sysroot_setscene" -a
> "${WITHIN_EXT_SDK}" = "1" ] ; then
> pkgconfdir="${SSTATE_INSTDIR}/recipe-sysroot-native/${bindir_native}"
> mv $pkgconfdir/pkg-config $pkgconfdir/pkg-config.real
> - lnr $pkgconfdir/pkg-config-esdk $pkgconfdir/pkg-config
> + ln -rs $pkgconfdir/pkg-config-esdk $pkgconfdir/pkg-config
> sed -i -e "s|^pkg-config|pkg-config.real|"
> $pkgconfdir/pkg-config-native
> fi
> }
> diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
> b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
> index 39b87ec829..c220bafd90 100644
> --- a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
> +++ b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
> @@ -67,7 +67,7 @@ pkgconfig_sstate_fixup_esdk () {
> if [ "${BB_CURRENTTASK}" = "populate_sysroot_setscene" -a
> "${WITHIN_EXT_SDK}" = "1" ] ; then
>
> pkgconfdir="${SSTATE_INSTDIR}/recipe-sysroot-native/${bindir_native}"
> mv $pkgconfdir/pkg-config $pkgconfdir/pkg-config.real
> - lnr $pkgconfdir/pkg-config-esdk $pkgconfdir/pkg-config
> + ln -rs $pkgconfdir/pkg-config-esdk $pkgconfdir/pkg-config
> sed -i -e "s|^pkg-config|pkg-config.real|"
> $pkgconfdir/pkg-config-native
> fi
> }
> diff --git a/meta/recipes-kernel/kmod/kmod_git.bb
> b/meta/recipes-kernel/kmod/kmod_git.bb
> index eb5d176ded..9bd66de430 100644
> --- a/meta/recipes-kernel/kmod/kmod_git.bb
> +++ b/meta/recipes-kernel/kmod/kmod_git.bb
> @@ -19,9 +19,9 @@ do_install:append () {
> install -dm755 ${D}${base_bindir}
> install -dm755 ${D}${base_sbindir}
> # add symlinks to kmod
> - lnr ${D}${base_bindir}/kmod ${D}${base_bindir}/lsmod
> + ln -rs ${D}${base_bindir}/kmod ${D}${base_bindir}/lsmod
> for tool in insmod rmmod depmod modinfo modprobe; do
> - lnr ${D}${base_bindir}/kmod ${D}${base_sbindir}/${tool}
> + ln -rs ${D}${base_bindir}/kmod ${D}${base_sbindir}/${tool}
> done
> # configuration directories
> install -dm755 ${D}${nonarch_base_libdir}/depmod.d
> diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb
> b/meta/recipes-kernel/linux/kernel-devsrc.bb
> index f22fac5bd6..4ceb35f0d2 100644
> --- a/meta/recipes-kernel/linux/kernel-devsrc.bb
> +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
> @@ -48,7 +48,7 @@ do_install() {
> mkdir -p ${D}/usr/src
> (
> cd ${D}/usr/src
> - lnr ${D}${KERNEL_BUILD_ROOT}${KERNEL_VERSION}/source kernel
> + ln -rs ${D}${KERNEL_BUILD_ROOT}${KERNEL_VERSION}/source kernel
> )
>
> # for on target purposes, we unify build and source
> --
> 2.25.1
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#158112):
https://lists.openembedded.org/g/openembedded-core/message/158112
Mute This Topic: https://lists.openembedded.org/mt/86954557/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
