From 95c9f35743120371c50906ecb0d60121e054308f Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Mon, 22 Dec 2014 20:25:33 -0800 Subject: [PATCH 1/2] open-vm-tools: always set rpath to OEM library directory By default /usr/share/oem/lib64 is included in ld.so.conf but if for any reason ld.so.cache is generated incorrectly vmtoolsd will fail. Using rpath instead avoids depending on the state of ld.so.cache. --- ...6-r1.ebuild => open-vm-tools-9.4.6-r2.ebuild} | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/{open-vm-tools-9.4.6-r1.ebuild => open-vm-tools-9.4.6-r2.ebuild} (86%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/open-vm-tools-9.4.6-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/open-vm-tools-9.4.6-r2.ebuild similarity index 86% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/open-vm-tools-9.4.6-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/open-vm-tools-9.4.6-r2.ebuild index eb48393963..fd926b51bb 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/open-vm-tools-9.4.6-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/open-vm-tools-9.4.6-r2.ebuild @@ -6,7 +6,7 @@ EAPI=5 AUTOTOOLS_AUTORECONF=1 AUTOTOOLS_IN_SOURCE_BUILD=1 -inherit autotools-utils toolchain-funcs git-2 +inherit autotools-utils flag-o-matic git-2 multilib toolchain-funcs DESCRIPTION="VMware tools for distribution via /usr/share/oem" HOMEPAGE="http://open-vm-tools.sourceforge.net/" @@ -62,11 +62,17 @@ override_vmw_check_lib() { } src_configure() { + local oemlib="/usr/share/oem/$(get_libdir)" + local oeminc="/usr/share/oem/include" + + # set rpath even if oem is in ld.so.conf + append-ldflags "-Wl,-rpath,${oemlib}" + # libdnet is installed to /usr/share/oem - export CUSTOM_DNET_CPPFLAGS="-I${SYSROOT}/usr/share/oem/include" - export CUSTOM_DNET_LIBS="-L${SYSROOT}/usr/share/oem/lib64" - export CUSTOM_MSPACK_CPPFLAGS="-I${SYSROOT}/usr/share/oem/include" - export CUSTOM_MSPACK_LIBS="-L${SYSROOT}/usr/share/oem/lib64" + export CUSTOM_DNET_CPPFLAGS="-I${SYSROOT}${oeminc}" + export CUSTOM_DNET_LIBS="-L${SYSROOT}${oemlib}" + export CUSTOM_MSPACK_CPPFLAGS="-I${SYSROOT}${oeminc}" + export CUSTOM_MSPACK_LIBS="-L${SYSROOT}${oemlib}" # >=sys-process/procps-3.3.2 not handled by configure export CUSTOM_PROCPS_NAME=procps From e03f3eb2dbc409fa5d045a5cf7c2cd64f1e8f1d0 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Mon, 22 Dec 2014 20:36:05 -0800 Subject: [PATCH 2/2] bootengine: do not run ldconfig in the initrd --- ...{bootengine-0.0.1-r43.ebuild => bootengine-0.0.1-r44.ebuild} | 0 .../coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/{bootengine-0.0.1-r43.ebuild => bootengine-0.0.1-r44.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.1-r43.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.1-r44.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.1-r43.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.1-r44.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild index 2d9d35fe93..746ff58541 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild @@ -10,7 +10,7 @@ CROS_WORKON_REPO="git://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~x86" else - CROS_WORKON_COMMIT="f95c568766e4fc61858f164398a866aa9c8f37df" + CROS_WORKON_COMMIT="2d74829987d0de4c6be2b4b194ed9fdedd50adc9" KEYWORDS="amd64 arm x86" fi