From: Armin Kuster <akuster808@gmail.com>
To: openembedded-core@lists.openembedded.org
Date: Wed, 11 Nov 2015 09:41:47 -0800
Message-Id: <1447263707-27696-3-git-send-email-akuster808@gmail.com>
In-Reply-To: <1447263707-27696-1-git-send-email-akuster808@gmail.com>
References: <1447263707-27696-1-git-send-email-akuster808@gmail.com>
Cc: Armin Kuster <akuster@mvista.com>
Subject: [PATCH 2/2] ldsoconf: allow extension via local.conf
Precedence: list

From: Armin Kuster <akuster@mvista.com>

this allows extending ldconfig search path from local.conf

Signed-off-by: Armin Kuster <akuster@mvista.com>
---
 meta/classes/image-ldconfig.bbclass | 6 ++++++
 meta/conf/bitbake.conf              | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/meta/classes/image-ldconfig.bbclass b/meta/classes/image-ldconfig.bbclass
index e9946da..ce10673 100644
--- a/meta/classes/image-ldconfig.bbclass
+++ b/meta/classes/image-ldconfig.bbclass
@@ -11,6 +11,12 @@ ld_so_conf() {
 
     rm -f ${STAGING_DIR_NATIVE}${sysconfdir_native}/ld.so.conf
 
+    # dump addition lib possible defined in local.conf
+    for file in ${LDSOCONF};
+    do
+        echo ${file} >> ${STAGING_LDSO_CONF_DIR}/ld.so.conf
+    done
+
     # save lib dirs as defined in recipes
     for file in `find ${STAGING_LDSO_CONF_DIR}/*/* -name "ld.so.conf"`;
     do
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index f0471f4..1f78c49 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -815,4 +815,7 @@ MULTILIB_VARIANTS ??= ""
 # 
 # ldconfig stuff
 #
+EXTRA_LDSOCONF ??= ""
+LDSOCONF = "/lib /lib64 /usr/lib /usr/lib64"
+LSSOCONF += "${EXTRA_LDSOCONF}"
 STAGING_LDSO_CONF_DIR = "${TMPDIR}/work-shared/ldconfig"
-- 
2.3.5