mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 05:29:32 +00:00
Code Issues Projects Releases Wiki Activity

image.bbclass: create root symlinks in nativesdk target sysroot

Browse Source 
To match with the target image, the generated nativesdk's target sysroot also
should have the root symlinks(/lib*, /bin/, /sbin). So, extended the
'create_merged_usr_symlinks' to reuse symlink creation part even for nativesdk
using POPULATE_SDK_PRE_TARGET_COMMAND.

(From OE-Core rev: 2d7a58ef7a9597fde868a0582153d1f9a3007f1e)

Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Amarnath Valluri
2017-06-15 13:32:39 +03:00
committed by Richard Purdie
parent 2ea87f74da
commit 96e3848ba0
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/image.bbclass
+20 -9
View File
@@ -620,21 +620,32 @@ addtask bundle_initramfs after do_image_complete
# Prepare the root links to point to the /usr counterparts. # Prepare the root links to point to the /usr counterparts.
create_merged_usr_symlinks() { create_merged_usr_symlinks() {
install -d ${IMAGE_ROOTFS}${base_bindir} ${IMAGE_ROOTFS}${base_sbindir} ${IMAGE_ROOTFS}${base_libdir} root="$1"
lnr ${IMAGE_ROOTFS}${base_bindir} ${IMAGE_ROOTFS}/bin install -d $root${base_bindir} $root${base_sbindir} $root${base_libdir}
lnr ${IMAGE_ROOTFS}${base_sbindir} ${IMAGE_ROOTFS}/sbin lnr $root${base_bindir} $root/bin
lnr ${IMAGE_ROOTFS}${base_libdir} ${IMAGE_ROOTFS}/${baselib} lnr $root${base_sbindir} $root/sbin
lnr $root${base_libdir} $root/${baselib}
if [ "${nonarch_base_libdir}" != "${base_libdir}" ]; then if [ "${nonarch_base_libdir}" != "${base_libdir}" ]; then
install -d ${IMAGE_ROOTFS}${nonarch_base_libdir} install -d $root${nonarch_base_libdir}
lnr ${IMAGE_ROOTFS}${nonarch_base_libdir} ${IMAGE_ROOTFS}/lib lnr $root${nonarch_base_libdir} $root/lib
fi fi
# create base links for multilibs # create base links for multilibs
multi_libdirs="${@d.getVar('MULTILIB_VARIANTS')}" multi_libdirs="${@d.getVar('MULTILIB_VARIANTS')}"
for d in $multi_libdirs; do for d in $multi_libdirs; do
install -d ${IMAGE_ROOTFS}${exec_prefix}/$d install -d $root${exec_prefix}/$d
lnr ${IMAGE_ROOTFS}${exec_prefix}/$d ${IMAGE_ROOTFS}/$d lnr $root${exec_prefix}/$d $root/$d
done done
} }
ROOTFS_PREPROCESS_COMMAND += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'create_merged_usr_symlinks; ', '',d)}"
create_merged_usr_symlinks_rootfs() {
create_merged_usr_symlinks ${IMAGE_ROOTFS}
}
create_merged_usr_symlinks_sdk() {
create_merged_usr_symlinks ${SDK_OUTPUT}${SDKTARGETSYSROOT}
}
ROOTFS_PREPROCESS_COMMAND += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'create_merged_usr_symlinks_rootfs; ', '',d)}"
POPULATE_SDK_PRE_TARGET_COMMAND += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'create_merged_usr_symlinks_sdk; ', '',d)}"