diff options
-rw-r--r-- | meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-Fix-kernel-detection.patch | 35 | ||||
-rw-r--r-- | meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch (renamed from meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-configure.ac-don-t-use-dnet-config.patch) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-add-include-sys-sysmacros.h.patch (renamed from meta-oe/recipes-support/open-vm-tools/open-vm-tools/0003-add-include-sys-sysmacros.h.patch) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb | 23 |
4 files changed, 6 insertions, 52 deletions
diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-Fix-kernel-detection.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-Fix-kernel-detection.patch deleted file mode 100644 index 63ea453249..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-Fix-kernel-detection.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 5d8814f4b4f016a633984822a6dfbc9426fef333 Mon Sep 17 00:00:00 2001 -From: Diego Dompe <dompe@hpe.com> -Date: Thu, 7 Jan 2016 15:06:16 -0600 -Subject: [PATCH] Fix-kernel-detection - -Signed-off-by: Diego Dompe <dompe@hpe.com> ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 04e3bac..1ab3f29 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -151,7 +151,7 @@ if test "$with_kernel_modules" = "yes"; then - if test ! -d "$LINUXDIR/kernel/"; then - AC_MSG_ERROR([$LINUXDIR/kernel does not exist]) - fi -- LINUXINCLUDE="$LINUXDIR/build/include" -+ LINUXINCLUDE="$LINUXDIR/include" - if test ! -d "$LINUXINCLUDE"; then - AC_MSG_ERROR([Can't find include dir under $LINUXDIR]) - fi -@@ -1034,7 +1034,7 @@ MODULES_DIR="" - buildHgfsmounter=no - - if test "$os" = "linux"; then -- MODULES_DIR="$LINUXDIR/kernel/" -+ MODULES_DIR="/lib/modules/$KERNEL_RELEASE" - - CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64" - CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE" --- -1.9.1 - diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-configure.ac-don-t-use-dnet-config.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch index e9cb873f1a..e9cb873f1a 100644 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-configure.ac-don-t-use-dnet-config.patch +++ b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0003-add-include-sys-sysmacros.h.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-add-include-sys-sysmacros.h.patch index f905601d52..f905601d52 100644 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0003-add-include-sys-sysmacros.h.patch +++ b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-add-include-sys-sysmacros.h.patch diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb b/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb index 76d3840e66..24c8e93003 100644 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb +++ b/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb @@ -23,41 +23,30 @@ LICENSE_modules/solaris = "CDDLv1" SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https \ file://tools.conf \ file://vmtoolsd.service \ - file://0001-Fix-kernel-detection.patch \ - file://0002-configure.ac-don-t-use-dnet-config.patch \ - file://0003-add-include-sys-sysmacros.h.patch \ + file://0001-configure.ac-don-t-use-dnet-config.patch \ + file://0002-add-include-sys-sysmacros.h.patch \ " SRCREV = "854c0bb374612f7e633b448ca273f970f154458b" S = "${WORKDIR}/git/open-vm-tools" -DEPENDS = "virtual/kernel glib-2.0 glib-2.0-native util-linux libdnet procps" -RDEPENDS_${PN} = "util-linux libdnet kernel-module-vmhgfs" +DEPENDS = "glib-2.0 glib-2.0-native util-linux libdnet procps" +RDEPENDS_${PN} = "util-linux libdnet" -inherit module-base kernel-module-split autotools pkgconfig systemd - -# from module.bbclass... -addtask make_scripts after do_patch before do_compile -do_make_scripts[lockfiles] = "${TMPDIR}/kernel-scripts.lock" -do_make_scripts[depends] = "virtual/kernel:do_shared_workdir" -# add all splitted modules to PN RDEPENDS, PN can be empty now -KERNEL_MODULES_META_PACKAGE = "${PN}" +inherit autotools pkgconfig systemd SYSTEMD_SERVICE_${PN} = "vmtoolsd.service" EXTRA_OECONF = "--without-icu --disable-multimon --disable-docs --disable-tests \ --without-gtkmm --without-xerces --without-pam \ --disable-grabbitmqproxy --disable-vgauth --disable-deploypkg \ - --with-linuxdir=${STAGING_KERNEL_DIR} --with-kernel-release=${KERNEL_VERSION} --without-root-privileges" + --without-root-privileges --without-kernel-modules" NO_X11_FLAGS = "--without-x --without-gtk2 --without-gtk3" X11_DEPENDS = "libxext libxi libxrender libxrandr libxtst gtk+ gdk-pixbuf" PACKAGECONFIG[x11] = ",${NO_X11_FLAGS},${X11_DEPENDS}" -EXTRA_OEMAKE = "KERNEL_RELEASE=${KERNEL_VERSION}" - - CFLAGS += '-Wno-error=deprecated-declarations' FILES_${PN} += "/usr/lib/open-vm-tools/plugins/vmsvc/lib*.so \ |