On 11/4/14, 7:40 AM, Koen Kooi wrote:
Also collapse do_install and do_install_append.

/usr/lib is hard coded for a reason. The LSB specification says the files must be installed in /usr/lib/lsb. (If this has changed, great, but it was true through at least early last year.)

--Mark

Signed-off-by: Koen Kooi <[email protected]>
---
  meta/recipes-extended/lsb/lsb_4.1.bb | 11 +++++------
  1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-extended/lsb/lsb_4.1.bb 
b/meta/recipes-extended/lsb/lsb_4.1.bb
index 34a70d0..897520a 100644
--- a/meta/recipes-extended/lsb/lsb_4.1.bb
+++ b/meta/recipes-extended/lsb/lsb_4.1.bb
@@ -72,9 +72,7 @@ do_install(){
                touch ${D}${sysconfdir}/lsb-release.d/graphics-${PV}-ppc64
                touch ${D}${sysconfdir}/lsb-release.d/desktop-${PV}-ppc64
        fi
-}

-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
@@ -84,9 +82,9 @@ do_install_append(){
         install -m 0755 ${WORKDIR}/init-functions ${D}/${baselib}/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}/lsb
+       ln -sf ${sbindir}/chkconfig ${D}${libdir}/lsb/install_initd
+       ln -sf ${sbindir}/chkconfig ${D}${libdir}/lsb/remove_initd
         install -d ${D}/${libdir}
         ln -sf ${sbindir}/sendmail ${D}/${libdir}/sendmail

@@ -120,8 +118,9 @@ do_install_append(){
                 ln -sf ld.so.1 ld-lsb-ppc32.so.3
         fi
  }
+
  FILES_${PN} += "/lib64 \
-               /usr/lib/lsb \
+               ${libdir}/lsb \
                  ${base_libdir}/lsb/* \
                ${libdir}/sendmail \
                 "


--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Reply via email to