<div dir="ltr">Why implement this as a rootfs postinstall command? glibc writes this file, so we can alter it when that recipe is written.<div><br></div><div>Ross</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 31 August 2017 at 06:54, <span dir="ltr"><<a href="mailto:jackie.huang@windriver.com" target="_blank">jackie.huang@windriver.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: Jackie Huang <<a href="mailto:jackie.huang@windriver.com">jackie.huang@windriver.com</a>><br>
<br>
There are advantages in changing the contents of ld.so.conf to<br>
"include /etc/ld.so.conf.d/*.conf" instead of directly listing<br>
directories in it, just like most distributions are doing the same.<br>
<br>
Signed-off-by: Jackie Huang <<a href="mailto:jackie.huang@windriver.com">jackie.huang@windriver.com</a>><br>
---<br>
meta/classes/rootfs-<wbr>postcommands.bbclass | 13 +++++++++++++<br>
1 file changed, 13 insertions(+)<br>
<br>
diff --git a/meta/classes/rootfs-<wbr>postcommands.bbclass b/meta/classes/rootfs-<wbr>postcommands.bbclass<br>
index dc5a76baba..af01eb550a 100644<br>
--- a/meta/classes/rootfs-<wbr>postcommands.bbclass<br>
+++ b/meta/classes/rootfs-<wbr>postcommands.bbclass<br>
@@ -20,6 +20,9 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_<wbr>FEATURES", "read-only<br>
# Generates test data file with data store variables expanded in json format<br>
ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data ; "<br>
<br>
+# Add support for /etc/ld.so.conf.d/*.conf if ldconfig is enabled<br>
+ROOTFS_POSTINSTALL_COMMAND += "${@bb.utils.contains('DISTRO_<wbr>FEATURES', 'ldconfig', 'add_ld_so_conf_d ;', '', d)}"<br>
+<br>
# Write manifest<br>
IMAGE_MANIFEST = "${IMGDEPLOYDIR}/${IMAGE_NAME}<wbr>.rootfs.manifest"<br>
ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest ; "<br>
@@ -244,6 +247,16 @@ make_zimage_symlink_relative () {<br>
fi<br>
}<br>
<br>
+# Add support for /etc/ld.so.conf.d/*.conf<br>
+add_ld_so_conf_d() {<br>
+ if [ -f ${IMAGE_ROOTFS}${sysconfdir}/<wbr>ld.so.conf ]; then<br>
+ if ! `grep -q 'include ld.so.conf.d\/\*.conf' /etc/ld.so.conf`; then<br>
+ echo 'include ld.so.conf.d/*.conf' >> ${IMAGE_ROOTFS}${sysconfdir}/<wbr>ld.so.conf<br>
+ fi<br>
+ mkdir -p ${IMAGE_ROOTFS}${sysconfdir}/<wbr>ld.so.conf.d<br>
+ fi<br>
+}<br>
+<br>
python write_image_manifest () {<br>
from oe.rootfs import image_list_installed_packages<br>
from oe.utils import format_pkg_list<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.11.0<br>
<br>
--<br>
______________________________<wbr>_________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.<wbr>openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/openembedded-<wbr>core</a><br>
</font></span></blockquote></div><br></div>