mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-10-09 22:41:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'open-vm-tools-9.4.6-procps-fix' of git://github.com/vmware/coreos-overlay

Browse Source 
Conflicts:
	app-emulation/open-vm-tools/open-vm-tools-9.4.6-r1.ebuild
This commit is contained in:
Michael Marineau 2014-11-30 16:44:59 -08:00
commit 65d84fea1c
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/files/open-vm-tools-9.4.6-0005-define_USE_SLASH_PROC.patch vendored Normal file
View File

@ -0,0 +1,24 @@
From 5936cd877fd307b796e364a4ac99615f44ef6024 Mon Sep 17 00:00:00 2001
From: Oliver Kurth <okurth@vmware.com>
Date: Mon, 17 Nov 2014 17:36:52 -0800
Subject: [PATCH] define USE_SLASH_PROC
---
open-vm-tools/services/plugins/guestInfo/getlib/Makefile.am | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/open-vm-tools/services/plugins/guestInfo/getlib/Makefile.am b/open-vm-tools/services/plugins/guestInfo/getlib/Makefile.am
index 331e24f..862029f 100644
--- a/open-vm-tools/services/plugins/guestInfo/getlib/Makefile.am
+++ b/open-vm-tools/services/plugins/guestInfo/getlib/Makefile.am
@@ -28,4 +28,6 @@ libGuestInfo_la_CPPFLAGS += @GLIB2_CPPFLAGS@
libGuestInfo_la_CPPFLAGS += -I$(srcdir)/..
AM_CFLAGS = $(DNET_CPPFLAGS)
-
+if USE_SLASH_PROC
+AM_CFLAGS += -DUSE_SLASH_PROC
+endif
--
1.9.1

1
sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/open-vm-tools-9.4.6-r1.ebuild vendored
View File

@ -41,6 +41,7 @@ PATCHES=(
"${FILESDIR}/${P}-0002-configure-Fix-USE_SLASH_PROC-conditional.patch"
"${FILESDIR}/${P}-0003-scripts-network.patch"
"${FILESDIR}/${P}-0004-auth-Read-from-shadow.patch"
"${FILESDIR}/${P}-0005-define_USE_SLASH_PROC.patch"
)
#pkg_setup() {