nss: fix postinst in do_rootfs for target

Partially revert "nss: fix postinst script for nativesdk build"

This reverts commit 31552510b1.

When running in do_rootfs we need to run shlibsign provided
by nss-native, otherwise it fails when /usr/bin/shlibsign
doesn't exist on host builder:

do_rootfs: Postinstall scriptlets of ['nss'] have failed. If the intention is to defer them to first boot,
then please place them into pkg_postinst_ontarget_${PN} ().
Deferring to first boot via 'exit 1' is no longer supported.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Martin Jansa
2020-08-28 21:01:34 +02:00
committed by Khem Raj
parent 3bc89dc7b3
commit 00bd5ad72f
+14 -13
View File
@@ -238,20 +238,21 @@ do_install_append_class-target() {
}
PACKAGE_WRITE_DEPS += "nss-native"
pkg_postinst_${PN} () {
if [ -n "$D" ]; then
for I in $D${libdir}/lib*.chk; do
DN=`dirname $I`
BN=`basename $I .chk`
FN=$DN/$BN.so
${bindir}/shlibsign -i $FN
if [ $? -ne 0 ]; then
exit 1
fi
done
else
${bindir}/signlibs.sh
fi
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
echo "shlibsign -i $FN failed"
fi
done
}
pkg_postinst_ontarget_${PN} () {
${bindir}/signlibs.sh
}
PACKAGES =+ "${PN}-smime"