Merge lp://staging/~n-muench/ubuntu/saucy/open-vm-tools/open-vm-tools.april-update.part2-merge into lp://staging/ubuntu/saucy/open-vm-tools
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~n-muench/ubuntu/saucy/open-vm-tools/open-vm-tools.april-update.part2-merge |
| Merge into: | lp://staging/ubuntu/saucy/open-vm-tools |
| Diff against target: |
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) |
| To merge this branch: | bzr merge lp://staging/~n-muench/ubuntu/saucy/open-vm-tools/open-vm-tools.april-update.part2-merge |
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Dimitri John Ledkov (community) | Approve | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2013-09-08.
Description of the change
Merged some items from Debian. Added patches for Linux 3.10 & 3.11.
vmhgfs is still kind of flaky. Either because of something related to the kernel or a build package, I'm not really sure. It's been broken since the original upload, with the 3.9 kernel)
0007-dkms-
vmxnet builds successfully because of the 3.10 patch.
0007-dkms-
I was planning on more updates (including the paper work to become the package's official maintainer (and gain uploader rights)) during the Saucy devel cycle, but there were some delays related to the package. These plans have been postponed until 14.04.
Did I say too much to get this disapproved?
| Luke Yelavich (themuso) wrote | # |
| Nate Muench (Mink) (n-muench) wrote | # |
| Nate Muench (Mink) (n-muench) wrote | # |
| Dimitri John Ledkov (xnox) | # |
Unmerged 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.
You will have to either turn one of the existing bugs into a feature freeze exception, or create a new one and link it to this merge proposal.