From 309e15ae517f44607a9efa019fe53c0b9732c113 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 19 Oct 2021 19:09:31 -0400 Subject: 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 Signed-off-by: Yogesh Siraswar Reported-by: Vivien Didelot Tested-by: Vivien Didelot --- recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.13.5776728.bb | 2 +- recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.13.5776728.bb b/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.13.5776728.bb index e6edebdd..a05de0f2 100644 --- a/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.13.5776728.bb +++ b/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.13.5776728.bb @@ -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 } diff --git a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb index a5160fdc..e21ccc7f 100644 --- a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb +++ b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb @@ -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 } -- cgit v1.2.3-54-g00ecf