lp:~n-muench/ubuntu/raring/open-vm-tools/open-vm-tools.december-merge2a
- Get this branch:
- bzr branch lp:~n-muench/ubuntu/raring/open-vm-tools/open-vm-tools.december-merge2a
Branch merges
- Luke Yelavich (community): Approve
-
Diff: 17019 lines (+6586/-5692)126 files modified.pc/02-procps.patch/configure (+21/-15)
.pc/02-procps.patch/configure.ac (+14/-7)
.pc/03-dkms.patch/modules/linux/dkms.conf (+1/-1)
.pc/04-dkms-vmsync.patch/modules/linux/dkms.conf (+39/-0)
.pc/05-vmhgfs.patch/modules/linux/shared/compat_mm.h (+107/-0)
.pc/applied-patches (+2/-0)
ChangeLog (+5/-0)
NEWS (+13/-0)
autom4te.cache/output.0 (+21/-15)
autom4te.cache/output.1 (+21/-15)
autom4te.cache/output.2 (+21/-15)
autom4te.cache/traces.0 (+482/-482)
autom4te.cache/traces.1 (+993/-993)
autom4te.cache/traces.2 (+482/-482)
checkvm/checkvm.c (+1/-0)
configure (+21/-15)
configure.ac (+14/-7)
debian/changelog (+26/-0)
debian/manpages/libguestlib.3 (+0/-2)
debian/manpages/libvmtools.3 (+0/-2)
debian/manpages/vmblock.9 (+0/-2)
debian/manpages/vmci.9 (+0/-2)
debian/manpages/vmhgfs.9 (+0/-2)
debian/manpages/vmsync.9 (+0/-50)
debian/manpages/vmware-checkvm.1 (+0/-2)
debian/manpages/vmware-hgfsclient.1 (+0/-2)
debian/manpages/vmware-hgfsmounter.8 (+0/-2)
debian/manpages/vmware-toolbox-cmd.1 (+0/-2)
debian/manpages/vmware-user-suid-wrapper.8 (+0/-2)
debian/manpages/vmware-xferlogs.1 (+0/-2)
debian/manpages/vmxnet.9 (+0/-2)
debian/open-vm-dkms.dkms (+2/-10)
debian/open-vm-tools.init (+0/-4)
debian/patches/04-dkms-vmsync.patch (+45/-0)
debian/patches/05-vmhgfs.patch (+26/-0)
debian/patches/series (+2/-0)
hgfsclient/hgfsclient.c (+1/-0)
hgfsmounter/hgfsmounter.c (+2/-0)
lib/auth/authPosix.c (+154/-30)
lib/file/fileIO.c (+35/-41)
lib/file/filePosix.c (+438/-173)
lib/hgfsServer/Makefile.am (+2/-0)
lib/hgfsServer/Makefile.in (+6/-2)
lib/hgfsServer/hgfsDirNotifyStub.c (+1/-2)
lib/hgfsServer/hgfsServer.c (+395/-1000)
lib/hgfsServer/hgfsServerInt.h (+121/-95)
lib/hgfsServer/hgfsServerLinux.c (+795/-332)
lib/hgfsServer/hgfsServerOplock.c (+376/-0)
lib/hgfsServer/hgfsServerOplockLinux.c (+376/-0)
lib/hgfsServerManagerGuest/hgfsChannelGuest.c (+3/-2)
lib/include/auth.h (+5/-0)
lib/include/buildNumber.h (+6/-6)
lib/include/embed_version.h (+0/-2)
lib/include/file.h (+7/-1)
lib/include/fileIO.h (+2/-3)
lib/include/guest_os.h (+124/-100)
lib/include/guest_os_tables.h (+4/-0)
lib/include/hgfsProto.h (+14/-19)
lib/include/hgfsServer.h (+16/-1)
lib/include/loglevel_user.h (+1/-0)
lib/include/memaligned.h (+1/-0)
lib/include/mutexRank.h (+14/-1)
lib/include/util.h (+1/-0)
lib/include/util_shared.h (+0/-2)
lib/include/vixCommands.h (+0/-1)
lib/include/vm_basic_math.h (+7/-0)
lib/include/vm_basic_types.h (+14/-7)
lib/include/vm_compilation_options.h (+47/-0)
lib/include/vm_legal.h (+2/-5)
lib/include/vm_product.h (+0/-15)
lib/include/vm_product_versions.h (+445/-0)
lib/include/vm_tools_version.h (+8/-2)
lib/include/vm_version.h (+7/-473)
lib/include/vm_vmx_type.h (+57/-0)
lib/include/vmci_sockets.h (+89/-7)
lib/include/vmware/guestrpc/capabilities.h (+2/-0)
lib/include/vthreadBase.h (+5/-4)
lib/misc/codeset.c (+1/-1)
lib/misc/hostinfoPosix.c (+4/-1)
lib/string/str.c (+66/-79)
libhgfs/hgfslib.c (+1/-0)
libvmtools/vmtools.c (+1/-0)
libvmtools/vmtoolsLog.c (+73/-1)
modules/freebsd/vmhgfs/state.c (+221/-16)
modules/freebsd/vmhgfs/state.h (+6/-3)
modules/linux/dkms.conf (+7/-12)
modules/linux/dkms.sh (+2/-2)
modules/linux/shared/compat_mm.h (+11/-1)
modules/linux/shared/vmci_iocontrols.h (+4/-3)
modules/linux/shared/vmci_kernel_if.h (+1/-0)
modules/linux/vmci/common/vmciContext.c (+53/-3)
modules/linux/vmci/common/vmciContext.h (+2/-3)
modules/linux/vmci/common/vmciQPair.c (+4/-4)
modules/linux/vmci/linux/driver.c (+2/-2)
modules/linux/vmci/linux/vmci_version.h (+3/-3)
modules/linux/vmci/shared/pgtbl.h (+3/-12)
modules/linux/vmhgfs/file.c (+3/-3)
modules/linux/vsock/linux/af_vsock.c (+8/-663)
modules/linux/vsock/linux/af_vsock.h (+1/-2)
modules/linux/vsock/linux/util.c (+0/-102)
modules/linux/vsock/linux/util.h (+0/-111)
modules/linux/vsock/linux/vsockCommon.h (+0/-25)
modules/linux/vsock/linux/vsockPacket.h (+0/-47)
modules/linux/vsock/linux/vsock_version.h (+3/-3)
modules/shared/vmmemctl/backdoor_balloon.c (+20/-16)
modules/shared/vmmemctl/backdoor_balloon.h (+6/-4)
modules/shared/vmmemctl/vmballoon.c (+99/-103)
modules/shared/vmmemctl/vmballoon.h (+2/-2)
services/plugins/dndcp/copyPasteUIX11.cpp (+9/-2)
services/plugins/dndcp/copyPasteUIX11.h (+10/-0)
services/plugins/guestInfo/guestInfoServer.c (+1/-0)
services/plugins/hgfsServer/hgfsPlugin.c (+1/-0)
services/plugins/powerOps/powerOps.c (+1/-0)
services/plugins/resolutionSet/resolutionSet.c (+1/-0)
services/plugins/timeSync/timeSync.c (+1/-0)
services/plugins/vix/vixPlugin.c (+1/-0)
services/plugins/vmbackup/stateMachine.c (+1/-0)
services/vmtoolsd/cmdLine.c (+1/-1)
services/vmtoolsd/mainLoop.c (+1/-0)
services/vmtoolsd/mainPosix.c (+1/-0)
services/vmtoolsd/toolsRpc.c (+1/-1)
tests/vmrpcdbg/vmrpcdbg.c (+1/-0)
toolbox/toolbox-cmd.c (+3/-0)
vmblockmounter/vmblockmounter.c (+1/-0)
vmware-user-suid-wrapper/main.c (+1/-0)
xferlogs/xferlogs.c (+1/-0)
Related bugs
Bug #1088053: Kernel needs to provide FIFREEZE/FITHAW ioctl so that open-vm-dkms can build | Undecided | Fix Released | |
Bug #1100096: open-vm-dkms 2012.10.14-874563-0ubuntu1: open-vm-tools kernel module failed to build | Undecided | Fix Released |
Related blueprints
Branch information
- Owner:
- Nate Muench (Mink)
- Status:
- Merged
Recent revisions
- 33. By Nate Muench (Mink)
-
* Merging upstream version 2012.12.26-958366.
* Added 04-dkms-vmsync. patch: An additional to 03-dkms.patch
- Deletes lines involving vmsync, adjust other numbers.
- Module compile still fails if we don't add this patch.
- This keeps the 03-dkms.patch unmodified.
* Added 05-vmhgfs.patch:
- Fixes vmxnet compile issues with 3.8 kernel (LP: #1100096)
* Stop dkms from building vmblock module.
- vmblock-fuse takes care of this now.
+ Modules still build, but this gets rid of the vmblock-related
warning message
* Stop dkms from building vmsync module.
- Fixes building against current Raring kernel. (LP: #1088053) - 30. By Nate Muench (Mink)
-
* debian/
open-vm- tools.init: Add if statement to check for vmxnet module,
and if found, remove pcnet32 module.
* debian/control: Remove open-vm-source package.
- Only needed to add back open-vm-toolbox for Oneiric->Precise upgrade.* Items merged from Debian unstable:
- Switching to xz compression.
- Adding sleep during restart in initscript.
- Removing old dpkg trigger for update-initramfs.
- Updating GPL boilerplate in copyright file. - 29. By Nate Muench (Mink)
-
* Merging upstream version 2012.05.21-724730.
- Fixes building against the current Quantal kernel. (LP: #1000344)
- Fixes Quantal installation issues. (LP: #1019031)* Sync with Debian
- Updating to debhelper version 9.
- Updating to standards version 3.9.3.
- Updating copyright file machine-readable format version 1.0.
- Building without multiarch paths for now - 28. By Adam Conrad
-
* Build-depend on the new libprocps0-dev instead of libproc-dev.
* Change the way we export -Wno-deprecated-declarations to make
the package no longer FTBFS with the latest dpkg/debhelper.
* Snag the 02-procps.patch patch from Debian for the proc rename. - 27. By Nate Muench (Mink)
-
* Merge latest upstream git tag. Fixes building on Precise
(LP: #898289, LP: #905612)* Items merged from Debian unstable:
- debian/control:
+ open-vm-tools recommends open-vm-dkms. (LP: #598933)
+ open-vm-tools now suggests open-vm-toolbox. (LP: #604998)
(From 2011.08.21-471295-1 release)
- Updating maintainer and uploaders fields.
- Removing vcs fields.
- Removing references to Daniel's old email address.
- Updating years in copyright file.
- Updating to standards version 3.9.2.
- Updating to debhelper version 8.
- Switching to source format 3.0 (quilt).
- Removing manual chrpath setting.
- Removing exclusion from plugins from debhelper shlibs.
- Rediffing kvers.patch.
(From 2011.09.23-491607-1 release)
- Marking binary architecture-dependend packages as linux and kfreebsd
only.
- Removing liburiparser-dev from build-depends as upstream dropped
unity support.
- Building with libproc-dev on amd64 again.
- Dropping disabling of dnet support.
(From 2011.09.23-491607-2 release)
- Adding doxygen to build-depends for api documentation.
- Adding libcunit1-dev to build-depends for test suites.
- Minimizing rules file.
- Adding open-vm-tools-dev package, containing only the api
documentation for now.
(From 2011.09.23-491607-3 release)
- Sorting overrides in rules alphabetically.
- Compacting copyright file.
- Adding udev rule to set timeout for vmware scsi devices
(From 2011.12.20-562307-1 release)
- Adding patch to correct typo in upstreams dkms configuration* Remaining Changes:
- Remove Stable part of version numbering.
- debian folder:
+ Re-added open-vm-dkms.postinst & open-vm-dkms.prerm.
* Allows dkms modules to compile upon installation.
- debian/control:
+ Re-add open-vm-source and make into a transitional package
for open-vm-toolbox.
+ Return dependancies that were moved to open-vm-tools back to
open-vm-toolbox.
- debian/rules and debian/open-vm- toolbox. lintian- overrides:
+ Make vmware-user-suid- wrapper suid-root
- debian/rules:
+ Added CFLAGS field with -Wno-deprecated-declarations
* Will suppress issues with glib 2.31 or later.
+ Add line to copy vmware-xdg-detect- de into place.
+ Install vmware-user.desktop through toolbox package.
- debian/open-vm- tools.init:
+ Re-add 'modprobe [-r] vmblock'.
+ Add 'modprobe [-r] vmxnet'.
* Incase it's not loaded during boot.
+ Remove and re-add pcnet32 module
* Will be done before (remove) and after (readd) vmxnet module
is added.
* If vmxnet doesn't exist (aka modules fail to build), pcnet32 can be
still used for network connectivity.
* Workaround until a better fix can be done.
- Re-add gnome-session to debian/local/xautostar t.conf
- Manpages removed (from debian/manpages):
+ vmmemctl.9
+ vmxnet3.9
+ Remove references to manpages that have been removed. - 25. By Nate Muench (Mink)
-
* Merge latest upstream git tag. Fixes Building on Oneiric
(LP: #776103, LP: #807903)* The Toolbox (GUI) has been removed.
* Changes in debian folder:
- Contents of open-vm-toolbox. lintian- overrides have been moved to
open-vm-tools. lintian- overrides.
- The contents of open-vm-toolbox. manpages (excluding the first line,
which relates to the Toolbox) have been moved to open-vm-tools.manpages.
* Changes in debian/control:
- Convert open-vm-toolbox into a transitional package.
- All dependencies for toolbox have been moved to open-vm-tools package.
- Changed architecture for open-vm-toolbox package to all.
- Added Replaces and Breaks fields to open-vm-tools.
* Changes in debian/rules:
- Commented out references to the Toolbox (GUI), that no longer exist
in the package itself.
- Remaining references changed from open-vm-toolbox to open-vm-tools.
- Added -Wno-unused-but-set- variable to CFLAGS to suppress remaining
issues with GCC 4.6.0 or later.
* Files removed in debian/manpages:
- vmmemctl.9 (Component no longer in package)
- vmware-toolbox.1 (Component removed in this release)
- vmxnet3.9 (vmxnet3 is now included in kernel itself) - 24. By Christian Titze
-
Updated /debian/
manpages/ vmhgfs. 9: Typo fixed and further information
was added (LP: #572335)
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/raring/open-vm-tools