| Message ID | 1564043421-126710-1-git-send-email-simon.rowe@citrix.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/openvmtools: use tirpc when no toolchain RPC | expand |
Hello Simon, On Thu, 25 Jul 2019 09:30:21 +0100 Simon Rowe <simon.rowe@citrix.com> wrote: > openvmtools detects an external RPC library, select package/libtirpc > when necessary. > > Signed-off-by: Simon Rowe <simon.rowe@citrix.com> Thanks for the patch. However, adding the select in Config.in was not sufficient: it does not guarantee that libtirpc will be built before openvmtools. To ensure it gets built before, libtirpc needs to be added to OPENVMTOOLS_DEPENDENCIES. So I fixed this issue in your patch, slightly tweaked the commit title/log and applied. Thanks! Thomas
On 26/07/2019 22:13, Thomas Petazzoni wrote: > Thanks for the patch. However, adding the select in Config.in was not > sufficient: it does not guarantee that libtirpc will be built before > openvmtools. To ensure it gets built before, libtirpc needs to be added > to OPENVMTOOLS_DEPENDENCIES. > > So I fixed this issue in your patch, slightly tweaked the commit > title/log and applied. Thank you for explaining this, I'll try to remember the need to update the makefile in future, Simon
>>>>> "Simon" == Simon Rowe <simon.rowe@citrix.com> writes: > openvmtools detects an external RPC library, select package/libtirpc > when necessary. > Signed-off-by: Simon Rowe <simon.rowe@citrix.com> Committed to 2019.02.x and 2019.05.x, thanks.
diff --git a/package/openvmtools/Config.in b/package/openvmtools/Config.in index 97860f8..2bd5c27 100644 --- a/package/openvmtools/Config.in +++ b/package/openvmtools/Config.in @@ -4,11 +4,11 @@ config BR2_PACKAGE_OPENVMTOOLS depends on BR2_USE_MMU # libglib2 depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC depends on BR2_ENABLE_LOCALE depends on !BR2_TOOLCHAIN_USES_UCLIBC select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBDNET + select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC help Open Virtual Machine Tools for VMware guest OS @@ -61,9 +61,9 @@ comment "resolutionkms needs udev, a toolchain w/ threads" endif -comment "openvmtools needs a glibc or musl toolchain w/ wchar, threads, RPC, locale" +comment "openvmtools needs a glibc or musl toolchain w/ wchar, threads, locale" depends on BR2_i386 || BR2_x86_64 depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_HAS_NATIVE_RPC || !BR2_ENABLE_LOCALE || \ + !BR2_ENABLE_LOCALE || \ BR2_TOOLCHAIN_USES_UCLIBC
openvmtools detects an external RPC library, select package/libtirpc when necessary. Signed-off-by: Simon Rowe <simon.rowe@citrix.com> --- package/openvmtools/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)