If the usrmerge DISTRO_FEATURE is enabled, modules should be installed
under /usr/lib instead of /lib. We can handle this by using
${root_prefix} in INSTALL_MOD_PATH.

Signed-off-by: Paul Barker <[email protected]>
---
 recipes-networking/openvswitch/openvswitch.inc    | 2 +-
 recipes-networking/openvswitch/openvswitch_git.bb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-networking/openvswitch/openvswitch.inc 
b/recipes-networking/openvswitch/openvswitch.inc
index 251a7056347f..e6c9091ad364 100644
--- a/recipes-networking/openvswitch/openvswitch.inc
+++ b/recipes-networking/openvswitch/openvswitch.inc
@@ -132,7 +132,7 @@ do_install:append() {
        install -d ${D}/usr/share/openvswitch/scripts/
        install -m 755 
${S}/rhel/usr_share_openvswitch_scripts_ovs-systemd-reload 
${D}/usr/share/openvswitch/scripts/ovs-systemd-reload
 
-       oe_runmake modules_install INSTALL_MOD_PATH=${D}
+       oe_runmake modules_install INSTALL_MOD_PATH=${D}${root_prefix}
        install -d ${D}${libdir}/python${PYTHON_BASEVERSION}/site-packages
        cp -r ${S}/python/ovstest/ 
${D}${libdir}/python${PYTHON_BASEVERSION}/site-packages/
 }
diff --git a/recipes-networking/openvswitch/openvswitch_git.bb 
b/recipes-networking/openvswitch/openvswitch_git.bb
index 2e125e78fdf1..f5d85f3fb821 100644
--- a/recipes-networking/openvswitch/openvswitch_git.bb
+++ b/recipes-networking/openvswitch/openvswitch_git.bb
@@ -53,5 +53,5 @@ do_install_ptest() {
 }
 
 do_install:append() {
-       oe_runmake modules_install INSTALL_MOD_PATH=${D}
+       oe_runmake modules_install INSTALL_MOD_PATH=${D}${root_prefix}
 }
-- 
2.25.1

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

Reply via email to