From 443c441443999eb7d11b01587bbc02af0038488d Mon Sep 17 00:00:00 2001 From: Martin Kelly Date: Fri, 23 Jun 2017 15:48:42 -0700 Subject: open-vm-tools: remove kernel module logic All the modules are upstream for Linux >= 4.0, so no modules are being built anyway. We can safely remove the build logic for them. Signed-off-by: Martin Kelly Signed-off-by: Martin Jansa --- .../open-vm-tools/0001-Fix-kernel-detection.patch | 35 ------------------ .../0001-configure.ac-don-t-use-dnet-config.patch | 41 ++++++++++++++++++++++ .../0002-add-include-sys-sysmacros.h.patch | 33 +++++++++++++++++ .../0002-configure.ac-don-t-use-dnet-config.patch | 41 ---------------------- .../0003-add-include-sys-sysmacros.h.patch | 33 ----------------- .../open-vm-tools/open-vm-tools_10.1.5.bb | 23 ++++-------- 6 files changed, 80 insertions(+), 126 deletions(-) delete mode 100644 meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-Fix-kernel-detection.patch create mode 100644 meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch create mode 100644 meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-add-include-sys-sysmacros.h.patch delete mode 100644 meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-configure.ac-don-t-use-dnet-config.patch delete mode 100644 meta-oe/recipes-support/open-vm-tools/open-vm-tools/0003-add-include-sys-sysmacros.h.patch (limited to 'meta-oe/recipes-support/open-vm-tools') 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 63ea45324..000000000 --- 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 -Date: Thu, 7 Jan 2016 15:06:16 -0600 -Subject: [PATCH] Fix-kernel-detection - -Signed-off-by: Diego Dompe ---- - 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/0001-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 new file mode 100644 index 000000000..e9cb873f1 --- /dev/null +++ b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch @@ -0,0 +1,41 @@ +From 929150608c16644695f19cd2e0cc8a06a41cd497 Mon Sep 17 00:00:00 2001 +From: Martin Kelly +Date: Fri, 7 Apr 2017 15:20:30 -0700 +Subject: [PATCH] configure.ac: don't use dnet-config + +The dnet-config tool doesn't know about cross-compilation, so it injects +-I/usr/include into the path, causing compiler errors. So instead find dnet via +-ldnet. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Martin Kelly +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 3400b86..7d6119e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -942,7 +942,7 @@ if test "$with_dnet" = "yes"; then + AC_VMW_CHECK_LIB([dnet], + [DNET], + [], +- [dnet-config], ++ [], + [], + [dnet.h], + [intf_open], +@@ -952,7 +952,7 @@ if test "$with_dnet" = "yes"; then + + if test $have_dnet = "no"; then + AC_MSG_ERROR( +- [dnet-config was not found on your PATH. Please configure without dnet (using --without-dnet) or install dnet - http://libdnet.sourceforge.net]) ++ [dnet was not found. Please configure without dnet (using --without-dnet) or install dnet - http://libdnet.sourceforge.net]) + fi + fi + +-- +2.1.4 + diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-add-include-sys-sysmacros.h.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-add-include-sys-sysmacros.h.patch new file mode 100644 index 000000000..f905601d5 --- /dev/null +++ b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-add-include-sys-sysmacros.h.patch @@ -0,0 +1,33 @@ +From 5818acc8032e3247257730376e947330340a07b3 Mon Sep 17 00:00:00 2001 +From: Martin Kelly +Date: Mon, 22 May 2017 17:00:05 -0700 +Subject: [PATCH 2/2] add #include + +In newer glibc versions, the definition for major() has been moved to +sys/sysmacros.h, and using the older version in has been +deprecated. So, add an include for . + +Upstream-Status: Pending + +Signed-off-by: Martin Kelly +--- + lib/wiper/wiperPosix.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/open-vm-tools/lib/wiper/wiperPosix.c b/open-vm-tools/lib/wiper/wiperPosix.c +index d389eee..1f221fc 100644 +--- a/lib/wiper/wiperPosix.c ++++ b/lib/wiper/wiperPosix.c +@@ -40,6 +40,9 @@ + # include + # endif /* __FreeBSD_version >= 500000 */ + #endif ++#if defined(__linux__) ++#include ++#endif + #include + + #include "vmware.h" +-- +2.7.4 + 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/0002-configure.ac-don-t-use-dnet-config.patch deleted file mode 100644 index e9cb873f1..000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-configure.ac-don-t-use-dnet-config.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 929150608c16644695f19cd2e0cc8a06a41cd497 Mon Sep 17 00:00:00 2001 -From: Martin Kelly -Date: Fri, 7 Apr 2017 15:20:30 -0700 -Subject: [PATCH] configure.ac: don't use dnet-config - -The dnet-config tool doesn't know about cross-compilation, so it injects --I/usr/include into the path, causing compiler errors. So instead find dnet via --ldnet. - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Martin Kelly ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 3400b86..7d6119e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -942,7 +942,7 @@ if test "$with_dnet" = "yes"; then - AC_VMW_CHECK_LIB([dnet], - [DNET], - [], -- [dnet-config], -+ [], - [], - [dnet.h], - [intf_open], -@@ -952,7 +952,7 @@ if test "$with_dnet" = "yes"; then - - if test $have_dnet = "no"; then - AC_MSG_ERROR( -- [dnet-config was not found on your PATH. Please configure without dnet (using --without-dnet) or install dnet - http://libdnet.sourceforge.net]) -+ [dnet was not found. Please configure without dnet (using --without-dnet) or install dnet - http://libdnet.sourceforge.net]) - fi - fi - --- -2.1.4 - 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/0003-add-include-sys-sysmacros.h.patch deleted file mode 100644 index f905601d5..000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0003-add-include-sys-sysmacros.h.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5818acc8032e3247257730376e947330340a07b3 Mon Sep 17 00:00:00 2001 -From: Martin Kelly -Date: Mon, 22 May 2017 17:00:05 -0700 -Subject: [PATCH 2/2] add #include - -In newer glibc versions, the definition for major() has been moved to -sys/sysmacros.h, and using the older version in has been -deprecated. So, add an include for . - -Upstream-Status: Pending - -Signed-off-by: Martin Kelly ---- - lib/wiper/wiperPosix.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/open-vm-tools/lib/wiper/wiperPosix.c b/open-vm-tools/lib/wiper/wiperPosix.c -index d389eee..1f221fc 100644 ---- a/lib/wiper/wiperPosix.c -+++ b/lib/wiper/wiperPosix.c -@@ -40,6 +40,9 @@ - # include - # endif /* __FreeBSD_version >= 500000 */ - #endif -+#if defined(__linux__) -+#include -+#endif - #include - - #include "vmware.h" --- -2.7.4 - 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 76d3840e6..24c8e9300 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 \ -- cgit v1.2.3-54-g00ecf