summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/image.bbclass10
-rw-r--r--meta/classes/populate_sdk_ext.bbclass4
-rw-r--r--meta/recipes-core/glibc/glibc-package.inc4
-rw-r--r--meta/recipes-core/images/build-appliance-image_15.0.0.bb2
-rw-r--r--meta/recipes-core/musl/gcompat_git.bb2
-rw-r--r--meta/recipes-core/musl/musl_git.bb2
-rw-r--r--meta/recipes-core/ncurses/ncurses.inc4
-rw-r--r--meta/recipes-core/os-release/os-release.bb2
-rw-r--r--meta/recipes-devtools/dnf/dnf_4.10.0.bb4
-rw-r--r--meta/recipes-devtools/pkgconf/pkgconf_1.8.0.bb2
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig_git.bb2
-rw-r--r--meta/recipes-kernel/kmod/kmod_git.bb4
-rw-r--r--meta/recipes-kernel/linux/kernel-devsrc.bb2
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
622create_merged_usr_symlinks() { 622create_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
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
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() {
119 ln -s ${@oe.path.relative('${root_prefix}/lib', '${base_libdir}')}/${ARCH_DYNAMIC_LOADER} \ 119 ln -s ${@oe.path.relative('${root_prefix}/lib', '${base_libdir}')}/${ARCH_DYNAMIC_LOADER} \
120 ${D}${root_prefix}/lib/${ARCH_DYNAMIC_LOADER} 120 ${D}${root_prefix}/lib/${ARCH_DYNAMIC_LOADER}
121 fi 121 fi
122 lnr ${D}${base_libdir}/libpthread.so.0 ${D}${libdir}/libpthread.so 122 ln -rs ${D}${base_libdir}/libpthread.so.0 ${D}${libdir}/libpthread.so
123 lnr ${D}${base_libdir}/librt.so.1 ${D}${libdir}/librt.so 123 ln -rs ${D}${base_libdir}/librt.so.1 ${D}${libdir}/librt.so
124} 124}
125 125
126def get_libc_fpu_setting(bb, d): 126def 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 () {
87 87
88 # Load tap/tun at startup 88 # Load tap/tun at startup
89 rm -f ${IMAGE_ROOTFS}/sbin/iptables 89 rm -f ${IMAGE_ROOTFS}/sbin/iptables
90 lnr ${IMAGE_ROOTFS}/usr/sbin/iptables ${IMAGE_ROOTFS}/sbin/iptables 90 ln -rs ${IMAGE_ROOTFS}/usr/sbin/iptables ${IMAGE_ROOTFS}/sbin/iptables
91 echo "tun" >> ${IMAGE_ROOTFS}/etc/modules 91 echo "tun" >> ${IMAGE_ROOTFS}/etc/modules
92 92
93 # Use Clearlooks GTK+ theme 93 # 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 () {
37 oe_runmake install 'DESTDIR=${D}' 37 oe_runmake install 'DESTDIR=${D}'
38 if [ "${SITEINFO_BITS}" = "64" ]; then 38 if [ "${SITEINFO_BITS}" = "64" ]; then
39 install -d ${D}/lib64 39 install -d ${D}/lib64
40 lnr ${D}${GLIBC_LDSO} ${D}/lib64/`basename ${GLIBC_LDSO}` 40 ln -rs ${D}${GLIBC_LDSO} ${D}/lib64/`basename ${GLIBC_LDSO}`
41 fi 41 fi
42} 42}
43 43
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() {
66 echo "${base_libdir}" > ${D}${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path 66 echo "${base_libdir}" > ${D}${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path
67 echo "${libdir}" >> ${D}${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path 67 echo "${libdir}" >> ${D}${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path
68 rm -f ${D}${bindir}/ldd ${D}${GLIBC_LDSO} 68 rm -f ${D}${bindir}/ldd ${D}${GLIBC_LDSO}
69 lnr ${D}${libdir}/libc.so ${D}${bindir}/ldd 69 ln -rs ${D}${libdir}/libc.so ${D}${bindir}/ldd
70} 70}
71 71
72FILES:${PN} += "/lib/ld-musl-${MUSL_LDSO_ARCH}.so.1 ${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path" 72FILES:${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() {
242 mv ${D}${libdir}/libtinfo.so.* ${D}${base_libdir} 242 mv ${D}${libdir}/libtinfo.so.* ${D}${base_libdir}
243 rm ${D}${libdir}/libtinfo.so 243 rm ${D}${libdir}/libtinfo.so
244 244
245 # Use lnr to ensure this is a relative link despite absolute paths 245 # Use ln -rs to ensure this is a relative link despite absolute paths
246 # (as we can't know the relationship between base_libdir and libdir). 246 # (as we can't know the relationship between base_libdir and libdir).
247 # At some point we can rely on coreutils 8.16 which has ln -r. 247 # At some point we can rely on coreutils 8.16 which has ln -r.
248 lnr ${D}${base_libdir}/libtinfo.so.5 ${D}${libdir}/libtinfo.so 248 ln -rs ${D}${base_libdir}/libtinfo.so.5 ${D}${libdir}/libtinfo.so
249 fi 249 fi
250 if [ -d "${D}${includedir}/ncurses" ]; then 250 if [ -d "${D}${includedir}/ncurses" ]; then
251 for f in `find ${D}${includedir}/ncurses -name "*.h"` 251 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}"
47do_install () { 47do_install () {
48 install -d ${D}${nonarch_libdir} ${D}${sysconfdir} 48 install -d ${D}${nonarch_libdir} ${D}${sysconfdir}
49 install -m 0644 os-release ${D}${nonarch_libdir}/ 49 install -m 0644 os-release ${D}${nonarch_libdir}/
50 lnr ${D}${nonarch_libdir}/os-release ${D}${sysconfdir}/os-release 50 ln -rs ${D}${nonarch_libdir}/os-release ${D}${sysconfdir}/os-release
51} 51}
52 52
53FILES:${PN} += "${nonarch_libdir}/os-release" 53FILES:${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"
63# .spec file in dnf source tree does (and then Fedora and dnf documentation 63# .spec file in dnf source tree does (and then Fedora and dnf documentation
64# says that dnf binary is plain 'dnf'). 64# says that dnf binary is plain 'dnf').
65do_install:append() { 65do_install:append() {
66 lnr ${D}/${bindir}/dnf-3 ${D}/${bindir}/dnf 66 ln -rs ${D}/${bindir}/dnf-3 ${D}/${bindir}/dnf
67 lnr ${D}/${bindir}/dnf-automatic-3 ${D}/${bindir}/dnf-automatic 67 ln -rs ${D}/${bindir}/dnf-automatic-3 ${D}/${bindir}/dnf-automatic
68} 68}
69 69
70# Direct dnf-native to read rpm configuration from our sysroot, not the one it was compiled in 70# 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 () {
59 if [ "${BB_CURRENTTASK}" = "populate_sysroot_setscene" -a "${WITHIN_EXT_SDK}" = "1" ] ; then 59 if [ "${BB_CURRENTTASK}" = "populate_sysroot_setscene" -a "${WITHIN_EXT_SDK}" = "1" ] ; then
60 pkgconfdir="${SSTATE_INSTDIR}/recipe-sysroot-native/${bindir_native}" 60 pkgconfdir="${SSTATE_INSTDIR}/recipe-sysroot-native/${bindir_native}"
61 mv $pkgconfdir/pkg-config $pkgconfdir/pkg-config.real 61 mv $pkgconfdir/pkg-config $pkgconfdir/pkg-config.real
62 lnr $pkgconfdir/pkg-config-esdk $pkgconfdir/pkg-config 62 ln -rs $pkgconfdir/pkg-config-esdk $pkgconfdir/pkg-config
63 sed -i -e "s|^pkg-config|pkg-config.real|" $pkgconfdir/pkg-config-native 63 sed -i -e "s|^pkg-config|pkg-config.real|" $pkgconfdir/pkg-config-native
64 fi 64 fi
65} 65}
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 () {
67 if [ "${BB_CURRENTTASK}" = "populate_sysroot_setscene" -a "${WITHIN_EXT_SDK}" = "1" ] ; then 67 if [ "${BB_CURRENTTASK}" = "populate_sysroot_setscene" -a "${WITHIN_EXT_SDK}" = "1" ] ; then
68 pkgconfdir="${SSTATE_INSTDIR}/recipe-sysroot-native/${bindir_native}" 68 pkgconfdir="${SSTATE_INSTDIR}/recipe-sysroot-native/${bindir_native}"
69 mv $pkgconfdir/pkg-config $pkgconfdir/pkg-config.real 69 mv $pkgconfdir/pkg-config $pkgconfdir/pkg-config.real
70 lnr $pkgconfdir/pkg-config-esdk $pkgconfdir/pkg-config 70 ln -rs $pkgconfdir/pkg-config-esdk $pkgconfdir/pkg-config
71 sed -i -e "s|^pkg-config|pkg-config.real|" $pkgconfdir/pkg-config-native 71 sed -i -e "s|^pkg-config|pkg-config.real|" $pkgconfdir/pkg-config-native
72 fi 72 fi
73} 73}
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 () {
19 install -dm755 ${D}${base_bindir} 19 install -dm755 ${D}${base_bindir}
20 install -dm755 ${D}${base_sbindir} 20 install -dm755 ${D}${base_sbindir}
21 # add symlinks to kmod 21 # add symlinks to kmod
22 lnr ${D}${base_bindir}/kmod ${D}${base_bindir}/lsmod 22 ln -rs ${D}${base_bindir}/kmod ${D}${base_bindir}/lsmod
23 for tool in insmod rmmod depmod modinfo modprobe; do 23 for tool in insmod rmmod depmod modinfo modprobe; do
24 lnr ${D}${base_bindir}/kmod ${D}${base_sbindir}/${tool} 24 ln -rs ${D}${base_bindir}/kmod ${D}${base_sbindir}/${tool}
25 done 25 done
26 # configuration directories 26 # configuration directories
27 install -dm755 ${D}${nonarch_base_libdir}/depmod.d 27 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() {
48 mkdir -p ${D}/usr/src 48 mkdir -p ${D}/usr/src
49 ( 49 (
50 cd ${D}/usr/src 50 cd ${D}/usr/src
51 lnr ${D}${KERNEL_BUILD_ROOT}${KERNEL_VERSION}/source kernel 51 ln -rs ${D}${KERNEL_BUILD_ROOT}${KERNEL_VERSION}/source kernel
52 ) 52 )
53 53
54 # for on target purposes, we unify build and source 54 # for on target purposes, we unify build and source