From 87b3cb8045d81fae0a99f13817bfa0c28c9b3576 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 15 Nov 2019 16:35:37 -0500 Subject: meta-openembedded: subtree update:3a9262866d..55de2d06ad MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adrian Bunk (1): python-more-itertools: Add PE Andreas Müller (1): Add gnome help packages to image according to IMAGE_LINGUAS Andreas Oberritter (2): live555: Move test progams out of main package pugixml: Update to version 1.10 André Draszik (7): gyp: update to fcd686f1880f gyp: provide a python2 version of gyp as gyp-py2 nodejs: ensure to use correct compiler & flags always nodejs: delete all bundled deps in do_unpack() if needed nodejs: allow use of system gyp nodejs: use OE-provided compiler flags (arm) nodejs: support long directory names for ${B} / ${S} Denys Dmytriyenko (1): mbedtls: upgrade 2.16.2 -> 2.16.3 Fabio Berton (5): python-importlib-metadata: Add native and nativesdk to BBCLASSEXTEND python-more-itertools: Add native and nativesdk to BBCLASSEXTEND python-pathlib2: Add native and nativesdk to BBCLASSEXTEND python-zipp: Add native and nativesdk to BBCLASSEXTEND python3-importlib-metadata: RDEPEND python3-misc only for target and nativesdk Khem Raj (13): sip: Upgrade to 4.19.19 cherokee: Update to latest cherokee: Fix build when time_t is 64bit tvheadend: Update to tip of master lowpan-tools: Blacklist as its deprecated use wpan-tools instead pidgin-sipe: Fix build when time_t is 64bit open-vm-tools: Enable tirpc explicitly, fix build with 64bit time_t python-systemd: Include endian.h for htobe16 tvheadend: Fix build with 64bit time_t tvheadend: Set CLEANBROKEN layer.conf: Add ttf-roboto->fontconfig to SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS layer.conf: Add phpmyadmin->php dep to SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS python-six: Update to 1.13.0 Michael Scott (1): modemmanager: Upgrade 1.10.6 -> 1.10.8 Nicola Lunghi (5): python3-gmqtt: add recipe python-backports-abc: update to 0.5.0 python-rfc3339-validator: add recipe python-rfc3986-validator: add recipe python-dbus-next: fix recipe position Peace Lee (1): guider: upgrade 3.9.4 -> 3.9.6 Trevor Gamblin (4): python3-werkzeug: upgrade from 0.14.1 to 0.16.0 python3-flask: upgrade from 1.0.2 to 1.1.1 python3-itsdangerous: upgrade from 0.24 to 1.1.0 zabbix: upgrade 4.2.8 -> 4.4.1 Yi Zhao (1): python-ipy: add recipes Zang Ruochen (15): fuse3: upgrade 3.7.0 -> 3.8.0 python-alembic: upgrade 1.2.1 -> 1.3.0 python-astroid: upgrade 2.3.2 -> 2.3.3 python-bitarray: upgrade 1.0.1 -> 1.1.0 python-cffi: upgrade 1.13.1 -> 1.13.2 python-dateutil: upgrade 2.8.0 -> 2.8.1 python-psutil: upgrade 5.6.3 -> 5.6.5 python-pycryptodome: upgrade 3.9.0 -> 3.9.3 python-pyparsing: upgrade 2.4.2 -> 2.4.5 python-pytest-helpers-namespace: upgrade 2016.7.10 -> 2019.1.8 python-pytest-runner: upgrade 5.1 -> 5.2 python-pytest-tempdir: upgrade 2016.8.20 -> 2019.10.12 python-requests-oauthlib: upgrade 0.8.0 -> 1.3.0 python-tornado: upgrade 5.1 -> 6.0.3 python-tqdm: upgrade 4.31.1 -> 4.38.0 Zheng Ruoqin (1): f2fs-tools: Update Homepage Change-Id: Ifc2d7bac36a719f2a4ead82b491d9817f212c56f Signed-off-by: Brad Bishop --- ...nvertFromNtTimeNsec-aware-of-64-bit-time_.patch | 78 ++++++++++++++++++++++ ...erLinux-Consider-64bit-time_t-possibility.patch | 41 ++++++++++++ .../open-vm-tools/open-vm-tools_11.0.1.bb | 5 +- 3 files changed, 123 insertions(+), 1 deletion(-) create mode 100644 meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-Make-HgfsConvertFromNtTimeNsec-aware-of-64-bit-time_.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-hgfsServerLinux-Consider-64bit-time_t-possibility.patch (limited to 'meta-openembedded/meta-oe/recipes-support/open-vm-tools') diff --git a/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-Make-HgfsConvertFromNtTimeNsec-aware-of-64-bit-time_.patch b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-Make-HgfsConvertFromNtTimeNsec-aware-of-64-bit-time_.patch new file mode 100644 index 000000000..61a681f17 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-Make-HgfsConvertFromNtTimeNsec-aware-of-64-bit-time_.patch @@ -0,0 +1,78 @@ +From caf80e220b055dbce259078be96e899dc78ec1d2 Mon Sep 17 00:00:00 2001 +From: Bartosz Brachaczek +Date: Tue, 12 Nov 2019 14:31:08 +0100 +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. + +Upstream-Status: Submitted [https://github.com/vmware/open-vm-tools/pull/387] +Signed-off-by: Khem Raj +--- + open-vm-tools/lib/hgfs/hgfsUtil.c | 34 +++++++++++++++++-------------- + 1 file changed, 19 insertions(+), 15 deletions(-) + +diff --git a/open-vm-tools/lib/hgfs/hgfsUtil.c b/open-vm-tools/lib/hgfs/hgfsUtil.c +index cc580ab8..49b10040 100644 +--- a/open-vm-tools/lib/hgfs/hgfsUtil.c ++++ b/open-vm-tools/lib/hgfs/hgfsUtil.c +@@ -110,23 +110,21 @@ HgfsConvertFromNtTimeNsec(struct timespec *unixTime, // OUT: Time in UNIX format + uint64 ntTime) // IN: Time in Windows NT format + { + #ifdef __i386__ +- uint32 sec; +- uint32 nsec; ++ uint64 sec64; ++ uint32 sec32, nsec; ++#endif + + ASSERT(unixTime); +- /* We assume that time_t is 32bit */ +- ASSERT_ON_COMPILE(sizeof (unixTime->tv_sec) == 4); + +- /* Cap NT time values that are outside of Unix time's range */ ++ if (sizeof (unixTime->tv_sec) == 4) { ++ /* Cap NT time values that are outside of Unix time's range */ + +- if (ntTime >= UNIX_S32_MAX) { +- unixTime->tv_sec = 0x7FFFFFFF; +- unixTime->tv_nsec = 0; +- return 1; ++ if (ntTime >= UNIX_S32_MAX) { ++ unixTime->tv_sec = 0x7FFFFFFF; ++ unixTime->tv_nsec = 0; ++ return 1; ++ } + } +-#else +- ASSERT(unixTime); +-#endif + + if (ntTime < UNIX_EPOCH) { + unixTime->tv_sec = 0; +@@ -135,9 +133,15 @@ HgfsConvertFromNtTimeNsec(struct timespec *unixTime, // OUT: Time in UNIX format + } + + #ifdef __i386__ +- Div643232(ntTime - UNIX_EPOCH, 10000000, &sec, &nsec); +- unixTime->tv_sec = sec; +- unixTime->tv_nsec = nsec * 100; ++ if (sizeof (unixTime->tv_sec) == 4) { ++ Div643232(ntTime - UNIX_EPOCH, 10000000, &sec32, &nsec); ++ unixTime->tv_sec = sec32; ++ unixTime->tv_nsec = nsec * 100; ++ } else { ++ Div643264(ntTime - UNIX_EPOCH, 10000000, &sec64, &nsec); ++ unixTime->tv_sec = sec64; ++ unixTime->tv_nsec = nsec * 100; ++ } + #else + unixTime->tv_sec = (ntTime - UNIX_EPOCH) / 10000000; + unixTime->tv_nsec = ((ntTime - UNIX_EPOCH) % 10000000) * 100; diff --git a/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-hgfsServerLinux-Consider-64bit-time_t-possibility.patch b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-hgfsServerLinux-Consider-64bit-time_t-possibility.patch new file mode 100644 index 000000000..0f64eabc9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-hgfsServerLinux-Consider-64bit-time_t-possibility.patch @@ -0,0 +1,41 @@ +From fe56b67a2915a8632ea30604c14241f335dd3c15 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 12 Nov 2019 10:49:46 -0800 +Subject: [PATCH] hgfsServerLinux: Consider 64bit time_t possibility + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + .../lib/hgfsServer/hgfsServerLinux.c | 19 +++++-------------- + 1 file changed, 5 insertions(+), 14 deletions(-) + +diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c +index 03175623..554da67f 100644 +--- a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c ++++ b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c +@@ -2561,20 +2561,11 @@ HgfsStatToFileAttr(struct stat *stats, // IN: stat information + LOG(4, ("%s: done, permissions %o%o%o%o, size %"FMT64"u\n", __FUNCTION__, + attr->specialPerms, attr->ownerPerms, attr->groupPerms, + attr->otherPerms, attr->size)); +-#ifdef __FreeBSD__ +-# if !defined(VM_X86_64) && __FreeBSD_version >= 500043 +-# define FMTTIMET "" +-# else +-# define FMTTIMET "l" +-# endif +-#else +-# define FMTTIMET "l" +-#endif +- LOG(4, ("access: %"FMTTIMET"d/%"FMT64"u \nwrite: %"FMTTIMET"d/%"FMT64"u \n" +- "attr: %"FMTTIMET"d/%"FMT64"u\n", +- stats->st_atime, attr->accessTime, stats->st_mtime, attr->writeTime, +- stats->st_ctime, attr->attrChangeTime)); +-#undef FMTTIMET ++ LOG(4, ("access: %jd/%"FMT64"u \nwrite: %jd/%"FMT64"u \n" ++ "attr: %jd/%"FMT64"u\n", ++ (intmax_t)stats->st_atime, attr->accessTime, ++ (intmax_t)stats->st_mtime, attr->writeTime, ++ (intmax_t)stats->st_ctime, attr->attrChangeTime)); + + attr->userId = stats->st_uid; + attr->groupId = stats->st_gid; diff --git a/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools_11.0.1.bb b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools_11.0.1.bb index e43a39b61..9e4aa4881 100644 --- a/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools_11.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools_11.0.1.bb @@ -39,7 +39,10 @@ SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https \ file://0012-Use-off64_t-instead-of-__off64_t.patch;patchdir=.. \ file://0013-misc-Do-not-print-NULL-string-into-logs.patch;patchdir=.. \ file://0001-GitHub-Issue-367.-Remove-references-to-deprecated-G_.patch;patchdir=.. \ + file://0001-Make-HgfsConvertFromNtTimeNsec-aware-of-64-bit-time_.patch;patchdir=.. \ + file://0002-hgfsServerLinux-Consider-64bit-time_t-possibility.patch;patchdir=.. \ " + SRCREV = "d3edfd142a81096f9f58aff17d84219b457f4987" S = "${WORKDIR}/git/open-vm-tools" @@ -56,7 +59,7 @@ SYSTEMD_SERVICE_${PN} = "vmtoolsd.service" EXTRA_OECONF = "--without-icu --disable-multimon --disable-docs \ --disable-tests --without-gtkmm --without-xerces --without-pam \ --disable-vgauth --disable-deploypkg \ - --without-root-privileges --without-kernel-modules" + --without-root-privileges --without-kernel-modules --with-tirpc" NO_X11_FLAGS = "--without-x --without-gtk2 --without-gtk3" X11_DEPENDS = "libxext libxi libxrender libxrandr libxtst gtk+ gdk-pixbuf" -- cgit v1.2.3