From: David Vincent <freesilicon@gmail.com>
Date: Wed, 4 Jan 2017 16:43:02 +0000 (+0100)
Subject: nss: Fix postinstall script
X-Git-Tag: uninative-1.5~931
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=8f782f7095e718dd9452055af53363beb6bdbece;p=openembedded-core.git

nss: Fix postinstall script

When installing NSS on a read-only rootfs, the current postinstall
scriptlet exits after having run the signing part. This causes an error
when appending the task because the rest of the script is simply ignored
and therefore never run.

Signed-off-by: David Vincent <freesilicon@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/meta/recipes-support/nss/nss_3.27.1.bb b/meta/recipes-support/nss/nss_3.27.1.bb
index 091793899f..a69672b3d8 100644
--- a/meta/recipes-support/nss/nss_3.27.1.bb
+++ b/meta/recipes-support/nss/nss_3.27.1.bb
@@ -208,18 +208,18 @@ do_install_append_class-target() {
 
 pkg_postinst_${PN} () {
     if [ -n "$D" ]; then
-        for I in $D/${libdir}/lib*.chk; do
+        for I in $D${libdir}/lib*.chk; do
             DN=`dirname $I`
             BN=`basename $I .chk`
             FN=$DN/$BN.so
             shlibsign -i $FN
-	    if [ $? -ne 0 ]; then
-	       exit 1
-	    fi
+            if [ $? -ne 0 ]; then
+                exit 1
+            fi
         done
-        exit 0
+    else
+        signlibs.sh
     fi
-    signlibs.sh
 }
 
 PACKAGES =+ "${PN}-smime"