diff options
author | Kang Kai <kai.kang@windriver.com> | 2015-03-10 11:28:31 +0800 |
---|---|---|
committer | Joe MacDonald <joe_macdonald@mentor.com> | 2015-03-10 18:25:14 -0400 |
commit | a074d2a7d084da0e98889eb763dd1623f5a3645a (patch) | |
tree | 366990709c0c76e5d3e667ffd3f15494ce2cbdc5 | |
parent | 9584c59d39fba391d6427b53a410fe9f252096a0 (diff) | |
download | meta-openembedded-a074d2a7d084da0e98889eb763dd1623f5a3645a.tar.gz |
esmtp: update sendmail link files
esmtp use 'sbinsendmail' to define alternative ${sbindir}/sendmail, but
other packages msmtp and postfix use 'sendmail'. When remove esmtp, it
removes ${sbindir}/sendmail even msmtp or postfix is installed which has
alternative ${sbindir}/sendmail.
Make esmtp use 'sendmail' too to fix this issue.
Remove ${libdir}/sendmail which is only used by LSB core test for
historical reasons. And only create link file with fixed path
/usr/lib/sendmail for LSB images even for 64 bits system.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
-rw-r--r-- | meta-networking/recipes-support/esmtp/esmtp_1.2.bb | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/meta-networking/recipes-support/esmtp/esmtp_1.2.bb b/meta-networking/recipes-support/esmtp/esmtp_1.2.bb index 69bdaf994..917dc8b41 100644 --- a/meta-networking/recipes-support/esmtp/esmtp_1.2.bb +++ b/meta-networking/recipes-support/esmtp/esmtp_1.2.bb | |||
@@ -18,23 +18,23 @@ EXTRA_OECONF = "--with-libesmtp=${STAGING_EXECPREFIXDIR}" | |||
18 | 18 | ||
19 | inherit autotools update-alternatives | 19 | inherit autotools update-alternatives |
20 | 20 | ||
21 | ALTERNATIVE_${PN} = "sbinsendmail libsendmail" | 21 | ALTERNATIVE_${PN} = "sendmail" |
22 | 22 | ||
23 | ALTERNATIVE_LINK_NAME[sbinsendmail] = "${sbindir}/sendmail" | 23 | ALTERNATIVE_LINK_NAME[sendmail] = "${sbindir}/sendmail" |
24 | ALTERNATIVE_TARGET[sbinsendmail] = "${bindir}/esmtp" | 24 | ALTERNATIVE_TARGET[sendmail] = "${bindir}/esmtp" |
25 | ALTERNATIVE_LINK_NAME[libsendmail] = "${libdir}/sendmail" | ||
26 | ALTERNATIVE_TARGET[libsendmail] = "${bindir}/esmtp" | ||
27 | ALTERNATIVE_PRIORITY = "10" | 25 | ALTERNATIVE_PRIORITY = "10" |
28 | 26 | ||
29 | SRC_URI[md5sum] = "79a9c1f9023d53f35bb82bf446150a72" | 27 | SRC_URI[md5sum] = "79a9c1f9023d53f35bb82bf446150a72" |
30 | SRC_URI[sha256sum] = "a0d26931bf731f97514da266d079d8bc7d73c65b3499ed080576ab606b21c0ce" | 28 | SRC_URI[sha256sum] = "a0d26931bf731f97514da266d079d8bc7d73c65b3499ed080576ab606b21c0ce" |
31 | 29 | ||
32 | FILES_${PN} += "${libdir}/" | 30 | do_install_append() { |
31 | # only one file /usr/lib/sendmail in ${D}${libdir} | ||
32 | rm -rf ${D}${libdir} | ||
33 | } | ||
33 | 34 | ||
34 | # The sysroot/${libdir}/sendmail conflicts with lsb's, and it's a | 35 | pkg_postinst_${PN}_linuxstdbase () { |
35 | # symlink to ${bindir}/esmtp which is meaningless for sysroot, so | 36 | # /usr/lib/sendmial is required by LSB core test |
36 | # remove it. | 37 | [ ! -L $D/usr/lib/sendmail ] && ln -sf ${sbindir}/sendmail $D/usr/lib/ |
37 | SYSROOT_PREPROCESS_FUNCS += "remove_sysroot_sendmail" | ||
38 | remove_sysroot_sendmail() { | ||
39 | rm -r "${SYSROOT_DESTDIR}${libdir}/sendmail" | ||
40 | } | 38 | } |
39 | |||
40 | FILES_${PN} += "${libdir}/" | ||