Patchwork lsb: change script init-functions installed path

login
register
mail settings
Submitter chan@windriver.com
Date Feb. 21, 2014, 9:45 a.m.
Message ID <1392975910-21793-2-git-send-email-chan@windriver.com>
Download mbox | patch
Permalink /patch/67107/
State New
Headers show

Comments

chan@windriver.com - Feb. 21, 2014, 9:45 a.m.
From: Han Chao <chan@windriver.com>

The bb code assume the target is 64bit, so some files can not be
installed well. init-functions is a text script. Other script called
it from /lib/lsb, but it is installed on /lib64/lsb.
So this change fix the image path and packages.

Signed-off-by: Han Chao <chan@windriver.com>
---
 meta/recipes-extended/lsb/lsb_4.1.bb |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

Patch

diff --git a/meta/recipes-extended/lsb/lsb_4.1.bb b/meta/recipes-extended/lsb/lsb_4.1.bb
index ecb4dcc..62a8077 100644
--- a/meta/recipes-extended/lsb/lsb_4.1.bb
+++ b/meta/recipes-extended/lsb/lsb_4.1.bb
@@ -30,6 +30,7 @@  do_install(){
 
 	mkdir -p ${D}${base_bindir}
 	mkdir -p ${D}/${baselib}
+	mkdir -p ${D}/lib
 	mkdir -p ${D}${sysconfdir}/lsb-release.d
 	printf "LSB_VERSION=\"core-4.1-noarch:" > ${D}${sysconfdir}/lsb-release
 
@@ -70,12 +71,12 @@  do_install(){
 
 do_install_append(){
        install -d ${D}${sysconfdir}/core-lsb
-       install -d ${D}/${baselib}/lsb
+       install -d ${D}/lib/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 -m 0755 ${WORKDIR}/init-functions ${D}/lib/lsb
 
        # creat links for LSB test
        install -d ${D}/usr/lib/lsb
@@ -114,8 +115,8 @@  do_install_append(){
                ln -sf ld.so.1 ld-lsb-ppc32.so.3
        fi
 }
-FILES_${PN} += "/lib64 \
+FILES_${PN} += "/lib \
+		${baselib} \
 		/usr/lib/lsb \
-                ${base_libdir}/lsb/* \
 		${libdir}/sendmail \
                "