diff options
| author | Denys Dmytriyenko <denys@konsulko.com> | 2021-10-19 19:09:38 -0400 |
|---|---|---|
| committer | Yogesh Siraswar <yogeshs@ti.com> | 2021-11-04 11:44:03 +0000 |
| commit | 88f48e7cfa3162dffc131444d586ad3c991ab6a7 (patch) | |
| tree | 400a32134a78c747020b15ee79590dfd4540724d /recipes-bsp | |
| parent | 28d179d01a69d4761048b3ade74e91af45f06672 (diff) | |
| download | meta-ti-88f48e7cfa3162dffc131444d586ad3c991ab6a7.tar.gz | |
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>
Diffstat (limited to 'recipes-bsp')
| -rw-r--r-- | recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.13.5776728.bb | 2 | ||||
| -rw-r--r-- | 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 c3524e99..09f6f03a 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" | |||
| 36 | EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" RGX_BVNC=${PVR_BVNC} BUILD=${PVR_BUILD} PVR_BUILD_DIR=${PVR_SOC} WINDOW_SYSTEM=${PVR_WS}' | 36 | EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" RGX_BVNC=${PVR_BVNC} BUILD=${PVR_BUILD} PVR_BUILD_DIR=${PVR_SOC} WINDOW_SYSTEM=${PVR_WS}' |
| 37 | 37 | ||
| 38 | do_install() { | 38 | do_install() { |
| 39 | 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 | 39 | 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 |
| 40 | } | 40 | } |
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 ff420cd8..3848e84e 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() { | |||
| 42 | } | 42 | } |
| 43 | 43 | ||
| 44 | do_install() { | 44 | do_install() { |
| 45 | 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 | 45 | 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 |
| 46 | } | 46 | } |
| 47 | 47 | ||
| 48 | do_install:k3() { | 48 | do_install:k3() { |
| 49 | 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 | 49 | 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 |
| 50 | } | 50 | } |