summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core')
-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
6 files changed, 8 insertions, 8 deletions
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"