1
0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-04-20 19:53:43 +00:00

powervr-drivers: teach modules_install to respect "usrmerge" distro feature

https://www.freedesktop.org/wiki/Software/systemd/TheCaseForTheUsrMerge/

When "usrmerge" distro feature is enabled, root directories /bin, /sbin, /lib
are simply symlinks pointing to their counterparts in /usr. Hence, modules
should be installed accordingly into /usr/lib/modules/...

Since IMG Makefiles don't take the direct target directory, such as
${nonarch_base_libdir}/modules/, adjust the top-level rootfs path instead.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Reported-by: Vivien Didelot <vdidelot@pbsc.com>
Tested-by: Vivien Didelot <vdidelot@pbsc.com>
Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
This commit is contained in:
Denys Dmytriyenko
2021-10-19 19:09:38 -04:00
committed by Yogesh Siraswar
parent 28d179d01a
commit 88f48e7cfa
2 changed files with 3 additions and 3 deletions

View File

@@ -36,5 +36,5 @@ PVR_WS = "wayland"
EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" RGX_BVNC=${PVR_BVNC} BUILD=${PVR_BUILD} PVR_BUILD_DIR=${PVR_SOC} WINDOW_SYSTEM=${PVR_WS}'
do_install() {
make -C ${STAGING_KERNEL_DIR} M=${B}/binary_${PVR_SOC}_${PVR_WS}_${PVR_BUILD}/target_aarch64/kbuild INSTALL_MOD_PATH=${D} PREFIX=${STAGING_DIR_HOST} modules_install
make -C ${STAGING_KERNEL_DIR} M=${B}/binary_${PVR_SOC}_${PVR_WS}_${PVR_BUILD}/target_aarch64/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install
}

View File

@@ -42,9 +42,9 @@ do_compile:prepend() {
}
do_install() {
make -C ${STAGING_KERNEL_DIR} M=${B}/eurasia_km/eurasiacon/binary_omap_linux_nulldrmws_release/target_armhf/kbuild INSTALL_MOD_PATH=${D} PREFIX=${STAGING_DIR_HOST} modules_install
make -C ${STAGING_KERNEL_DIR} M=${B}/eurasia_km/eurasiacon/binary_omap_linux_nulldrmws_release/target_armhf/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install
}
do_install:k3() {
make -C ${STAGING_KERNEL_DIR} M=${B}/eurasia_km/eurasiacon/binary_omap_linux_nulldrmws_release/target_aarch64/kbuild INSTALL_MOD_PATH=${D} PREFIX=${STAGING_DIR_HOST} modules_install
make -C ${STAGING_KERNEL_DIR} M=${B}/eurasia_km/eurasiacon/binary_omap_linux_nulldrmws_release/target_aarch64/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install
}