[oe-commits] Kai Kang : lsb: update directory of install_initd and remove_initd
git at git.openembedded.org
git at git.openembedded.org
Wed Dec 18 11:43:43 UTC 2013
Module: openembedded-core.git
Branch: master-next
Commit: f9c37768caf7edf9343f76f16fa5fd4e7cd772c1
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=f9c37768caf7edf9343f76f16fa5fd4e7cd772c1
Author: Kai Kang <kai.kang at windriver.com>
Date: Wed Nov 13 16:27:33 2013 +0800
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.
Signed-off-by: Kai Kang <kai.kang at windriver.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
meta/recipes-extended/lsb/lsb_4.1.bb | 8 +++++---
1 file 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 c80ff59..ecb4dcc 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(){
install -m 0755 ${WORKDIR}/init-functions ${D}/${baselib}/lsb
# creat links for LSB test
- install -d ${D}/${libdir}/lsb
- ln -sf ${sbindir}/chkconfig ${D}/${libdir}/lsb/install_initd
- ln -sf ${sbindir}/chkconfig ${D}/${libdir}/lsb/remove_initd
+ 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
@@ -114,6 +115,7 @@ do_install_append(){
fi
}
FILES_${PN} += "/lib64 \
+ /usr/lib/lsb \
${base_libdir}/lsb/* \
${libdir}/sendmail \
"
More information about the Openembedded-commits
mailing list