From a074d2a7d084da0e98889eb763dd1623f5a3645a Mon Sep 17 00:00:00 2001 From: Kang Kai Date: Tue, 10 Mar 2015 11:28:31 +0800 Subject: 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 Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald --- meta-networking/recipes-support/esmtp/esmtp_1.2.bb | 24 +++++++++++----------- 1 file 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 69bdaf9943..917dc8b414 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}" inherit autotools update-alternatives -ALTERNATIVE_${PN} = "sbinsendmail libsendmail" +ALTERNATIVE_${PN} = "sendmail" -ALTERNATIVE_LINK_NAME[sbinsendmail] = "${sbindir}/sendmail" -ALTERNATIVE_TARGET[sbinsendmail] = "${bindir}/esmtp" -ALTERNATIVE_LINK_NAME[libsendmail] = "${libdir}/sendmail" -ALTERNATIVE_TARGET[libsendmail] = "${bindir}/esmtp" +ALTERNATIVE_LINK_NAME[sendmail] = "${sbindir}/sendmail" +ALTERNATIVE_TARGET[sendmail] = "${bindir}/esmtp" ALTERNATIVE_PRIORITY = "10" SRC_URI[md5sum] = "79a9c1f9023d53f35bb82bf446150a72" SRC_URI[sha256sum] = "a0d26931bf731f97514da266d079d8bc7d73c65b3499ed080576ab606b21c0ce" -FILES_${PN} += "${libdir}/" +do_install_append() { + # only one file /usr/lib/sendmail in ${D}${libdir} + rm -rf ${D}${libdir} +} -# The sysroot/${libdir}/sendmail conflicts with lsb's, and it's a -# symlink to ${bindir}/esmtp which is meaningless for sysroot, so -# remove it. -SYSROOT_PREPROCESS_FUNCS += "remove_sysroot_sendmail" -remove_sysroot_sendmail() { - rm -r "${SYSROOT_DESTDIR}${libdir}/sendmail" +pkg_postinst_${PN}_linuxstdbase () { + # /usr/lib/sendmial is required by LSB core test + [ ! -L $D/usr/lib/sendmail ] && ln -sf ${sbindir}/sendmail $D/usr/lib/ } + +FILES_${PN} += "${libdir}/" -- cgit v1.2.3-54-g00ecf