[oe] [meta-networking][PATCH] Fix confilct error in do_rootfs.

[Khem Raj]

Can you rebase it on master and send again ?
On Tue, Jun 5, 2018 at 8:43 PM Lei Maohui <leimaohui at cn.fujitsu.com> wrote:
>
> Error: Transaction check error:
>   file /usr/bin/mailq conflicts between attempted installs of esmtp-1.2-r0.x86_64 and postfix-3.2.2-r0.x86_64
>   file /usr/bin/newaliases conflicts between attempted installs of esmtp-1.2-r0.x86_64 and postfix-3.2.2-r0.x86_64
>
> Signed-off-by: Lei Maohui <leimaohui at cn.fujitsu.com>
> ---
>  meta-networking/recipes-daemons/postfix/postfix.inc | 7 ++++---
>  meta-networking/recipes-support/esmtp/esmtp_1.2.bb  | 6 +++---
>  2 files changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/meta-networking/recipes-daemons/postfix/postfix.inc b/meta-networking/recipes-daemons/postfix/postfix.inc
> index 09447d5..a5e8618 100644
> --- a/meta-networking/recipes-daemons/postfix/postfix.inc
> +++ b/meta-networking/recipes-daemons/postfix/postfix.inc
> @@ -219,9 +219,10 @@ do_install_append_class-target() {
>      sed -i 's:-fdebug-prefix-map[^ ]*::g; s:--sysroot=${STAGING_DIR_TARGET}::g' ${D}/etc/postfix/makedefs.out
>  }
>
> -ALTERNATIVE_${PN} = "sendmail"
> -ALTERNATIVE_TARGET[sendmail] = "${sbindir}/sendmail.postfix"
> -ALTERNATIVE_LINK_NAME[sendmail] = "${sbindir}/sendmail"
> +ALTERNATIVE_${PN} += "mailq newaliases"
> +ALTERNATIVE_TARGET[mailq] = "${bindir}/mailq"
> +ALTERNATIVE_TARGET[newaliases] = "${bindir}/newaliases"
> +
>  ALTERNATIVE_PRIORITY = "120"
>
>  ALTERNATIVE_${PN}-doc += "mailq.1 newaliases.1 sendmail.1"
> diff --git a/meta-networking/recipes-support/esmtp/esmtp_1.2.bb b/meta-networking/recipes-support/esmtp/esmtp_1.2.bb
> index 2da73e7..9fb817b 100644
> --- a/meta-networking/recipes-support/esmtp/esmtp_1.2.bb
> +++ b/meta-networking/recipes-support/esmtp/esmtp_1.2.bb
> @@ -18,10 +18,10 @@ EXTRA_OECONF = "--with-libesmtp=${STAGING_EXECPREFIXDIR}"
>
>  inherit autotools update-alternatives
>
> -ALTERNATIVE_${PN} = "sendmail"
> +ALTERNATIVE_${PN} += "mailq newaliases"
> +ALTERNATIVE_TARGET[mailq] = "${bindir}/mailq"
> +ALTERNATIVE_TARGET[newaliases] = "${bindir}/newaliases"
>
> -ALTERNATIVE_LINK_NAME[sendmail] = "${sbindir}/sendmail"
> -ALTERNATIVE_TARGET[sendmail] = "${bindir}/esmtp"
>  ALTERNATIVE_PRIORITY = "10"
>
>  ALTERNATIVE_${PN}-doc += "mailq.1 newaliases.1 sendmail.1"
> --
> 1.9.1
>
>
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel