From 30c3df4c222e78e3167c348afa4f9c875e17572a Mon Sep 17 00:00:00 2001 From: Paul Barker Date: Thu, 6 Oct 2022 09:10:20 +0100 Subject: openvswitch: Fix INSTALL_MOD_PATH 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 Signed-off-by: Bruce Ashfield --- recipes-networking/openvswitch/openvswitch.inc | 2 +- recipes-networking/openvswitch/openvswitch_git.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'recipes-networking/openvswitch') diff --git a/recipes-networking/openvswitch/openvswitch.inc b/recipes-networking/openvswitch/openvswitch.inc index 251a7056..e6c9091a 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 2e125e78..f5d85f3f 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} } -- cgit v1.2.3-54-g00ecf