summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2017-03-28 14:01:18 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-04-01 08:14:58 +0100
commit03246177821a3bbe5303dc1cc5c31f72fe909d82 (patch)
tree9d760830b0b76c9ef6c34003ac96cb5e6def4949 /meta
parent3041659c43acec3f07ba66275d0e8664cdc4ea94 (diff)
downloadpoky-03246177821a3bbe5303dc1cc5c31f72fe909d82.tar.gz
lsb: Create ${base_prefix}/lib64 correctly when needed
There were two remaining cases that could end up creating /lib64 rather than ${base_prefix}/lib64. The difference matters when building with usrmerge. (From OE-Core rev: b791f13286c8c58ce1f3fa3745ffdd5bd5ff1d02) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/lsb/lsb_4.1.bb10
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
128FILES_${PN} += "${@'/lib64' if d.getVar('TARGET_ARCH') == ('x86_64' or 'powerpc64') and '${baselib}' != 'lib64' else ''} \ 128FILES_${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/* \