lp:~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools.march-merge
One last merge before the Precise release.
REMOVED:
-glib2.0 compatibility CFLAGS because it can now build without them.
TO DO:
-Add Debian changes (if they upload in time). Will be revision 0ubuntu2.
- Get this branch:
- bzr branch lp:~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools.march-merge
Branch merges
- Fabrice Coutadeur (community): Needs Fixing
-
Diff: 64535 lines (+20964/-14077)231 files modified.pc/01-kvers.patch/modules/linux/vmblock/Makefile (+0/-171)
.pc/01-kvers.patch/modules/linux/vmci/Makefile (+0/-171)
.pc/01-kvers.patch/modules/linux/vmhgfs/Makefile (+0/-171)
.pc/01-kvers.patch/modules/linux/vmsync/Makefile (+0/-171)
.pc/01-kvers.patch/modules/linux/vmxnet/Makefile (+0/-171)
.pc/01-kvers.patch/modules/linux/vsock/Makefile (+0/-171)
.pc/03-dkms.patch/modules/linux/dkms.conf (+0/-39)
.pc/applied-patches (+0/-2)
ChangeLog (+5/-0)
Makefile.in (+3/-1)
NEWS (+11/-0)
aclocal.m4 (+2/-2)
autom4te.cache/output.0 (+2703/-2074)
autom4te.cache/output.1 (+2703/-2074)
autom4te.cache/output.2 (+2703/-2074)
autom4te.cache/requests (+30/-6)
autom4te.cache/traces.0 (+230/-186)
autom4te.cache/traces.1 (+18/-44)
autom4te.cache/traces.2 (+230/-186)
checkvm/Makefile.in (+3/-1)
config/config.guess (+4/-5)
config/config.sub (+5/-14)
config/ltmain.sh (+2627/-1404)
configure (+2569/-1940)
configure.ac (+2/-2)
debian/changelog (+9/-0)
docs/Makefile.in (+3/-1)
docs/api/Makefile.in (+3/-1)
hgfsclient/Makefile.in (+3/-1)
hgfsmounter/Makefile.in (+3/-1)
lib/Makefile.in (+3/-1)
lib/appUtil/Makefile.in (+3/-1)
lib/auth/Makefile.in (+3/-1)
lib/backdoor/Makefile.in (+3/-1)
lib/dict/Makefile.in (+3/-1)
lib/dynxdr/Makefile.in (+3/-1)
lib/err/Makefile.in (+3/-1)
lib/err/errPosix.c (+1/-1)
lib/file/Makefile.in (+3/-1)
lib/file/file.c (+61/-17)
lib/file/fileIO.c (+56/-42)
lib/file/fileIOPosix.c (+22/-2)
lib/file/fileInt.h (+6/-6)
lib/file/fileLockPosix.c (+1/-1)
lib/file/fileLockPrimitive.c (+6/-3)
lib/file/filePosix.c (+34/-15)
lib/file/fileStandAlone.c (+0/-15)
lib/file/fileTempPosix.c (+2/-2)
lib/foundryMsg/Makefile.in (+3/-1)
lib/foundryMsg/foundryMsg.c (+23/-0)
lib/foundryMsg/vixTranslateErrOpenSource.c (+57/-10)
lib/glibUtils/Makefile.in (+3/-1)
lib/guestApp/Makefile.in (+3/-1)
lib/guestRpc/Makefile.in (+3/-1)
lib/hgfs/Makefile.in (+3/-1)
lib/hgfs/hgfsUtil.c (+8/-2)
lib/hgfsBd/Makefile.in (+3/-1)
lib/hgfsHelper/Makefile.in (+3/-1)
lib/hgfsServer/Makefile.in (+3/-1)
lib/hgfsServer/hgfsServer.c (+51/-34)
lib/hgfsServer/hgfsServerLinux.c (+1/-1)
lib/hgfsServer/hgfsServerPacketUtil.c (+1/-1)
lib/hgfsServer/hgfsServerParameters.c (+26/-23)
lib/hgfsServerManagerGuest/Makefile.in (+3/-1)
lib/hgfsServerPolicyGuest/Makefile.in (+3/-1)
lib/impersonate/Makefile.in (+3/-1)
lib/include/backdoor_def.h (+4/-1)
lib/include/buildNumber.h (+6/-6)
lib/include/file.h (+6/-1)
lib/include/fileIO.h (+2/-0)
lib/include/guest_os.h (+13/-66)
lib/include/guest_os_tables.h (+240/-0)
lib/include/hashTable.h (+2/-0)
lib/include/hgfs.h (+3/-0)
lib/include/log.h (+5/-22)
lib/include/loglevel_user.h (+3/-0)
lib/include/memaligned.h (+1/-0)
lib/include/msgid.h (+2/-1)
lib/include/mutexRankLib.h (+18/-2)
lib/include/posix.h (+1/-1)
lib/include/procMgr.h (+3/-2)
lib/include/sigPosixRegs.h (+12/-0)
lib/include/userlock.h (+1/-0)
lib/include/util.h (+90/-44)
lib/include/vix.h (+1/-0)
lib/include/vixCommands.h (+241/-1)
lib/include/vixOpenSource.h (+65/-0)
lib/include/vm_assert.h (+9/-0)
lib/include/vm_atomic.h (+1/-1)
lib/include/vm_basic_asm.h (+41/-0)
lib/include/vm_basic_defs.h (+14/-0)
lib/include/vm_basic_types.h (+16/-3)
lib/include/vm_device_version.h (+3/-0)
lib/include/vm_legal.h (+2/-2)
lib/include/vm_product.h (+17/-1)
lib/include/vm_version.h (+7/-24)
lib/include/x86cpuid.h (+34/-10)
lib/lock/Makefile.in (+3/-1)
lib/lock/ul.c (+5/-4)
lib/lock/ulCondVar.c (+6/-4)
lib/lock/ulExcl.c (+256/-192)
lib/lock/ulInt.h (+84/-70)
lib/lock/ulRW.c (+299/-210)
lib/lock/ulRec.c (+272/-190)
lib/lock/ulSema.c (+93/-83)
lib/lock/ulStats.c (+19/-10)
lib/message/Makefile.in (+3/-1)
lib/misc/Makefile.in (+3/-1)
lib/misc/codesetOld.c (+19/-0)
lib/misc/hostinfoPosix.c (+193/-57)
lib/misc/idLinux.c (+12/-2)
lib/misc/machineID.c (+7/-17)
lib/misc/msgfmt.c (+21/-14)
lib/misc/posixPosix.c (+26/-15)
lib/misc/utilMem.c (+190/-109)
lib/misc/util_misc.c (+6/-1)
lib/misc/vthreadBase.c (+5/-0)
lib/netUtil/Makefile.in (+3/-1)
lib/panic/Makefile.in (+3/-1)
lib/panicDefault/Makefile.in (+3/-1)
lib/printer/Makefile.in (+3/-1)
lib/procMgr/Makefile.in (+3/-1)
lib/procMgr/procMgrPosix.c (+174/-31)
lib/procMgr/procMgrSolaris.c (+105/-25)
lib/rpcChannel/Makefile.in (+3/-1)
lib/rpcIn/Makefile.in (+3/-1)
lib/rpcOut/Makefile.in (+3/-1)
lib/rpcVmx/Makefile.in (+3/-1)
lib/slashProc/Makefile.in (+3/-1)
lib/string/Makefile.in (+3/-1)
lib/string/bsd_output_shared.c (+1/-1)
lib/string/bsd_vsnprintf.c (+48/-1)
lib/stubs/Makefile.in (+3/-1)
lib/syncDriver/Makefile.in (+3/-1)
lib/system/Makefile.in (+3/-1)
lib/unicode/Makefile.in (+3/-1)
lib/user/Makefile.in (+3/-1)
lib/user/util.c (+4/-4)
lib/vmCheck/Makefile.in (+3/-1)
lib/vmSignal/Makefile.in (+3/-1)
lib/wiper/Makefile.in (+3/-1)
lib/xdg/Makefile.in (+3/-1)
libguestlib/Makefile.in (+3/-1)
libhgfs/Makefile.in (+3/-1)
libvmtools/Makefile.in (+3/-1)
libvmtools/i18n.c (+1/-2)
m4/libtool.m4 (+1261/-803)
m4/ltoptions.m4 (+7/-6)
m4/ltversion.m4 (+6/-6)
m4/lt~obsolete.m4 (+9/-3)
modules/Makefile.in (+3/-1)
modules/freebsd/vmxnet/if_vxn.c (+6/-0)
modules/linux/dkms.conf (+3/-3)
modules/linux/dkms.sh (+2/-2)
modules/linux/shared/autoconf/file_operations_fsync.c (+47/-0)
modules/linux/shared/compat_ethtool.h (+6/-0)
modules/linux/shared/compat_fs.h (+6/-0)
modules/linux/shared/compat_netdevice.h (+6/-0)
modules/linux/shared/vmciKernelAPI1.h (+10/-0)
modules/linux/shared/vmci_iocontrols.h (+1/-1)
modules/linux/shared/vmci_kernel_if.h (+0/-2)
modules/linux/vmblock/Makefile (+1/-1)
modules/linux/vmci/Makefile (+1/-1)
modules/linux/vmci/common/vmciCommonInt.h (+6/-2)
modules/linux/vmci/common/vmciContext.c (+1/-10)
modules/linux/vmci/common/vmciDriver.c (+8/-3)
modules/linux/vmci/common/vmciPageChannel.c (+108/-66)
modules/linux/vmci/common/vmciRoute.c (+16/-1)
modules/linux/vmci/linux/driver.c (+15/-4)
modules/linux/vmci/linux/vmci_version.h (+4/-4)
modules/linux/vmci/shared/vmci_page_channel.h (+25/-1)
modules/linux/vmhgfs/Makefile (+1/-1)
modules/linux/vmhgfs/Makefile.kernel (+1/-0)
modules/linux/vmhgfs/dentry.c (+13/-0)
modules/linux/vmhgfs/file.c (+2/-2)
modules/linux/vmhgfs/filesystem.c (+67/-47)
modules/linux/vmhgfs/inode.c (+6/-6)
modules/linux/vmsync/Makefile (+1/-1)
modules/linux/vmxnet/Makefile (+1/-1)
modules/linux/vmxnet/vmxnet.c (+28/-3)
modules/linux/vmxnet/vmxnet_version.h (+3/-3)
modules/linux/vsock/Makefile (+1/-1)
modules/linux/vsock/linux/vmci_sockets_packet.h (+111/-0)
modules/linux/vsock/linux/vsockPacket.h (+3/-82)
modules/linux/vsock/linux/vsock_version.h (+4/-4)
modules/shared/vmxnet/eth_public.h (+1/-1)
modules/shared/vmxnet/vmnet_def.h (+3/-3)
modules/solaris/vmxnet/vmxnet.c (+4/-0)
modules/solaris/vmxnet3/vmxnet3_main.c (+2/-0)
modules/solaris/vmxnet3/vmxnet3_solaris.h (+1/-1)
modules/solaris/vmxnet3/vmxnet3_solaris_compat.h (+7/-5)
rpctool/Makefile.in (+3/-1)
scripts/Makefile.in (+3/-1)
scripts/linux/network (+57/-35)
services/Makefile.in (+3/-1)
services/plugins/Makefile.in (+3/-1)
services/plugins/desktopEvents/Makefile.in (+3/-1)
services/plugins/desktopEvents/desktopEvents.c (+8/-0)
services/plugins/dndcp/Makefile.in (+3/-1)
services/plugins/dndcp/dnd/dndLinux.c (+19/-2)
services/plugins/dndcp/stringxx/string.cc (+10/-3)
services/plugins/dndcp/stringxx/string.hh (+1/-1)
services/plugins/guestInfo/Makefile.in (+3/-1)
services/plugins/guestInfo/getlib/Makefile.in (+3/-1)
services/plugins/hgfsServer/Makefile.in (+3/-1)
services/plugins/powerOps/Makefile.in (+3/-1)
services/plugins/resolutionSet/Makefile.in (+3/-1)
services/plugins/timeSync/Makefile.in (+3/-1)
services/plugins/vix/Makefile.in (+3/-1)
services/plugins/vix/vixTools.c (+1458/-111)
services/plugins/vix/vixToolsInt.h (+25/-2)
services/plugins/vmbackup/Makefile.in (+3/-1)
services/vmtoolsd/Makefile.in (+3/-1)
services/vmtoolsd/l10n/de.vmsg (+1/-1)
services/vmtoolsd/l10n/ja.vmsg (+1/-1)
services/vmtoolsd/l10n/ko.vmsg (+1/-1)
tests/Makefile.in (+3/-1)
tests/testDebug/Makefile.in (+3/-1)
tests/testPlugin/Makefile.in (+3/-1)
tests/testVmblock/Makefile.in (+3/-1)
tests/vmrpcdbg/Makefile.in (+3/-1)
toolbox/Makefile.in (+3/-1)
toolbox/l10n/de.vmsg (+79/-80)
toolbox/l10n/ja.vmsg (+74/-75)
toolbox/l10n/ko.vmsg (+77/-78)
toolbox/l10n/zh_CN.vmsg (+169/-43)
toolbox/toolboxcmd-shrink.c (+22/-4)
vmblock-fuse/Makefile.in (+3/-1)
vmblockmounter/Makefile.in (+3/-1)
vmware-user-suid-wrapper/Makefile.in (+3/-1)
xferlogs/Makefile.in (+3/-1)
Branch information
- Owner:
- Nate Muench (Mink)
- Status:
- Abandoned
Recent revisions
- 28. By Nate Muench (Mink)
-
* Merge latest upstream git tag.
* debian/rules: Removed glib2.0 compatibility CFLAG.
- Packaging can now build without it. - 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) - 23. By Evan Broder
-
Revert debian/rules change in 2011.03.
28-387002- 0ubuntu2 and instead
remove debian/open-vm- toolbox. links, which was shadowing the original
/etc/xdg/autostart/ vmware- user.desktop file. - 21. By Serge Hallyn
-
* Merge latest upstream git tag. This has the unlocked_ioctl change
needed to fix dkms build failures (LP: #727342)
* Changes in debian/rules:
- work around a bug in toolbox/Makefile, where install-exec-hook is
not happening. This needs to get fixed the right way.
- don't install 'vmware-user' which seems to no longer exist
- move /etc/xdg into open-vm-toolbox (which should be done using .install)
* debian/open-vm- tools.init: add 'modprobe [-r] vmblock'. (LP: #332323)
* debian/rules and debian/open-vm- toolbox. lintian- overrides:
- Make vmware-user-suid- wrapper suid-root (LP: #332323) - 20. By Nate Muench (Mink)
-
* Merge from Debian testing (LP: #632101), remaining changes:
- Recommend open-vm-toolbox in open-vm-tools.
- Rediffing vsock.patch. - 19. By Stefano Rivera
-
Add 03-vmxnet.patch and 04-vsock.patch.
Fixes building on Maverick kernels (LP: #598542)
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/precise/open-vm-tools