]> code.ossystems Code Review - openembedded-core.git/commitdiff
lsb: update init-functions and remove sendmail
authorKai Kang <kai.kang@windriver.com>
Mon, 16 Feb 2015 02:25:03 +0000 (10:25 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 16 Mar 2015 17:38:43 +0000 (17:38 +0000)
According to LSB specification Ref1, LSB checks file
/lib/lsb/init-functions. But for 64 bits system it is installed in
/lib64. Install init-functions to /lib/lsb to conform with LSB
specification.

Link file /usr/lib/sendmail which points to /usr/sbin/sendmail is
required by LSB according to Linux FHS[Ref 2]. But it should be done by
packages which provides command sendmail such as msmtp, postfix and
esmtp etc.

Refs:
1 http://refspecs.linuxfoundation.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/iniscrptfunc.html
2 http://www.pathname.com/fhs/pub/fhs-2.3.html#SPECIFICOPTIONS13

Signed-off-by: Kai Kang <kai.kang@windriver.com>
meta/recipes-extended/lsb/lsb_4.1.bb

index b4ef98eea716e2ce9a6dad1b2b39dde1aee41715..f05c30cd2cd87fc9b23336445c87484dea6783ea 100644 (file)
@@ -72,19 +72,18 @@ do_install(){
 
 do_install_append(){
        install -d ${D}${sysconfdir}/core-lsb
-       install -d ${D}/${baselib}/lsb
        for i in lsb_killproc lsb_log_message lsb_pidofproc lsb_start_daemon
        do
            install -m 0755 ${WORKDIR}/${i} ${D}${sysconfdir}/core-lsb
        done
-       install -m 0755 ${WORKDIR}/init-functions ${D}/${baselib}/lsb
+
+       install -d ${D}/lib/lsb
+       install -m 0755 ${WORKDIR}/init-functions ${D}/lib/lsb
 
        # creat links for LSB test
        install -d ${D}/usr/lib/lsb
        ln -sf ${sbindir}/chkconfig ${D}/usr/lib/lsb/install_initd
        ln -sf ${sbindir}/chkconfig ${D}/usr/lib/lsb/remove_initd
-       install -d ${D}/${libdir}
-       ln -sf ${sbindir}/sendmail ${D}/${libdir}/sendmail
 
        if [ "${TARGET_ARCH}" = "x86_64" ];then
               cd ${D}
@@ -119,13 +118,4 @@ do_install_append(){
 FILES_${PN} += "/lib64 \
                /usr/lib/lsb \
                 ${base_libdir}/lsb/* \
-               ${libdir}/sendmail \
                "
-
-# The sysroot/${libdir}/sendmail conflicts with esmtp's, and it's a
-# symlink to ${sbindir}/sendmail which is meaningless for sysroot, so
-# remove it.
-SYSROOT_PREPROCESS_FUNCS += "remove_sysroot_sendmail"
-remove_sysroot_sendmail() {
-    rm -r "${SYSROOT_DESTDIR}${libdir}/sendmail"
-}