On 07/31/2012 01:50 AM, Daniel Baumann wrote: > there's nothing i can do about it except asking you to unblock said version, > which i did.
almost.. in addition to what the other people on the thread[0] already said.. here are the individual git commits as patches attached, constituting the complete diff between wheezy and sid. the actual diff for anything that wasn't unblocked/freeze-exempted before already, is patch 8 only (and patch 9 for the changelog entry). [0] http://lists.debian.org/debian-release/2012/07/msg01706.html -- Address: Daniel Baumann, Donnerbuehlweg 3, CH-3012 Bern Email: daniel.baum...@progress-technologies.net Internet: http://people.progress-technologies.net/~daniel.baumann/
>From 6f78a73d8539424ba635c4e5d7c572b81c06e4c3 Mon Sep 17 00:00:00 2001 From: Daniel Baumann <daniel.baum...@progress-technologies.net> Date: Sat, 30 Jun 2012 02:42:40 +0200 Subject: [PATCH 1/9] Switching to xz compression. --- debian/rules | 2 +- debian/source/options | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index f699ed5..c9b8c95 100755 --- a/debian/rules +++ b/debian/rules @@ -47,7 +47,7 @@ override_dh_auto_install: mv debian/open-vm-tools/usr/lib/open-vm-tools/plugins/vmusr debian/open-vm-toolbox/usr/lib/open-vm-tools/plugins override_dh_builddeb: - dh_builddeb -- -Zgzip -z9 + dh_builddeb -- -Zxz -z9 override_dh_fixperms: dh_fixperms -Xsbin/mount.vmhgfs diff --git a/debian/source/options b/debian/source/options index d053b65..22a4de9 100644 --- a/debian/source/options +++ b/debian/source/options @@ -1,2 +1,2 @@ -compression = gzip +compression = xz compression-level = 9 -- 1.7.10.4
>From 1c91cfeedd6fc2b80050b1293e59d3dc343672eb Mon Sep 17 00:00:00 2001 From: Daniel Baumann <daniel.baum...@progress-technologies.net> Date: Sat, 30 Jun 2012 02:45:02 +0200 Subject: [PATCH 2/9] Loading modules through kmod instead of initscript. --- debian/local/open-vm-tools.kmod | 2 ++ debian/open-vm-tools.init | 10 ---------- debian/rules | 1 + 3 files changed, 3 insertions(+), 10 deletions(-) create mode 100644 debian/local/open-vm-tools.kmod diff --git a/debian/local/open-vm-tools.kmod b/debian/local/open-vm-tools.kmod new file mode 100644 index 0000000..99d11ad --- /dev/null +++ b/debian/local/open-vm-tools.kmod @@ -0,0 +1,2 @@ +vmhgfs +vmsync diff --git a/debian/open-vm-tools.init b/debian/open-vm-tools.init index 51bc146..22d73ad 100644 --- a/debian/open-vm-tools.init +++ b/debian/open-vm-tools.init @@ -27,11 +27,6 @@ case "${1}" in # Check if we're running inside VMWare exit_if_not_in_vm - log_daemon_msg "Loading open-vm-tools modules" - log_progress_msg "vmhgfs"; modprobe vmhgfs - log_progress_msg "vmsync"; modprobe vmsync - log_end_msg 0 - log_daemon_msg "Starting open-vm daemon" "vmtoolsd" /usr/bin/vmtoolsd --background /var/run/vmtoolsd.pid log_end_msg 0 @@ -49,11 +44,6 @@ case "${1}" in fi log_end_msg 0 - - log_daemon_msg "Removing open-vm-tools modules" - log_progress_msg "vmhgfs"; modprobe -r vmhgfs - log_progress_msg "vmsync"; modprobe -r vmsync - log_end_msg 0 ;; force-reload|restart) diff --git a/debian/rules b/debian/rules index c9b8c95..fa4d044 100755 --- a/debian/rules +++ b/debian/rules @@ -22,6 +22,7 @@ override_dh_auto_install: install -D -m 0755 debian/local/vmxnet.hook debian/open-vm-tools/usr/share/initramfs-tools/hooks/vmxnet install -D -m 0644 debian/local/xautostart.conf debian/open-vm-toolbox/etc/vmware-tools/xautostart.conf install -D -m 0644 debian/local/tools.conf debian/open-vm-tools/etc/vmware-tools/tools.conf + install -D -m 0644 debian/local/open-vm-tools.kmod debian/open-vm-tools/lib/modules-load.d/open-vm-tools.conf # open-vm-tools-dev mkdir -p debian/open-vm-tools-dev/usr/share/doc/open-vm-tools -- 1.7.10.4
>From d3f74fd765b6a6320d92e3b699d957a3b46a033c Mon Sep 17 00:00:00 2001 From: Daniel Baumann <daniel.baum...@progress-technologies.net> Date: Sat, 30 Jun 2012 04:54:11 +0200 Subject: [PATCH 3/9] Adding sleep during restart in initscript. --- debian/open-vm-tools.init | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/open-vm-tools.init b/debian/open-vm-tools.init index 22d73ad..706eb7c 100644 --- a/debian/open-vm-tools.init +++ b/debian/open-vm-tools.init @@ -47,7 +47,9 @@ case "${1}" in ;; force-reload|restart) - ${0} stop; ${0} start + ${0} stop + sleep 1 + ${0} start ;; *) -- 1.7.10.4
>From d1dd753db76334a896b91ac312c34470448dc252 Mon Sep 17 00:00:00 2001 From: Daniel Baumann <daniel.baum...@progress-technologies.net> Date: Sat, 30 Jun 2012 03:43:42 +0200 Subject: [PATCH 4/9] Removing old dpkg trigger for update-initramfs. --- debian/open-vm-tools.triggers | 1 - 1 file changed, 1 deletion(-) delete mode 100644 debian/open-vm-tools.triggers diff --git a/debian/open-vm-tools.triggers b/debian/open-vm-tools.triggers deleted file mode 100644 index 6c9f454..0000000 --- a/debian/open-vm-tools.triggers +++ /dev/null @@ -1 +0,0 @@ -activate update-initramfs -- 1.7.10.4
>From 163411421665240e92fb17978b2fcaeaff18a5ea Mon Sep 17 00:00:00 2001 From: Daniel Baumann <daniel.baum...@progress-technologies.net> Date: Sat, 30 Jun 2012 03:47:41 +0200 Subject: [PATCH 5/9] Updating GPL boilerplate in copyright file. --- debian/copyright | 62 +++++++++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/debian/copyright b/debian/copyright index 1a15d3e..5a022ed 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,7 +5,7 @@ Source: http://sourceforge.net/projects/open-vm-tools/files/ Files: * Copyright: VMware, Inc. <http://www.vmware.com/> -License: GPL-2.1 +License: LGPL-2.1 Files: */Makefile*, modules/* Copyright: VMware, Inc. <http://www.vmware.com/> @@ -60,53 +60,53 @@ License: BSD-3 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. License: GPL-2 - This program is free software; you can redistribute it and/or modify it under - the terms of the GNU General Public License as published by the Free Software - Foundation; version 2 of the License. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, version 2 of the License. . - This program is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - PARTICULAR PURPOSE. See the GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. . - You should have received a copy of the GNU General Public License along with - this program; if not, write to the Free Software Foundation, Inc., 51 Franklin - St, Fifth Floor, Boston, MA 02110-1301 USA + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. . The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-2 file. License: GPL-2+ - This program is free software; you can redistribute it and/or modify it under - the terms of the GNU General Public License as published by the Free Software - Foundation; either version 2 of the License, or (at your option) any later - version. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. . - This program is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - PARTICULAR PURPOSE. See the GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. . - You should have received a copy of the GNU General Public License along with - this program; if not, write to the Free Software Foundation, Inc., 51 Franklin - St, Fifth Floor, Boston, MA 02110-1301 USA + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. . The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-2 file. -License: GPL-2.1 - This library is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the Free - Software Foundation; version 2.1 of the License. +License: LGPL-2.1 + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation, version 2.1 of the License. . - This library is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. . - You should have received a copy of the GNU Lesser General Public License along - with this library; if not, write to the Free Software Foundation, Inc., 51 - Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. . The complete text of the GNU Lesser General Public License - can be found in /usr/share/common-licenses/LGPL-2.1 file. + can be found in /usr/share/common-licenses/GPL-2.1 file. License: MIT(*) Permission to use, copy, modify, and distribute this software for any purpose -- 1.7.10.4
>From 0477af44d4e6a99c65a0de61b9b84963e31758c3 Mon Sep 17 00:00:00 2001 From: Daniel Baumann <daniel.baum...@progress-technologies.net> Date: Wed, 20 Jun 2012 11:57:36 +0200 Subject: [PATCH 6/9] Calling dh_dkms with version argument (Closes: #677503). --- debian/rules | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/debian/rules b/debian/rules index fa4d044..2dac866 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,7 @@ #!/usr/bin/make -f +VERSION = $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed -e 's|^.*:.*+||' -e 's|-.*$$||') + %: dh ${@} --with autotools_dev,dkms @@ -50,6 +52,9 @@ override_dh_auto_install: override_dh_builddeb: dh_builddeb -- -Zxz -z9 +override_dh_dkms: + dh_dkms -V $(VERSION) + override_dh_fixperms: dh_fixperms -Xsbin/mount.vmhgfs -- 1.7.10.4
>From 63ee0929a3b4b66ed420eef1eae8c9b2f6ee24c2 Mon Sep 17 00:00:00 2001 From: Daniel Baumann <daniel.baum...@progress-technologies.net> Date: Sat, 30 Jun 2012 04:55:37 +0200 Subject: [PATCH 7/9] Releasing debian version 8.8.0+2012.05.21-724730-2. --- debian/changelog | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index b679bb1..5791225 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +open-vm-tools (2:8.8.0+2012.05.21-724730-2) unstable; urgency=low + + * Switching to xz compression. + * Loading modules through kmod instead of initscript. + * Adding sleep during restart in initscript. + * Removing old dpkg trigger for update-initramfs. + * Updating GPL boilerplate in copyright file. + * Calling dh_dkms with version argument (Closes: #677503). + + -- Daniel Baumann <daniel.baum...@progress-technologies.net> Sat, 30 Jun 2012 04:55:23 +0200 + open-vm-tools (2:8.8.0+2012.05.21-724730-1) unstable; urgency=low * Merging upstream version 8.8.0+2012.05.21-724730. -- 1.7.10.4
>From 898c04dfdb6937b7e09f7e9aa4fb0195e692c8a8 Mon Sep 17 00:00:00 2001 From: Thijs Kinkhorst <th...@debian.org> Date: Mon, 16 Jul 2012 22:05:22 +0200 Subject: [PATCH 8/9] Updating dkms.conf to make modules build again, thanks to H.A.J. Koster (Closes: #679886). --- debian/open-vm-dkms.dkms | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/debian/open-vm-dkms.dkms b/debian/open-vm-dkms.dkms index ec97630..0cf5bdd 100644 --- a/debian/open-vm-dkms.dkms +++ b/debian/open-vm-dkms.dkms @@ -1,26 +1,48 @@ PACKAGE_NAME="open-vm-tools" PACKAGE_VERSION="#MODULE_VERSION#" +MAKE_CMD_TMPL="make VM_UNAME=\$kernelver \ + MODULEBUILDDIR=$dkms_tree/$PACKAGE_NAME/$PACKAGE_VERSION/build" + +MAKE[0]="$MAKE_CMD_TMPL -C vmblock; \ + $MAKE_CMD_TMPL -C vmci; \ + $MAKE_CMD_TMPL -C vmhgfs; \ + $MAKE_CMD_TMPL -C vmsync; \ + $MAKE_CMD_TMPL -C vmxnet; \ + $MAKE_CMD_TMPL -C vsock" +CLEAN[0]="$MAKE_CMD_TMPL -C vmblock clean; \ + $MAKE_CMD_TMPL -C vmci clean; \ + $MAKE_CMD_TMPL -C vmhgfs clean; \ + $MAKE_CMD_TMPL -C vmsync clean; \ + $MAKE_CMD_TMPL -C vmxnet clean; \ + $MAKE_CMD_TMPL -C vsock clean" + BUILT_MODULE_NAME[0]="vmblock" +BUILT_MODULE_LOCATION[0]="vmblock/" DEST_MODULE_LOCATION[0]="/updates/dkms/" AUTOINSTALL=yes BUILT_MODULE_NAME[1]="vmci" +BUILT_MODULE_LOCATION[1]="vmci/" DEST_MODULE_LOCATION[1]="/updates/dkms/" AUTOINSTALL=yes BUILT_MODULE_NAME[2]="vmhgfs" +BUILT_MODULE_LOCATION[2]="vmhgfs/" DEST_MODULE_LOCATION[2]="/updates/dkms/" AUTOINSTALL=yes BUILT_MODULE_NAME[3]="vmsync" +BUILT_MODULE_LOCATION[3]="vmsync/" DEST_MODULE_LOCATION[3]="/updates/dkms/" AUTOINSTALL=yes BUILT_MODULE_NAME[4]="vmxnet" +BUILT_MODULE_LOCATION[4]="vmxnet/" DEST_MODULE_LOCATION[4]="/updates/dkms/" AUTOINSTALL=yes BUILT_MODULE_NAME[5]="vsock" +BUILT_MODULE_LOCATION[5]="vsock/" DEST_MODULE_LOCATION[5]="/updates/dkms/" AUTOINSTALL=yes -- 1.7.10.4
>From e194dc7f4eafb385c9234d0122f1c700c511fc31 Mon Sep 17 00:00:00 2001 From: Daniel Baumann <daniel.baum...@progress-technologies.net> Date: Mon, 16 Jul 2012 22:07:26 +0200 Subject: [PATCH 9/9] Releasing debian version 8.8.0+2012.05.21-724730-3. --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5791225..2877f79 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +open-vm-tools (2:8.8.0+2012.05.21-724730-3) unstable; urgency=low + + [ Thijs Kinkhorst ] + * Updating dkms.conf to make modules build again, thanks to H.A.J. + Koster (Closes: #679886). + + -- Daniel Baumann <daniel.baum...@progress-technologies.net> Mon, 16 Jul 2012 22:06:58 +0200 + open-vm-tools (2:8.8.0+2012.05.21-724730-2) unstable; urgency=low * Switching to xz compression. -- 1.7.10.4