Changed make.sh to prepare open-vm-tools package

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index acde82953eb042a1f9f2c008043e69b6ef08281b..10b40ad3fa2fd9c8f850c456c5c280e3ba44f7c9 100644 (file)
--- 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
 * 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
 * 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 (file)
index c67ff92..0000000
--- 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 <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# 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 eb63bb4ff9ed24673627bcf15ea31ace6f58fe37..574f9f25ca168866c5f88396faa610d8fca12fd3 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -625,7 +625,7 @@ buildipfire() {
   ipfiremake perl-DBD-mysql
   ipfiremake cacti
   ipfiremake icecc
   ipfiremake perl-DBD-mysql
   ipfiremake cacti
   ipfiremake icecc

-  ipfiremake open-vm-tools
+  ipfiremake openvmtools

   ipfiremake nagiosql
   ipfiremake iftop
   ipfiremake motion
   ipfiremake nagiosql
   ipfiremake iftop
   ipfiremake motion