lp://staging/~n-muench/ubuntu/saucy/open-vm-tools/open-vm-tools.april-update.part2-merge
- Get this branch:
- bzr branch lp://staging/~n-muench/ubuntu/saucy/open-vm-tools/open-vm-tools.april-update.part2-merge
Branch merges
- Dimitri John Ledkov (community): Approve
-
Diff: 4869 lines (+3948/-299)48 files modified.pc/0005-linux-310-fix.patch/modules/linux/shared/compat_fs.h (+266/-0)
.pc/0005-linux-310-fix.patch/modules/linux/vmblock/linux/control.c (+375/-0)
.pc/0005-linux-310-fix.patch/modules/linux/vmblock/linux/dentry.c (+118/-0)
.pc/0005-linux-310-fix.patch/modules/linux/vmblock/linux/inode.c (+232/-0)
.pc/0005-linux-310-fix.patch/modules/linux/vmhgfs/file.c (+1280/-0)
.pc/0005-linux-310-fix.patch/modules/linux/vmsync/sync.c (+711/-0)
.pc/0006-linux-311-fix.patch/modules/linux/vmblock/linux/file.c (+244/-0)
.pc/0007-dkms-suppress-error.patch/modules/linux/dkms.conf (+34/-0)
.pc/applied-patches (+3/-0)
debian/changelog (+99/-0)
debian/control (+70/-43)
debian/copyright (+2/-2)
debian/local/open-vm-tools.service (+11/-0)
debian/manpages/libguestlib.3 (+0/-4)
debian/manpages/libvmtools.3 (+0/-4)
debian/manpages/vmblock.9 (+0/-4)
debian/manpages/vmhgfs.9 (+0/-4)
debian/manpages/vmware-checkvm.1 (+0/-4)
debian/manpages/vmware-hgfsclient.1 (+0/-4)
debian/manpages/vmware-hgfsmounter.8 (+0/-4)
debian/manpages/vmware-toolbox-cmd.1 (+0/-4)
debian/manpages/vmware-user-suid-wrapper.8 (+0/-4)
debian/manpages/vmware-xferlogs.1 (+0/-4)
debian/manpages/vmxnet.9 (+0/-4)
debian/open-vm-dkms.dkms (+0/-10)
debian/open-vm-dkms.postinst (+0/-42)
debian/open-vm-dkms.prerm (+0/-29)
debian/open-vm-toolbox.lintian-overrides (+0/-2)
debian/open-vm-toolbox.manpages (+0/-1)
debian/open-vm-tools-desktop.lintian-overrides (+2/-0)
debian/open-vm-tools-desktop.manpages (+1/-0)
debian/open-vm-tools-dkms.dkms (+6/-0)
debian/open-vm-tools-dkms.postinst (+42/-0)
debian/open-vm-tools-dkms.prerm (+29/-0)
debian/open-vm-tools.init (+1/-2)
debian/patches/0005-linux-310-fix.patch (+225/-0)
debian/patches/0006-linux-311-fix.patch (+94/-0)
debian/patches/0007-dkms-suppress-error.patch (+41/-0)
debian/patches/series (+3/-0)
debian/rules (+20/-19)
modules/linux/dkms.conf (+5/-20)
modules/linux/shared/compat_fs.h (+0/-12)
modules/linux/vmblock/linux/control.c (+9/-9)
modules/linux/vmblock/linux/dentry.c (+3/-4)
modules/linux/vmblock/linux/file.c (+7/-50)
modules/linux/vmblock/linux/inode.c (+2/-2)
modules/linux/vmhgfs/file.c (+1/-0)
modules/linux/vmsync/sync.c (+12/-8)
Related bugs
Related blueprints
Branch information
- Owner:
- Nate Muench (Mink)
- Status:
- Merged
Recent revisions
- 37. By Nate Muench (Mink)
-
* Ubuntu-specific Changes
- debian/rules: Removed Wno-error=unused- local-typedefs from CLFAGS.
+ We now enforce building with GCC 4.7.- debian/patches: Add 0005-linux-
310-fix. patch & 0006-linux- 311-fix. patch
+ Fixes building against Saucy Kernels. (LP: #1194940, LP: #1208011)- debian/patches: Add 0007-dkms-
supress- error.patch
+ Don't build modules that are broken, so modules that do build
are available to be loaded.
+ Will be removed after next upstream release.* Items merged from Debian experimental:
(From 2:9.2.2-893683-7 release)
- Removing purely cosmetical 'sleep 1' leftover in initscript.(From 2:9.2.3-1031360-2 release)
- Renaming debian-specific open-vm-toolbox package to open-vm-tools-
desktop for consistency with upstream.
- Revamping package descriptions.
- Renaming open-vm-dkms to open-vm-tools-dkms for consistent package
namespace.(From 2:9.2.3-1031360-3 release)
- Adding initial systemd service file from fedora.(From 2:9.2.3-1031360-4 release)
- Dropping kfreebsd from architecture list, it has never built and
nobody seems willing to make it work (neither upstream, porters, nor
users).(From 2:9.2.3-1031360-6 release)
- Correcting syntax of file entries in copyright.
- Adding section override for open-vm-tools-dkms.
- Enforcing build with gcc 4.7 for the time being. - 36. By Nate Muench (Mink)
-
* Merging upstream version 2013.04.16-1098359.
- Fixes building on Saucy kernels (LP: #1175295).* Stop DKMS from building vmci & vsock modules
- Modules are now in the kernel.* debian/patches:
- Removing procps.patch, not needed anymore.
- Removed 0005-kernel-38-fixes. patch
+ No longer needed.
- Renumbering patches.* debian/rules:
- Added Wno-error=unused- local-typedefs to CLFAGS
+ Suppresses build errors with GCC 4.8.* Items merged from Debian:
(From 2:9.2.2-893683-8 release)
- Adding patch from Mathias Krause <email address hidden> to fix
kernel stack memory leack in vsock module [CVE-2013-3237] - 35. By Nate Muench (Mink)
-
* Ubuntu-specific Changes
- debian/rules: Added LIBS field with -lpthread.
+ Fixes package compile failure for Raring and future Ubuntu Releases.* Items merged from Debian unstable:
(From 2:9.2.2-893683-1 release)
- Adding remote_fs dependency in initscript.
- Correcting architecture fields in control.(From 2:9.2.2-893683-2 release)
- Removing init order to network.(From 2:9.2.2-893683-4 release)
- Removing init order to network also on start.(From 2:9.2.2-893683-5 release)
- Updating to standards version 3.9.4.
- Updating year in copyright file.
- Prefixing patches with 4 digits for consistency.
- Tightening diff headers in patches.
- Dropping dpkg-source compression levels.(From 2:9.2.2-893683-6 release)
- Remove all references to Daniel's old email address. - 34. By Nate Muench (Mink)
-
* debian/patches: Rename 05-vmhgfs.patch to 05-kernel-
38-fixes. patch.
- Since it contains fixes to more than 1 file.
- Add vmci fixes recommended from upstream
+ Will be added in next release (whenever that is). - 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 - 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.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/ubuntu/saucy/open-vm-tools