[oe-commits] [meta-openembedded] 01/07: postfix: fix postinstall to avoid do_rootfs failure

git at git.openembedded.org git at git.openembedded.org
Mon Jul 15 14:59:24 UTC 2019


This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit 7bf07aa11bf3f8ca7524cb2bc1fe2aeae27ac27f
Author: Qi.Chen at windriver.com <Qi.Chen at windriver.com>
AuthorDate: Mon Jul 15 13:09:54 2019 +0800

    postfix: fix postinstall to avoid do_rootfs failure
    
    When lsb is enabled, that is, 'linuxstdbase' is in OVERRIDES,
    do_rootfs would fail if both 'msmtp' and 'postfix' are installed.
    This is because they both try to create /usr/lib/sendmail link if
    it does not exist. So we need to fix the check to avoid non-zero
    exit status.
    
    Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 meta-networking/recipes-daemons/postfix/postfix.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-networking/recipes-daemons/postfix/postfix.inc b/meta-networking/recipes-daemons/postfix/postfix.inc
index 3d4f1df..021129c 100644
--- a/meta-networking/recipes-daemons/postfix/postfix.inc
+++ b/meta-networking/recipes-daemons/postfix/postfix.inc
@@ -221,7 +221,7 @@ pkg_postinst_${PN} () {
     else
         if ${@'true' if 'linuxstdbase' in d.getVar('DISTROOVERRIDES', False) else 'false'}; then
             # /usr/lib/sendmail is required by LSB core test
-            [ ! -L $D/usr/lib/sendmail ] && ln -sf ${sbindir}/sendmail $D/usr/lib/
+            [ ! -L $D/usr/lib/sendmail ] && ln -sf ${sbindir}/sendmail $D/usr/lib/ || true
         fi
 
         touch $D/etc/aliases

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list