diff options
Diffstat (limited to 'meta/recipes-extended/lsb')
-rw-r--r-- | meta/recipes-extended/lsb/lsb_4.1.bb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-extended/lsb/lsb_4.1.bb b/meta/recipes-extended/lsb/lsb_4.1.bb index 2eb67b8c3a..cedf39eb65 100644 --- a/meta/recipes-extended/lsb/lsb_4.1.bb +++ b/meta/recipes-extended/lsb/lsb_4.1.bb | |||
@@ -97,8 +97,8 @@ do_install_append() { | |||
97 | ln -sf ${sbindir}/chkconfig ${D}${nonarch_libdir}/lsb/remove_initd | 97 | ln -sf ${sbindir}/chkconfig ${D}${nonarch_libdir}/lsb/remove_initd |
98 | 98 | ||
99 | if [ "${TARGET_ARCH}" = "x86_64" ]; then | 99 | if [ "${TARGET_ARCH}" = "x86_64" ]; then |
100 | if [ "${baselib}" != "lib64" ]; then | 100 | if [ "${base_libdir}" != "${base_prefix}/lib64" ]; then |
101 | lnr ${D}${base_libdir} ${D}/lib64 | 101 | lnr ${D}${base_libdir} ${D}${base_prefix}/lib64 |
102 | fi | 102 | fi |
103 | cd ${D}${base_libdir} | 103 | cd ${D}${base_libdir} |
104 | ln -sf ld-linux-x86-64.so.2 ld-lsb-x86-64.so.2 | 104 | ln -sf ld-linux-x86-64.so.2 ld-lsb-x86-64.so.2 |
@@ -111,8 +111,8 @@ do_install_append() { | |||
111 | fi | 111 | fi |
112 | 112 | ||
113 | if [ "${TARGET_ARCH}" = "powerpc64" ]; then | 113 | if [ "${TARGET_ARCH}" = "powerpc64" ]; then |
114 | if [ "${baselib}" != "lib64" ]; then | 114 | if [ "${base_libdir}" != "${base_prefix}/lib64" ]; then |
115 | lnr ${D}${base_libdir} ${D}/lib64 | 115 | lnr ${D}${base_libdir} ${D}${base_prefix}/lib64 |
116 | fi | 116 | fi |
117 | cd ${D}${base_libdir} | 117 | cd ${D}${base_libdir} |
118 | ln -sf ld64.so.1 ld-lsb-ppc64.so.2 | 118 | ln -sf ld64.so.1 ld-lsb-ppc64.so.2 |
@@ -125,7 +125,7 @@ do_install_append() { | |||
125 | fi | 125 | fi |
126 | } | 126 | } |
127 | 127 | ||
128 | FILES_${PN} += "${@'/lib64' if d.getVar('TARGET_ARCH') == ('x86_64' or 'powerpc64') and '${baselib}' != 'lib64' else ''} \ | 128 | FILES_${PN} += "${@'${base_prefix}/lib64' if d.getVar('TARGET_ARCH') == ('x86_64' or 'powerpc64') and '${base_libdir}' != '${base_prefix}/lib64' else ''} \ |
129 | ${base_libdir} \ | 129 | ${base_libdir} \ |
130 | ${nonarch_libdir}/lsb \ | 130 | ${nonarch_libdir}/lsb \ |
131 | ${nonarch_base_libdir}/lsb/* \ | 131 | ${nonarch_base_libdir}/lsb/* \ |