From: Marcel Lorenz <lorenz.marcel@web.de>
To: development@lists.ipfire.org
Subject: [PATCH 3/3] openvmtools: add release file and change build options
Date: Wed, 10 Feb 2016 08:22:26 +0100 [thread overview]
Message-ID: <1455088946-5327-3-git-send-email-lorenz.marcel@web.de> (raw)
In-Reply-To: <1455088946-5327-1-git-send-email-lorenz.marcel@web.de>
[-- Attachment #1: Type: text/plain, Size: 9178 bytes --]
From: Marcel Lorenz <mlorenz(a)ipfire.org>
This changes are for better vcenter support and the relase file
removes the warnings at /var/log/vmware-vmsvc.log "Release file not found"
The vSphere Client now list all network adapters correctly
ICU support not more disabled.
new file: config/openvmtools/release
changed: config/rootfiles/packages/openvmtools
chamged: lfs/openvmtools
---
config/openvmtools/release | 3 ++
config/rootfiles/packages/openvmtools | 62 ++++++++++++++++++++++++-----------
lfs/openvmtools | 51 ++++++++++++++--------------
3 files changed, 73 insertions(+), 43 deletions(-)
create mode 100644 config/openvmtools/release
diff --git a/config/openvmtools/release b/config/openvmtools/release
new file mode 100644
index 0000000..c4329d7
--- /dev/null
+++ b/config/openvmtools/release
@@ -0,0 +1,3 @@
+COMMENT="This is needed for open-vm-tools"
+DISTRIB_ID="IPFire"
+DISTRIB_RELEASE="core97"
diff --git a/config/rootfiles/packages/openvmtools b/config/rootfiles/packages/openvmtools
index caeb568..76c25d4 100644
--- a/config/rootfiles/packages/openvmtools
+++ b/config/rootfiles/packages/openvmtools
@@ -1,13 +1,12 @@
-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/rc.d/rc0.d/K01openvmtools
+#etc/rc.d/rc3.d/S41openvmtools
+#etc/rc.d/rc6.d/K01openvmtools
+#etc/vmware-tools
etc/vmware-tools/guestproxy-ssl.conf
etc/vmware-tools/poweroff-vm-default
etc/vmware-tools/poweron-vm-default
etc/vmware-tools/resume-vm-default
-etc/vmware-tools/scripts
+#etc/vmware-tools/scripts
etc/vmware-tools/scripts/vmware
etc/vmware-tools/scripts/vmware/network
etc/vmware-tools/statechange.subr
@@ -23,51 +22,76 @@ usr/bin/vmware-rpctool
usr/bin/vmware-toolbox-cmd
usr/bin/vmware-vmblock-fuse
usr/bin/vmware-xferlogs
+#usr/include/libDeployPkg
+#usr/include/libDeployPkg/guestcust-events.h
+#usr/include/libDeployPkg/imgcust-api.h
+#usr/include/libDeployPkg/includeCheck.h
+#usr/include/libDeployPkg/linuxDeployment.h
+#usr/include/libDeployPkg/log.h
+#usr/include/libDeployPkg/process.h
+#usr/include/libDeployPkg/rpcout.h
+#usr/include/libDeployPkg/vm_basic_types.h
+#usr/include/mspack.h
#usr/include/vmGuestLib
#usr/include/vmGuestLib/includeCheck.h
#usr/include/vmGuestLib/vmGuestLib.h
#usr/include/vmGuestLib/vmSessionId.h
#usr/include/vmGuestLib/vm_basic_types.h
+#usr/lib/libDeployPkg.a
+#usr/lib/libDeployPkg.la
+usr/lib/libDeployPkg.so
+usr/lib/libDeployPkg.so.0
+usr/lib/libDeployPkg.so.0.0.0
#usr/lib/libguestlib.a
#usr/lib/libguestlib.la
-#usr/lib/libguestlib.so
+usr/lib/libguestlib.so
usr/lib/libguestlib.so.0
usr/lib/libguestlib.so.0.0.0
#usr/lib/libhgfs.a
#usr/lib/libhgfs.la
-#usr/lib/libhgfs.so
+usr/lib/libhgfs.so
usr/lib/libhgfs.so.0
usr/lib/libhgfs.so.0.0.0
+#usr/lib/libmspack.a
+#usr/lib/libmspack.la
+usr/lib/libmspack.so
+usr/lib/libmspack.so.0
+usr/lib/libmspack.so.0.1.0
#usr/lib/libvmtools.a
#usr/lib/libvmtools.la
-#usr/lib/libvmtools.so
+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
+#usr/lib/open-vm-tools/plugins
#usr/lib/open-vm-tools/plugins/common
#usr/lib/open-vm-tools/plugins/common/libhgfsServer.la
usr/lib/open-vm-tools/plugins/common/libhgfsServer.so
#usr/lib/open-vm-tools/plugins/common/libvix.la
usr/lib/open-vm-tools/plugins/common/libvix.so
-usr/lib/open-vm-tools/plugins/vmsvc
+#usr/lib/open-vm-tools/plugins/vmsvc
+usr/lib/open-vm-tools/plugins/vmsvc/libdeployPkgPlugin.so
usr/lib/open-vm-tools/plugins/vmsvc/libgrabbitmqProxy.so
usr/lib/open-vm-tools/plugins/vmsvc/libguestInfo.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/libvmbackup.so
+#usr/lib/pkgconfig/libDeployPkg.pc
+#usr/lib/pkgconfig/libmspack.pc
#usr/lib/pkgconfig/vmguestlib.pc
usr/sbin/mount.vmhgfs
#usr/share/open-vm-tools
#usr/share/open-vm-tools/messages
#usr/share/open-vm-tools/messages/de
-#usr/share/open-vm-tools/messages/de/toolboxcmd.vmsg
-#usr/share/open-vm-tools/messages/de/vmtoolsd.vmsg
+usr/share/open-vm-tools/messages/de/toolboxcmd.vmsg
+usr/share/open-vm-tools/messages/de/vmtoolsd.vmsg
#usr/share/open-vm-tools/messages/ja
-#usr/share/open-vm-tools/messages/ja/toolboxcmd.vmsg
-#usr/share/open-vm-tools/messages/ja/vmtoolsd.vmsg
+usr/share/open-vm-tools/messages/ja/toolboxcmd.vmsg
+usr/share/open-vm-tools/messages/ja/vmtoolsd.vmsg
#usr/share/open-vm-tools/messages/ko
-#usr/share/open-vm-tools/messages/ko/toolboxcmd.vmsg
-#usr/share/open-vm-tools/messages/ko/vmtoolsd.vmsg
+usr/share/open-vm-tools/messages/ko/toolboxcmd.vmsg
+usr/share/open-vm-tools/messages/ko/vmtoolsd.vmsg
#usr/share/open-vm-tools/messages/zh_CN
-#usr/share/open-vm-tools/messages/zh_CN/toolboxcmd.vmsg
+usr/share/open-vm-tools/messages/zh_CN/toolboxcmd.vmsg
+etc/rc.d/init.d/openvmtools
+etc/release
diff --git a/lfs/openvmtools b/lfs/openvmtools
index 72101d5..28a349f 100644
--- a/lfs/openvmtools
+++ b/lfs/openvmtools
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> #
# #
# 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 #
@@ -22,10 +22,10 @@
# Definitions
###############################################################################
+
include Config
VER = 10.0.5-3227872
-
THISAPP = open-vm-tools-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
@@ -33,32 +33,27 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
SUP_ARCH = x86_64 i586
PROG = openvmtools
-PAK_VER = 2
-
+PAK_VER = 3
DEPS = ""
-#CFLAGS += -fno-PIC
-
###############################################################################
# Top-level Rules
###############################################################################
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+objects = $(DL_FILE) libmspack-0.5alpha.tar.gz
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+libmspack-0.5alpha.tar.gz = $(DL_FROM)/libmspack-0.5alpha.tar.gz
-$(DL_FILE)_MD5 = 734eccf6e9e007cb37dc4eb3ed6707b5
+$(DL_FILE)_MD5 = 734eccf6e9e007cb37dc4eb3ed6707b5
+libmspack-0.5alpha.tar.gz_MD5 = 3aa3f6b9ef101463270c085478fda1da
install : $(TARGET)
-
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
md5 : $(subst %,%_MD5,$(objects))
-
dist:
- @$(PAK)
+ @$(PAK)
+
###############################################################################
# Downloading, checking, md5sum
###############################################################################
@@ -78,22 +73,30 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/libmspack-0.5alpha.tar.gz
+ cd $(DIR_SRC)/libmspack-0.5alpha && ./configure --prefix=/usr
+ cd $(DIR_SRC)/libmspack-0.5alpha && make $(MAKETUNING)
+ cd $(DIR_SRC)/libmspack-0.5alpha && make install
+ @rm -rf $(DIR_SRC)/libmspack-0.5alpha
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && sed -e "s/-Werror//g" -i configure.ac
- cd $(DIR_APP) && autoreconf -vfi
+ cd $(DIR_APP) && autoreconf -i
cd $(DIR_APP) && ./configure --prefix=/usr \
- --with-kernel-release=$(KVER)-ipfire --without-pam \
- --disable-unity --without-gtk2 --without-gtkmm \
- --without-procps --without-icu \
- --without-x --with-linuxdir=/usr/src/linux \
- --without-kernel-modules --disable-deploypkg \
- --without-xerces-c --without-xerces
+ --with-kernel-release=$(KVER)-ipfire \
+ --without-pam \
+ --without-gtk2 \
+ --without-gtkmm \
+ --without-x \
+ --with-linuxdir=/usr/src/linux \
+ --without-xerces \
+ --without-kernel-modules \
+ CUSTOM_MSPACK_LIBS=/usr/local/include/mspack.h
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
-
+ cp -fv $(DIR_SRC)/config/openvmtools/release /etc/
@rm -rf $(DIR_APP)
@$(POSTBUILD)
+
--
1.9.1
prev parent reply other threads:[~2016-02-10 7:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1455088946-5327-1-git-send-email-lorenz.marcel@web.de>
2016-02-10 7:22 ` [PATCH 2/3] new package: icu version 56.1 for Unicode support Marcel Lorenz
2016-02-10 7:22 ` Marcel Lorenz [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1455088946-5327-3-git-send-email-lorenz.marcel@web.de \
--to=lorenz.marcel@web.de \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox