summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2013-11-13 16:27:33 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-18 11:21:24 +0000
commitf939b6c18eafec8859e1ec29c8ff650b3036dd79 (patch)
tree79d773a9ef5d8c378bc1a87ad59a073f10bcc26a /meta
parent9daa1de753e58b7f678e68cf307f6028c0c79a6a (diff)
downloadpoky-f939b6c18eafec8859e1ec29c8ff650b3036dd79.tar.gz
lsb: update directory of install_initd and remove_initd
According to LSB specification: http://refspecs.linuxfoundation.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/installinitd.html http://refspecs.linuxfoundation.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/removeinitd.html commands install_initd and remove_initd should under directory /usr/lib/lsb/. lsb recipe creates these commands under directory ${libdir} which may expand to /usr/lib64 when multilib is enabled on qemux86-64. That will cause LSB command check for install_initd and remove_initd fail. So correct it. (From OE-Core rev: f9c37768caf7edf9343f76f16fa5fd4e7cd772c1) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/lsb/lsb_4.1.bb8
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/recipes-extended/lsb/lsb_4.1.bb b/meta/recipes-extended/lsb/lsb_4.1.bb
index c80ff593c7..ecb4dcc064 100644
--- a/meta/recipes-extended/lsb/lsb_4.1.bb
+++ b/meta/recipes-extended/lsb/lsb_4.1.bb
@@ -78,9 +78,10 @@ do_install_append(){
78 install -m 0755 ${WORKDIR}/init-functions ${D}/${baselib}/lsb 78 install -m 0755 ${WORKDIR}/init-functions ${D}/${baselib}/lsb
79 79
80 # creat links for LSB test 80 # creat links for LSB test
81 install -d ${D}/${libdir}/lsb 81 install -d ${D}/usr/lib/lsb
82 ln -sf ${sbindir}/chkconfig ${D}/${libdir}/lsb/install_initd 82 ln -sf ${sbindir}/chkconfig ${D}/usr/lib/lsb/install_initd
83 ln -sf ${sbindir}/chkconfig ${D}/${libdir}/lsb/remove_initd 83 ln -sf ${sbindir}/chkconfig ${D}/usr/lib/lsb/remove_initd
84 install -d ${D}/${libdir}
84 ln -sf ${sbindir}/sendmail ${D}/${libdir}/sendmail 85 ln -sf ${sbindir}/sendmail ${D}/${libdir}/sendmail
85 86
86 if [ "${TARGET_ARCH}" = "x86_64" ];then 87 if [ "${TARGET_ARCH}" = "x86_64" ];then
@@ -114,6 +115,7 @@ do_install_append(){
114 fi 115 fi
115} 116}
116FILES_${PN} += "/lib64 \ 117FILES_${PN} += "/lib64 \
118 /usr/lib/lsb \
117 ${base_libdir}/lsb/* \ 119 ${base_libdir}/lsb/* \
118 ${libdir}/sendmail \ 120 ${libdir}/sendmail \
119 " 121 "