summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-09-15 02:59:21 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-16 22:02:45 (GMT)
commitd2096315b67e121dc47cfd0cf8b0c9e0af76fafc (patch)
treeeecabcb9e3e2a319cfc87df78ab41219244c67a6 /meta/recipes-core
parentded579aeb68cce3edac386b2c3abc5447476ab2f (diff)
downloadpoky-d2096315b67e121dc47cfd0cf8b0c9e0af76fafc.tar.gz
glibc: Move DISTRO_FEATURE specific do_install code for target recipe only
nativesdk-glibc should be spared of recompile when the distro features are changed e.g. ldconfig is not in DISTRO_FEATURES, this happens when sdk with musl and another one with glibc is built Fixes Variable do_install value changed: ... -DISTRO_FEATURES{ldconfig} = Set +DISTRO_FEATURES{ldconfig} = Unset (From OE-Core rev: e7af0204e6051489ef5646fbca2509a42e04bb72) Signed-off-by: Khem Raj <raj.khem@gmail.com> s Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/glibc/glibc-package.inc39
1 files changed, 20 insertions, 19 deletions
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index 9b1e7b7..2e8f9f3 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -83,14 +83,6 @@ do_install_append () {
83 rm -f ${D}${infodir}/dir 83 rm -f ${D}${infodir}/dir
84 fi 84 fi
85 85
86 if ! ${@bb.utils.contains('DISTRO_FEATURES', 'ldconfig', 'true', 'false', d)}; then
87 # The distro doesn't want these files so let's not install them
88 rm -f ${D}${sysconfdir}/ld.so.conf
89 rm -f ${D}${base_sbindir}/ldconfig
90 # This directory will be empty now so remove it too.
91 rmdir ${D}${sysconfdir}
92 fi
93
94 install -d ${D}${sysconfdir}/init.d 86 install -d ${D}${sysconfdir}/init.d
95 install -d ${D}${localstatedir}/db/nscd 87 install -d ${D}${localstatedir}/db/nscd
96 install -m 0755 ${S}/nscd/nscd.init ${D}${sysconfdir}/init.d/nscd 88 install -m 0755 ${S}/nscd/nscd.init ${D}${sysconfdir}/init.d/nscd
@@ -102,6 +94,26 @@ do_install_append () {
102 install -d ${D}${systemd_unitdir}/system 94 install -d ${D}${systemd_unitdir}/system
103 install -m 0644 ${S}/nscd/nscd.service ${D}${systemd_unitdir}/system/ 95 install -m 0644 ${S}/nscd/nscd.service ${D}${systemd_unitdir}/system/
104 96
97 # The dynamic loader will have been installed into
98 # ${base_libdir}. However, if that isn't going to end up being
99 # available in the ABI-mandated location, then a symlink must
100 # be created.
101
102 if [ -n "${ARCH_DYNAMIC_LOADER}" -a ! -e "${D}${root_prefix}/lib/${ARCH_DYNAMIC_LOADER}" ]; then
103 install -d ${D}${root_prefix}/lib
104 ln -s ${@oe.path.relative('${root_prefix}/lib', '${base_libdir}')}/${ARCH_DYNAMIC_LOADER} \
105 ${D}${root_prefix}/lib/${ARCH_DYNAMIC_LOADER}
106 fi
107}
108
109do_install_append_class-target() {
110 if ! ${@bb.utils.contains('DISTRO_FEATURES', 'ldconfig', 'true', 'false', d)}; then
111 # The distro doesn't want these files so let's not install them
112 rm -f ${D}${sysconfdir}/ld.so.conf
113 rm -f ${D}${base_sbindir}/ldconfig
114 # This directory will be empty now so remove it too.
115 rmdir ${D}${sysconfdir}
116 fi
105 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then 117 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
106 install -d ${D}${sysconfdir}/tmpfiles.d 118 install -d ${D}${sysconfdir}/tmpfiles.d
107 echo "d /run/nscd 755 root root -" \ 119 echo "d /run/nscd 755 root root -" \
@@ -114,18 +126,7 @@ do_install_append () {
114 > ${D}${sysconfdir}/default/volatiles/98_nscd 126 > ${D}${sysconfdir}/default/volatiles/98_nscd
115 fi 127 fi
116 128
117 # The dynamic loader will have been installed into
118 # ${base_libdir}. However, if that isn't going to end up being
119 # available in the ABI-mandated location, then a symlink must
120 # be created.
121
122 if [ -n "${ARCH_DYNAMIC_LOADER}" -a ! -e "${D}${root_prefix}/lib/${ARCH_DYNAMIC_LOADER}" ]; then
123 install -d ${D}${root_prefix}/lib
124 ln -s ${@oe.path.relative('${root_prefix}/lib', '${base_libdir}')}/${ARCH_DYNAMIC_LOADER} \
125 ${D}${root_prefix}/lib/${ARCH_DYNAMIC_LOADER}
126 fi
127} 129}
128
129do_install_append_aarch64 () { 130do_install_append_aarch64 () {
130 do_install_armmultilib 131 do_install_armmultilib
131} 132}