Merge ~bryce/ubuntu/+source/open-vm-tools:mre-lp1968354-jammy into ubuntu/+source/open-vm-tools:ubuntu/jammy-devel
Proposed by
Bryce Harrington
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Approved by: | git-ubuntu bot | ||||||||
| Approved revision: | not available | ||||||||
| Merged at revision: | 95336c57ae4fa2aec4bd598e0eb8734ba3a8a15a | ||||||||
| Proposed branch: | ~bryce/ubuntu/+source/open-vm-tools:mre-lp1968354-jammy | ||||||||
| Merge into: | ubuntu/+source/open-vm-tools:ubuntu/jammy-devel | ||||||||
| Diff against target: |
25331 lines (+16184/-3226) (has conflicts) 182 files modified
README.md (+75/-0) ReleaseNotes.md (+40/-56) debian/changelog (+81/-0) debian/control (+39/-5) debian/copyright (+3/-1) debian/open-vm-tools-containerinfo.postinst (+42/-0) debian/open-vm-tools-containerinfo.postrm (+43/-0) debian/open-vm-tools-desktop.lintian-overrides (+1/-1) debian/open-vm-tools-salt-minion.postinst (+42/-0) debian/open-vm-tools-salt-minion.postrm (+43/-0) debian/open-vm-tools.postinst (+1/-1) debian/patches/series (+3/-0) debian/patches/use-debian-pam (+1/-1) debian/rules (+11/-0) debian/upstream/metadata (+1/-0) dev/null (+0/-785) open-vm-tools/AUTHORS (+9/-0) open-vm-tools/ChangeLog (+2347/-65) open-vm-tools/configure.ac (+248/-14) open-vm-tools/lib/appUtil/appUtilX11.c (+5/-2) open-vm-tools/lib/asyncsocket/asyncSocketInterface.c (+3/-4) open-vm-tools/lib/asyncsocket/asyncSocketVTable.h (+3/-3) open-vm-tools/lib/asyncsocket/asyncsocket.c (+38/-37) open-vm-tools/lib/file/fileIO.c (+107/-0) open-vm-tools/lib/file/fileIOPosix.c (+16/-2) open-vm-tools/lib/file/fileInt.h (+2/-2) open-vm-tools/lib/file/fileLockPrimitive.c (+15/-20) open-vm-tools/lib/file/filePosix.c (+4/-4) open-vm-tools/lib/glibUtils/fileLogger.c (+2/-0) open-vm-tools/lib/globalConfig/globalConfig.c (+5/-2) open-vm-tools/lib/hgfs/cpName.c (+10/-3) open-vm-tools/lib/hgfs/hgfsEscape.c (+1/-2) open-vm-tools/lib/hgfs/hgfsUtil.c (+19/-23) open-vm-tools/lib/include/asyncsocket.h (+23/-2) open-vm-tools/lib/include/backdoor_def.h (+5/-4) open-vm-tools/lib/include/buildNumber.h (+6/-6) open-vm-tools/lib/include/codeset.h (+1/-9) open-vm-tools/lib/include/conf.h (+114/-1) open-vm-tools/lib/include/config.h (+6/-2) open-vm-tools/lib/include/dbllnklst.h (+2/-1) open-vm-tools/lib/include/dynbuf.h (+18/-1) open-vm-tools/lib/include/fileIO.h (+9/-0) open-vm-tools/lib/include/ghIntegrationCommon.h (+32/-2) open-vm-tools/lib/include/glibUtils.h (+2/-1) open-vm-tools/lib/include/guest_msg_def.h (+6/-2) open-vm-tools/lib/include/guest_os.h (+157/-101) open-vm-tools/lib/include/guest_os_tables.h (+49/-22) open-vm-tools/lib/include/hostinfo.h (+12/-2) open-vm-tools/lib/include/includeCheck.h (+7/-6) open-vm-tools/lib/include/log.h (+127/-131) open-vm-tools/lib/include/loglevel_userVars.h (+5/-2) open-vm-tools/lib/include/poll.h (+2/-1) open-vm-tools/lib/include/sha1.h (+9/-20) open-vm-tools/lib/include/sigPosixRegs.h (+3/-1) open-vm-tools/lib/include/sigc++2to3.h (+143/-0) open-vm-tools/lib/include/strutil.h (+2/-1) open-vm-tools/lib/include/vm_assert.h (+21/-16) open-vm-tools/lib/include/vm_atomic.h (+87/-39) open-vm-tools/lib/include/vm_atomic_arm64_begin.h (+162/-50) open-vm-tools/lib/include/vm_atomic_arm64_end.h (+7/-1) open-vm-tools/lib/include/vm_basic_asm.h (+119/-32) open-vm-tools/lib/include/vm_basic_asm_arm64.h (+69/-18) open-vm-tools/lib/include/vm_basic_asm_x86_64.h (+32/-1) open-vm-tools/lib/include/vm_basic_asm_x86_common.h (+64/-27) open-vm-tools/lib/include/vm_basic_defs.h (+72/-22) open-vm-tools/lib/include/vm_basic_types.h (+7/-17) open-vm-tools/lib/include/vm_device_version.h (+14/-25) open-vm-tools/lib/include/vm_legal.h (+2/-2) open-vm-tools/lib/include/vm_product.h (+4/-1) open-vm-tools/lib/include/vm_product_versions.h (+148/-44) open-vm-tools/lib/include/vm_tools_version.h (+31/-4) open-vm-tools/lib/include/vm_valgrind.h (+18/-6) open-vm-tools/lib/include/vm_version.h (+38/-3) open-vm-tools/lib/include/vmci_defs.h (+65/-12) open-vm-tools/lib/include/vmware/guestrpc/containerInfo.h (+58/-0) open-vm-tools/lib/include/vmware/guestrpc/serviceDiscovery.h (+3/-1) open-vm-tools/lib/include/vmware/guestrpc/timesync.h (+4/-2) open-vm-tools/lib/include/vmware/tools/log.h (+7/-0) open-vm-tools/lib/include/vthreadBase.h (+1/-5) open-vm-tools/lib/include/x86_basic_defs.h (+3/-0) open-vm-tools/lib/include/x86cpuid.h (+159/-123) open-vm-tools/lib/lock/ulInt.h (+3/-3) open-vm-tools/lib/lock/ulStats.c (+6/-6) open-vm-tools/lib/misc/Makefile.am (+2/-1) open-vm-tools/lib/misc/codesetOld.c (+5/-5) open-vm-tools/lib/misc/dynbuf.c (+70/-7) open-vm-tools/lib/misc/hostinfo.c (+39/-1) open-vm-tools/lib/misc/hostinfoHV.c (+1/-32) open-vm-tools/lib/misc/hostinfoInt.h (+2/-2) open-vm-tools/lib/misc/hostinfoPosix.c (+158/-107) open-vm-tools/lib/misc/jsonUTF8.c (+483/-0) open-vm-tools/lib/misc/strutil.c (+43/-1) open-vm-tools/lib/misc/timeutil.c (+15/-19) open-vm-tools/lib/misc/util_misc.c (+32/-32) open-vm-tools/lib/poll/poll.c (+29/-4) open-vm-tools/lib/procMgr/procMgrPosix.c (+2/-2) open-vm-tools/lib/rpcVmx/rpcvmx.c (+3/-2) open-vm-tools/libDeployPkg/linuxDeployment.c (+24/-6) open-vm-tools/libvmtools/vmtoolsConfig.c (+3/-1) open-vm-tools/libvmtools/vmtoolsLog.c (+132/-7) open-vm-tools/modules/shared/vmmemctl/dbllnklst.h (+2/-1) open-vm-tools/modules/shared/vmmemctl/kernelStubs.h (+16/-5) open-vm-tools/modules/shared/vmxnet/eth_public.h (+1/-0) open-vm-tools/modules/shared/vmxnet/vmnet_def.h (+3/-1) open-vm-tools/modules/shared/vmxnet/vmxnet3_defs.h (+28/-19) open-vm-tools/modules/solaris/vmhgfs/kernelStubs.h (+16/-5) open-vm-tools/namespacetool/namespacetool.c (+2/-2) open-vm-tools/scripts/common/vm-support (+6/-28) open-vm-tools/services/plugins/Makefile.am (+5/-1) open-vm-tools/services/plugins/appInfo/appInfo.c (+43/-52) open-vm-tools/services/plugins/componentMgr/COPYING (+502/-0) open-vm-tools/services/plugins/componentMgr/Makefile.am (+46/-0) open-vm-tools/services/plugins/componentMgr/componentMgr.c (+414/-0) open-vm-tools/services/plugins/componentMgr/componentMgrInstallAction.c (+1216/-0) open-vm-tools/services/plugins/componentMgr/componentMgrInstallManager.c (+497/-0) open-vm-tools/services/plugins/componentMgr/componentMgrPlugin.h (+370/-0) open-vm-tools/services/plugins/componentMgr/componentMgrUtil.c (+216/-0) open-vm-tools/services/plugins/componentMgr/svtminion.sh (+2134/-0) open-vm-tools/services/plugins/containerInfo/COPYING (+502/-0) open-vm-tools/services/plugins/containerInfo/Makefile.am (+98/-0) open-vm-tools/services/plugins/containerInfo/containerInfo.c (+1016/-0) open-vm-tools/services/plugins/containerInfo/containerInfoInt.h (+56/-0) open-vm-tools/services/plugins/containerInfo/containerInfo_docker.c (+503/-0) open-vm-tools/services/plugins/containerInfo/containerInfo_grpc.cc (+156/-0) open-vm-tools/services/plugins/deployPkg/deployPkg.c (+26/-17) open-vm-tools/services/plugins/deployPkg/deployPkgPlugin.c (+52/-11) open-vm-tools/services/plugins/dndcp/dnd/copyPasteRpc.hh (+3/-2) open-vm-tools/services/plugins/dndcp/dnd/dndRpc.hh (+3/-2) open-vm-tools/services/plugins/dndcp/dnd/fileTransferRpc.hh (+3/-2) open-vm-tools/services/plugins/dndcp/dndGuest/rpcV3Util.cpp (+8/-2) open-vm-tools/services/plugins/dndcp/dndGuestBase/guestDnD.hh (+2/-2) open-vm-tools/services/plugins/dndcp/stringxx/string.hh (+15/-1) open-vm-tools/services/plugins/dndcp/stringxx/ubstr_t.hh (+11/-1) open-vm-tools/services/plugins/guestInfo/guestInfoServer.c (+19/-20) open-vm-tools/services/plugins/guestStore/guestStorePlugin.c (+3/-2) open-vm-tools/services/plugins/resolutionSet/resolutionCommon.c (+5/-3) open-vm-tools/services/plugins/serviceDiscovery/get-versions.sh (+32/-2) open-vm-tools/services/plugins/serviceDiscovery/serviceDiscovery.c (+436/-49) open-vm-tools/services/plugins/serviceDiscovery/serviceDiscoveryInt.h (+22/-4) open-vm-tools/services/plugins/serviceDiscovery/serviceDiscoveryPosix.c (+45/-82) open-vm-tools/services/plugins/timeSync/timeSync.c (+10/-14) open-vm-tools/services/plugins/vix/vixTools.c (+2/-2) open-vm-tools/services/plugins/vmbackup/stateMachine.c (+28/-4) open-vm-tools/services/vmtoolsd/mainLoop.c (+0/-5) open-vm-tools/tests/testVmblock/Makefile.am (+7/-9) open-vm-tools/toolbox/l10n/de.vmsg (+1/-1) open-vm-tools/toolbox/l10n/es.vmsg (+1/-1) open-vm-tools/toolbox/l10n/fr.vmsg (+2/-2) open-vm-tools/toolbox/l10n/it.vmsg (+1/-1) open-vm-tools/toolbox/l10n/ja.vmsg (+1/-1) open-vm-tools/toolbox/l10n/ko.vmsg (+1/-1) open-vm-tools/toolbox/l10n/zh_CN.vmsg (+1/-1) open-vm-tools/toolbox/l10n/zh_TW.vmsg (+3/-3) open-vm-tools/tools.conf (+77/-7) open-vm-tools/vgauth/cli/l10n/de.vmsg (+1/-1) open-vm-tools/vgauth/cli/l10n/es.vmsg (+1/-1) open-vm-tools/vgauth/cli/l10n/fr.vmsg (+1/-1) open-vm-tools/vgauth/cli/l10n/it.vmsg (+3/-3) open-vm-tools/vgauth/cli/l10n/ja.vmsg (+1/-1) open-vm-tools/vgauth/cli/l10n/ko.vmsg (+1/-1) open-vm-tools/vgauth/cli/l10n/zh_CN.vmsg (+1/-1) open-vm-tools/vgauth/cli/l10n/zh_TW.vmsg (+1/-1) open-vm-tools/vgauth/common/certverify.c (+24/-3) open-vm-tools/vgauth/common/vmxlog.c (+28/-475) open-vm-tools/vgauth/common/vmxrpc.c (+639/-0) open-vm-tools/vgauth/common/vmxrpc.h (+33/-0) open-vm-tools/vgauth/lib/netPosix.c (+3/-1) open-vm-tools/vgauth/service/Makefile.am (+2/-1) open-vm-tools/vgauth/serviceImpl/netPosix.c (+9/-2) open-vm-tools/vgauth/serviceImpl/proto.c (+5/-1) open-vm-tools/vgauth/serviceImpl/saml-xmlsec1.c (+65/-3) open-vm-tools/vgauth/serviceImpl/schemas/saml-schema-assertion-2.0.xsd (+283/-283) open-vm-tools/vmblock-fuse/Makefile.am (+3/-1) open-vm-tools/vmblock-fuse/fsops.c (+44/-6) open-vm-tools/vmblock-fuse/fsops.h (+17/-2) open-vm-tools/vmblock-fuse/main.c (+5/-1) open-vm-tools/vmhgfs-fuse/Makefile.am (+3/-1) open-vm-tools/vmhgfs-fuse/config.c (+21/-3) open-vm-tools/vmhgfs-fuse/dir.c (+5/-1) open-vm-tools/vmhgfs-fuse/main.c (+58/-20) open-vm-tools/vmhgfs-fuse/module.h (+8/-2) open-vm-tools/vmwgfxctrl/main.c (+4/-2) Conflict in debian/changelog Conflict in debian/patches/series |
||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| git-ubuntu bot | Approve | ||
| Christian Ehrhardt (community) | Approve | ||
| Canonical Server Reporter | Pending | ||
|
Review via email:
|
|||
Description of the change
The diff here is large and unweildy due to this being an MRE to jammy rather than a regular merge/sru. Instead please review comparing against pkg/import/
- No-change rebuild --> no-op
- Disable / re-enable fuse3 --> no-op
- Fix FTBFS with glibc 2.35 --> no longer reproduces
Included in this new version is a bugfix we want on jammy, LP: #1968354. This fix is cherrypicked and SRU'd to bionic and focal, but for jammy we take the whole release due to MRE policy.
PPA is available at [1] and testing will mostly be done by VMWare as usually. There are no DEP8 tests. I've also performed a package build on my local machine, and verified locally that autopkgtest doesn't run any tests:
autopkgtest [20:38:54]: @@@@@@@
* SKIP no tests in this package
[1]: https:/
To post a comment you must log in.
Revision history for this message
| Bryce Harrington (bryce) wrote | # |
There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Vs pkg/ubuntu/
The version (is complex in this case) seems to be fine (ensures upgrade and the pattern can be reused for latter releases).
So the question left is if jammy->kinetic had any changes that could not be backported as-is.
Of those I think you either need to drop or mention&explain the addition of open-vm-
They will hit jammy new queue, so clarifying the details and intention early on will be good.
That ^^ is the only thing I see to resolve before going to the SRU team.
Let me know then so that i can connect you with the vmware people looking at the tests ususally.