Denys,
This was already posted by you https://lists.yoctoproject.org/g/meta-ti/message/14063 and has already been merged.

Thanks
Yogesh

On 11/1/2021 2:33 PM, Denys Dmytriyenko wrote:
From: Denys Dmytriyenko <[email protected]>

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 <[email protected]>
Signed-off-by: Yogesh Siraswar <[email protected]>
Reported-by: Vivien Didelot <[email protected]>
Tested-by: Vivien Didelot <[email protected]>
Signed-off-by: Denys Dmytriyenko <[email protected]>
---
  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 c3524e9..09f6f03 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 ff420cd..3848e84 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
  }





-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#14133): 
https://lists.yoctoproject.org/g/meta-ti/message/14133
Mute This Topic: https://lists.yoctoproject.org/mt/86750101/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to