[meta-virtualization][PATCH] openvswitch: Fix INSTALL_MOD_PATH

[meta-virtualization][PATCH] openvswitch: Fix INSTALL_MOD_PATH

[Paul Barker]

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 <paul.barker@sancloud.com>
---
 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

Re: [meta-virtualization][PATCH] openvswitch: Fix INSTALL_MOD_PATH

[Bruce Ashfield]

merged.

Bruce

On Thu, Oct 6, 2022 at 4:10 AM Paul Barker <paul.barker@sancloud.com> wrote:
>
> 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 <paul.barker@sancloud.com>
> ---
>  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
>


-- 
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II