[Buildroot] [PATCH 1/1] package/openvmtools: fix build on i686

* [Buildroot] [PATCH 1/1] package/openvmtools: fix build on i686
@ 2026-10-25 17:26 Bernd Kuhls
  2026-10-25 17:58 ` Thomas Petazzoni via buildroot
  0 siblings, 1 reply; 2+ messages in thread
From: Bernd Kuhls @ 2026-10-25 17:26 UTC (permalink / raw)
  To: buildroot; +Cc: Karoly Kasza

The patch set used to bump openvmtools from 11.3.5 to 13.1.0 contained a
patch which is not needed anymore due to upstream fix
https://github.com/vmware/open-vm-tools/commit/36eea633611e678f3ea17a913c0990f319135c48
available since version 12.1.0.

The patch causes build errors on i686:

hgfsUtil.c: In function 'HgfsConvertFromNtTimeNsec':
hgfsUtil.c:135:49: error: 'sec64' undeclared (first use in this function)
hgfsUtil.c:135:57: error: 'nsec' undeclared (first use in this function)

To fix the problem we remove patch 0010 and renumber the remaining
patches.

Fixes:
https://autobuild.buildroot.net/results/d37/d37be203b0b4d46c052427ea2c469c624b26504e/

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 .checkpackageignore                           |  1 -
 ...FromNtTimeNsec-aware-of-64-bit-time_.patch | 51 -------------------
 ...n-discards-const-qualifier-from-poi.patch} |  0
 ...GLib-g_free-macro-redefinition-erro.patch} |  0
 4 files changed, 52 deletions(-)
 delete mode 100644 package/openvmtools/0010-Make-HgfsConvertFromNtTimeNsec-aware-of-64-bit-time_.patch
 rename package/openvmtools/{0011-fix-initialization-discards-const-qualifier-from-poi.patch => 0010-fix-initialization-discards-const-qualifier-from-poi.patch} (100%)
 rename package/openvmtools/{0012-glib_stubs-avoid-GLib-g_free-macro-redefinition-erro.patch => 0011-glib_stubs-avoid-GLib-g_free-macro-redefinition-erro.patch} (100%)

diff --git a/.checkpackageignore b/.checkpackageignore
index c7558ac8c4..60516b3098 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -686,7 +686,6 @@ package/openvmtools/0006-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch lib_pa
 package/openvmtools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch lib_patch.Upstream
 package/openvmtools/0008-Use-configure-test-for-sys-stat.h-include.patch lib_patch.Upstream
 package/openvmtools/0009-open-vm-tools-vmhgfs-fuse-fsutils.h-fix-build-on-mus.patch lib_patch.Upstream
-package/openvmtools/0010-Make-HgfsConvertFromNtTimeNsec-aware-of-64-bit-time_.patch lib_patch.Upstream
 package/openvmtools/shutdown Shellcheck
 package/openvpn/S60openvpn Shellcheck lib_sysv.Indent lib_sysv.Variables
 package/oprofile/0001-musl.patch lib_patch.Upstream
diff --git a/package/openvmtools/0010-Make-HgfsConvertFromNtTimeNsec-aware-of-64-bit-time_.patch b/package/openvmtools/0010-Make-HgfsConvertFromNtTimeNsec-aware-of-64-bit-time_.patch
deleted file mode 100644
index df69be32d6..0000000000
--- a/package/openvmtools/0010-Make-HgfsConvertFromNtTimeNsec-aware-of-64-bit-time_.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From bedbcfcf347ff1a11d1a54f8f780f560e4b241a4 Mon Sep 17 00:00:00 2001
-From: Stefan Agner <stefan@agner.ch>
-Date: Tue, 5 Sep 2023 15:03:56 +0200
-Subject: [PATCH] Make HgfsConvertFromNtTimeNsec aware of 64-bit time_t on i386
-
-I verified that this function behaves as expected on x86_64, i386 with
-32-bit time_t, and i386 with 64-bit time_t for the following values of
-ntTtime:
-
-UNIX_EPOCH-1, UNIX_EPOCH, UNIX_EPOCH+1, UNIX_S32_MAX-1, UNIX_S32_MAX,
-UNIX_S32_MAX+1, UNIX_S32_MAX*2+1
-
-I did not verify whether the use of Div643264 is optimal, performance
-wise.
-
-Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
-[rebased against stable-12.3.0]
-Signed-off-by: Stefan Agner <stefan@agner.ch>
-[Bernd: rebased against stable-13.0.10]
-Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
----
- lib/hgfs/hgfsUtil.c | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/lib/hgfs/hgfsUtil.c b/lib/hgfs/hgfsUtil.c
-index fcd7fb726..f86061562 100644
---- a/lib/hgfs/hgfsUtil.c
-+++ b/lib/hgfs/hgfsUtil.c
-@@ -131,13 +131,15 @@ HgfsConvertFromNtTimeNsec(struct timespec *unixTime, // OUT: Time in UNIX format
-       Div643232(ntTime - UNIX_EPOCH, 10000000, &sec, &nsec);
-       unixTime->tv_sec = sec;
-       unixTime->tv_nsec = nsec * 100;
--
--      return 0;
-+   } else {
-+      Div643264(ntTime - UNIX_EPOCH, 10000000, &sec64, &nsec);
-+      unixTime->tv_sec = sec64;
-+      unixTime->tv_nsec = nsec * 100;
-    }
--#endif
--
-+#else
-    unixTime->tv_sec = (ntTime - UNIX_EPOCH) / 10000000;
-    unixTime->tv_nsec = ((ntTime - UNIX_EPOCH) % 10000000) * 100;
-+#endif // __i386__
- 
-    return 0;
- }
--- 
-2.47.3
-
diff --git a/package/openvmtools/0011-fix-initialization-discards-const-qualifier-from-poi.patch b/package/openvmtools/0010-fix-initialization-discards-const-qualifier-from-poi.patch
similarity index 100%
rename from package/openvmtools/0011-fix-initialization-discards-const-qualifier-from-poi.patch
rename to package/openvmtools/0010-fix-initialization-discards-const-qualifier-from-poi.patch
diff --git a/package/openvmtools/0012-glib_stubs-avoid-GLib-g_free-macro-redefinition-erro.patch b/package/openvmtools/0011-glib_stubs-avoid-GLib-g_free-macro-redefinition-erro.patch
similarity index 100%
rename from package/openvmtools/0012-glib_stubs-avoid-GLib-g_free-macro-redefinition-erro.patch
rename to package/openvmtools/0011-glib_stubs-avoid-GLib-g_free-macro-redefinition-erro.patch
-- 
2.47.3

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread