[oe-commits] [meta-openembedded] 05/33: postfix: split /etc from ${PN} to ${PN}-cfg for ostree

[git at git.openembedded.org]

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 ee5dfa0c35d1edaf9e4078468dde0f02dd62729c
Author: Hongxu Jia <hongxu.jia at windriver.com>
AuthorDate: Tue Oct 22 14:18:25 2019 +0800

    postfix: split /etc from ${PN} to ${PN}-cfg for ostree
    
    In postinst of ${PN}, call newaliases on etc may fail at do_rootfs
    due to host setup. If fail, the postinst will rerun at target first
    boot which cause update-alternatives in postinst rerun.
    
    For ostree system, /usr is readonly, /etc is writable, the
    update-alternatives will be failed when run on target since it
    needs write files in /usr. Split the postinst into two packages
    can fix the problem:
    * update-alternatives runs at do_rootfs
    * newaliases runs at do_rootfs or first boot, it needs write files
      in /etc when run at first boot, while /etc is writable for ostree.
    
    For non-ostree, everything will be OK as normal
    
    Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 meta-networking/recipes-daemons/postfix/postfix.inc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta-networking/recipes-daemons/postfix/postfix.inc b/meta-networking/recipes-daemons/postfix/postfix.inc
index 7781005..de45e08 100644
--- a/meta-networking/recipes-daemons/postfix/postfix.inc
+++ b/meta-networking/recipes-daemons/postfix/postfix.inc
@@ -203,7 +203,7 @@ ALTERNATIVE_LINK_NAME[newaliases.1] = "${mandir}/man1/newaliases.1"
 ALTERNATIVE_LINK_NAME[sendmail.1] = "${mandir}/man1/sendmail.1"
 
 PACKAGE_WRITE_DEPS += "postfix-native"
-pkg_postinst_${PN} () {
+pkg_postinst_${PN}-cfg () {
     if [ "x$D" = "x" ]; then
         touch /etc/aliases
         newaliases
@@ -224,7 +224,10 @@ pkg_postinst_${PN} () {
     fi
 }
 
+PACKAGES =+ "${PN}-cfg"
+RDEPENDS_${PN}_class-target += "${PN}-cfg"
 # Exclude .debug directories from the main package
-FILES_${PN} = "${sysconfdir} ${localstatedir} ${bindir}/* ${sbindir}/* \
+FILES_${PN} = "${localstatedir} ${bindir}/* ${sbindir}/* \
                ${libexecdir}/* ${systemd_unitdir}/*"
+FILES_${PN}-cfg = "${sysconfdir}"
 FILES_${PN}-dbg += "${libexecdir}/postfix/.debug"

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