linuxloader/image-prelink/image-mklibs: Fix non-standard path prelinking
Prelinking on x86-64 wasn't working out the box as it uses /lib and not /lib64 for libs. Prelink was refusing to link as the dynamic loader didn't match its idea of the right path. Passing in the --dyanmic-linker option avoids this. We can share code from image-mklibs so abstract that into a new class, linuxloader.bbclass. This does break prelinking of multilib images, I've opened a bug so we can loop back and fix that problem, the code would need to iterate the dynamic loaders (and setup ld.so.conf files for it). (From OE-Core rev: 7c3f2f61536cc8e0322087558cdcfe29ee2fac6d) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
0b84897ea8
commit
ae85c4b9a6
|
@ -2,6 +2,8 @@ do_rootfs[depends] += "mklibs-native:do_populate_sysroot"
|
||||||
|
|
||||||
IMAGE_PREPROCESS_COMMAND += "mklibs_optimize_image; "
|
IMAGE_PREPROCESS_COMMAND += "mklibs_optimize_image; "
|
||||||
|
|
||||||
|
inherit linuxloader
|
||||||
|
|
||||||
mklibs_optimize_image_doit() {
|
mklibs_optimize_image_doit() {
|
||||||
rm -rf ${WORKDIR}/mklibs
|
rm -rf ${WORKDIR}/mklibs
|
||||||
mkdir -p ${WORKDIR}/mklibs/dest
|
mkdir -p ${WORKDIR}/mklibs/dest
|
||||||
|
@ -15,26 +17,7 @@ mklibs_optimize_image_doit() {
|
||||||
| sed "s+^\./++" \
|
| sed "s+^\./++" \
|
||||||
> ${WORKDIR}/mklibs/executables.list
|
> ${WORKDIR}/mklibs/executables.list
|
||||||
|
|
||||||
case ${TARGET_ARCH} in
|
dynamic_loader=$(linuxloader)
|
||||||
powerpc | mips | mipsel | microblaze )
|
|
||||||
dynamic_loader="${base_libdir}/ld.so.1"
|
|
||||||
;;
|
|
||||||
powerpc64)
|
|
||||||
dynamic_loader="${base_libdir}/ld64.so.1"
|
|
||||||
;;
|
|
||||||
x86_64)
|
|
||||||
dynamic_loader="${base_libdir}/ld-linux-x86-64.so.2"
|
|
||||||
;;
|
|
||||||
i*86 )
|
|
||||||
dynamic_loader="${base_libdir}/ld-linux.so.2"
|
|
||||||
;;
|
|
||||||
arm )
|
|
||||||
dynamic_loader="${base_libdir}/ld-linux.so.3"
|
|
||||||
;;
|
|
||||||
* )
|
|
||||||
dynamic_loader="/unknown_dynamic_linker"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
mklibs -v \
|
mklibs -v \
|
||||||
--ldlib ${dynamic_loader} \
|
--ldlib ${dynamic_loader} \
|
||||||
|
|
|
@ -6,6 +6,8 @@ python prelink_setup () {
|
||||||
oe.utils.write_ld_so_conf(d)
|
oe.utils.write_ld_so_conf(d)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
inherit linuxloader
|
||||||
|
|
||||||
prelink_image () {
|
prelink_image () {
|
||||||
# export PSEUDO_DEBUG=4
|
# export PSEUDO_DEBUG=4
|
||||||
# /bin/env | /bin/grep PSEUDO
|
# /bin/env | /bin/grep PSEUDO
|
||||||
|
@ -31,8 +33,10 @@ prelink_image () {
|
||||||
fi
|
fi
|
||||||
cat ${STAGING_DIR_TARGET}${sysconfdir}/ld.so.conf >> $ldsoconf
|
cat ${STAGING_DIR_TARGET}${sysconfdir}/ld.so.conf >> $ldsoconf
|
||||||
|
|
||||||
|
dynamic_loader=$(linuxloader)
|
||||||
|
|
||||||
# prelink!
|
# prelink!
|
||||||
${STAGING_DIR_NATIVE}${sbindir_native}/prelink --root ${IMAGE_ROOTFS} -amR -N -c ${sysconfdir}/prelink.conf
|
${STAGING_DIR_NATIVE}${sbindir_native}/prelink --root ${IMAGE_ROOTFS} -amR -N -c ${sysconfdir}/prelink.conf --dynamic-linker $dynamic_loader
|
||||||
|
|
||||||
# Remove the prelink.conf if we had to add it.
|
# Remove the prelink.conf if we had to add it.
|
||||||
if [ "$dummy_prelink_conf" = "true" ]; then
|
if [ "$dummy_prelink_conf" = "true" ]; then
|
||||||
|
|
|
@ -0,0 +1,24 @@
|
||||||
|
|
||||||
|
linuxloader () {
|
||||||
|
case ${TARGET_ARCH} in
|
||||||
|
powerpc | mips | mipsel | microblaze )
|
||||||
|
dynamic_loader="${base_libdir}/ld.so.1"
|
||||||
|
;;
|
||||||
|
powerpc64)
|
||||||
|
dynamic_loader="${base_libdir}/ld64.so.1"
|
||||||
|
;;
|
||||||
|
x86_64)
|
||||||
|
dynamic_loader="${base_libdir}/ld-linux-x86-64.so.2"
|
||||||
|
;;
|
||||||
|
i*86 )
|
||||||
|
dynamic_loader="${base_libdir}/ld-linux.so.2"
|
||||||
|
;;
|
||||||
|
arm )
|
||||||
|
dynamic_loader="${base_libdir}/ld-linux.so.3"
|
||||||
|
;;
|
||||||
|
* )
|
||||||
|
dynamic_loader="/unknown_dynamic_linker"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
echo $dynamic_loader
|
||||||
|
}
|
Loading…
Reference in New Issue