[OE-core] [PATCH 2/3] lsb 4.1: fix /usr/lib/ hardcodes
Koen Kooi
koen.kooi at linaro.org
Tue Nov 4 13:40:46 UTC 2014
Also collapse do_install and do_install_append.
Signed-off-by: Koen Kooi <koen.kooi at linaro.org>
---
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 \
"
--
1.9.3
More information about the Openembedded-core
mailing list