From aac6b746ce329ab2ad521cb62455dadfdda96665 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 27 Jun 2010 11:32:28 +0200 Subject: [PATCH 1/3] Update open-vm-tools. --- lfs/open-vm-tools | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lfs/open-vm-tools b/lfs/open-vm-tools index 214193ab2..c67ff923c 100644 --- a/lfs/open-vm-tools +++ b/lfs/open-vm-tools @@ -24,7 +24,7 @@ include Config -VER = 2009.05.22-167859 +VER = 8.4.2-261024 THISAPP = open-vm-tools-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = cc1c139d2d927952be93397d928f9d6c +$(DL_FILE)_MD5 = 4d9ddc865b42fc6982c3078031500486 install : $(TARGET) @@ -78,5 +78,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --without-kernel-modules cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install + + rm -rvf /usr/etc/pam.d /usr/share/open-vm-tools + @rm -rf $(DIR_APP) @$(POSTBUILD) From a075b9c5b1ed774a28a27e4ce41fc21ee683ae0d Mon Sep 17 00:00:00 2001 From: root Date: Fri, 2 Jul 2010 21:49:49 +0200 Subject: [PATCH 2/3] Changed make.sh to prepare open-vm-tools package --- doc/packages-list.txt | 2 +- lfs/open-vm-tools | 85 ------------------------------------------- make.sh | 2 +- 3 files changed, 2 insertions(+), 87 deletions(-) delete mode 100644 lfs/open-vm-tools diff --git a/doc/packages-list.txt b/doc/packages-list.txt index acde82953..10b40ad3f 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -256,7 +256,7 @@ * nut-2.4.3 * ocaml-3.09.2 * oinkmaster-2.0 -* open-vm-tools-2009.05.22-167859 +* open-vm-tools-8.4.2-261024 * openldap-2.3.20 * openmailadmin-1.0.0 * openssh-5.4p1 diff --git a/lfs/open-vm-tools b/lfs/open-vm-tools deleted file mode 100644 index c67ff923c..000000000 --- a/lfs/open-vm-tools +++ /dev/null @@ -1,85 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# 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 3 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. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 8.4.2-261024 - -THISAPP = open-vm-tools-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 4d9ddc865b42fc6982c3078031500486 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr \ - --with-kernel-release=$(KVER)-ipfire --without-pam \ - --disable-unity --without-gtk2 --without-gtkmm \ - --without-procps --without-dnet --without-icu \ - --without-x --with-linuxdir=/usr/src/linux \ - --without-kernel-modules - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - - rm -rvf /usr/etc/pam.d /usr/share/open-vm-tools - - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index eb63bb4ff..574f9f25c 100755 --- a/make.sh +++ b/make.sh @@ -625,7 +625,7 @@ buildipfire() { ipfiremake perl-DBD-mysql ipfiremake cacti ipfiremake icecc - ipfiremake open-vm-tools + ipfiremake openvmtools ipfiremake nagiosql ipfiremake iftop ipfiremake motion From 6d4a602f10a4abf0b97e9495d7f83ecc86146da8 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 2 Jul 2010 21:52:44 +0200 Subject: [PATCH 3/3] Added open-vm-tools package --- config/rootfiles/packages/openvmtools | 39 ++++++++++++ lfs/openvmtools | 92 +++++++++++++++++++++++++++ src/initscripts/init.d/openvmtools | 64 +++++++++++++++++++ 3 files changed, 195 insertions(+) create mode 100644 config/rootfiles/packages/openvmtools create mode 100644 lfs/openvmtools create mode 100755 src/initscripts/init.d/openvmtools diff --git a/config/rootfiles/packages/openvmtools b/config/rootfiles/packages/openvmtools new file mode 100644 index 000000000..29f11770f --- /dev/null +++ b/config/rootfiles/packages/openvmtools @@ -0,0 +1,39 @@ +etc/rc.d/init.d/openvmtools +etc/rc.d/rc0.d/K01openvmtools +etc/rc.d/rc3.d/S60openvmtools +etc/rc.d/rc6.d/K01openvmtools +etc/vmware-tools +etc/vmware-tools/plugins +etc/vmware-tools/poweroff-vm-default +etc/vmware-tools/poweron-vm-default +etc/vmware-tools/resume-vm-default +etc/vmware-tools/suspend-vm-default +etc/vmware-tools/vm-support +sbin/mount.vmhgfs +usr/bin/vmtoolsd +usr/bin/vmware-checkvm +usr/bin/vmware-hgfsclient +usr/bin/vmware-rpctool +usr/bin/vmware-toolbox-cmd +usr/bin/vmware-vmblock-fuse +usr/bin/vmware-xferlogs +usr/lib/libguestlib.a +usr/lib/libguestlib.la +usr/lib/libguestlib.so +usr/lib/libguestlib.so.0 +usr/lib/libguestlib.so.0.0.0 +usr/lib/libvmtools.a +usr/lib/libvmtools.la +usr/lib/libvmtools.so +usr/lib/libvmtools.so.0 +usr/lib/libvmtools.so.0.0.0 +usr/lib/open-vm-tools +usr/lib/open-vm-tools/plugins +usr/lib/open-vm-tools/plugins/vmsvc +usr/lib/open-vm-tools/plugins/vmsvc/libguestInfo.so +usr/lib/open-vm-tools/plugins/vmsvc/libhgfsServer.so +usr/lib/open-vm-tools/plugins/vmsvc/libpowerOps.so +usr/lib/open-vm-tools/plugins/vmsvc/libtimeSync.so +usr/lib/open-vm-tools/plugins/vmsvc/libvix.so +usr/lib/open-vm-tools/plugins/vmsvc/libvmbackup.so +usr/sbin/mount.vmhgfs diff --git a/lfs/openvmtools b/lfs/openvmtools new file mode 100644 index 000000000..c708268f0 --- /dev/null +++ b/lfs/openvmtools @@ -0,0 +1,92 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# # +# 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 3 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. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 8.4.2-261024 + +THISAPP = open-vm-tools-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = openvmtools +PAK_VER = 0 +DEPS = "glib" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 4d9ddc865b42fc6982c3078031500486 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr \ + --with-kernel-release=$(KVER)-ipfire --without-pam \ + --disable-unity --without-gtk2 --without-gtkmm \ + --without-procps --without-dnet --without-icu \ + --without-x --with-linuxdir=/usr/src/linux \ + --without-kernel-modules + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + ln -sf ../init.d/openvmtools /etc/rc.d/rc3.d/S60openvmtools + ln -sf ../init.d/openvmtools /etc/rc.d/rc0.d/K01openvmtools + ln -sf ../init.d/openvmtools /etc/rc.d/rc6.d/K01openvmtools + rm -rvf /usr/etc/pam.d /usr/share/openvmtools + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/src/initscripts/init.d/openvmtools b/src/initscripts/init.d/openvmtools new file mode 100755 index 000000000..c1588e1dc --- /dev/null +++ b/src/initscripts/init.d/openvmtools @@ -0,0 +1,64 @@ +#!/bin/sh +######################################################################## +# Begin $rc_base/init.d/ +# +# Description : init-script for open-vm-tools +# +# Authors : earl +# +# Version : 00.01 +# +# Notes : +# +######################################################################## + +. /etc/sysconfig/rc +. ${rc_functions} + +case "${1}" in + start) + if ps ax | grep -v grep | grep /usr/bin/vmtoolsd > /dev/null + then + boot_mesg "vmtoolsd is running..." + echo_warning + else + if /usr/bin/vmware-checkvm > /dev/null 2>&1; then + boot_mesg "Starting..." + /usr/bin/vmtoolsd & + echo_ok + else + boot_mesg "IPFire is not running in a virtual machine." + echo_failure + fi + fi + ;; + + stop) + if ps ax | grep -v grep | grep /usr/bin/vmtoolsd > /dev/null + then + boot_mesg "Stopping..." + killall /usr/bin/vmtoolsd > /dev/null + echo_ok + else + boot_mesg "vmtoolsd is not running..." + echo_warning + fi + ;; + + restart) + ${0} stop + sleep 1 + ${0} start + ;; + + status) + statusproc /usr/bin/vmtoolsd + ;; + + *) + echo "Usage: ${0} {start|stop|restart}" + exit 1 + ;; +esac + +# End $rc_base/init.d/