Skip to contentSkip to conversation

package install failure on systems without /sbin/ldconfig

PATCH New Amy Fong 1 participant 1 message Jul 9, 2012

lore
Share & tools
lore

Amy Fong

author
#0 lore raw

PATCH 1/1 package install failure on systems without /sbin/ldconfig

Package install failures due to issues in post install rules.

package_do_shlibs only looks for libraries in a directory "lib", this should be modified to the variable baselib.

ldconfig_postinst_fragment failure observed on systems without /sbin/ldconfig

        [ -x /sbin/ldconfig ] && /sbin/ldconfig

results in the post install rule returning a failure. Modify to
if [ -x /sbin/ldconfig ]; then /sbin/ldconfig; fi

Signed-off-by Amy Fong <[email protected]>
---
 package.bbclass |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/classes/package.bbclass +2 -2
index 56ab25c..28a263c 100644
@@ -1151,7 +1151,7 @@ emit_pkgdata[dirs] = "${PKGDESTWORK}/runtime"
 
 ldconfig_postinst_fragment() {
 if [ x"$D" = "x" ]; then
-	[ -x /sbin/ldconfig ] && /sbin/ldconfig
+	if [ -x /sbin/ldconfig ]; then /sbin/ldconfig ; fi
 fi
 }
 

@@ -1261,7 +1261,7 @@ python package_do_shlibs() {
 		return
 		
 	lib_re = re.compile("^.*\.so")
-	libdir_re = re.compile(".*/lib$")
+	libdir_re = re.compile(".*/%s$" % d.getVar('baselib', True))
 
 	packages = d.getVar('PACKAGES', True)
 	targetos = d.getVar('TARGET_OS', True)