thermald: upgrade 2.2 -> 2.4.2

Fixed new dependencies failure.

| automake: error: cannot open < gtk-doc.make: No such file or directory
| autoreconf: error: automake failed with exit status: 1

| checking for upower-glib... no
| configure: error: Package requirements (upower-glib) were not met:
|
| No package 'upower-glib' found

| checking for libevdev... no
| configure: error: Package requirements (libevdev) were not met:
|
| No package 'libevdev' found

upower library recipe comes from meta-openembedded/meta-oe layer, so
moved recipe to dyanmic-layer.

Dropped patch, which is not requried anymore.

Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>

2 files changed, 10 insertions, 31 deletions

diff --git a/recipes-bsp/thermald/thermald_2.2.bb b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.4.2.bb
index 6da1291d..c8482286 100644
--- a/recipes-bsp/thermald/thermald_2.2.bb
+++ b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.4.2.bb
@@ -6,17 +6,23 @@ compensation using available cooling methods."
 
 HOMEPAGE = "https://github.com/01org/thermal_daemon"
 
-DEPENDS = "dbus dbus-glib dbus-glib-native libxml2 glib-2.0 glib-2.0-native"
+DEPENDS = "dbus dbus-glib dbus-glib-native libxml2 glib-2.0 glib-2.0-native upower libevdev"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=ea8831610e926e2e469075b52bf08848"
 
 SRC_URI = "git://github.com/intel/thermal_daemon/ \
-           file://0001-configure.ac-disable-werror.patch \
            "
-SRCREV = "4f0e68974c26749191ac945586b8cc97800d5d02"
+
+SRCREV = "86d6634b7e648ad5a3304e8dcf4eee613fa07fac"
 S = "${WORKDIR}/git"
 
-inherit pkgconfig autotools systemd
+inherit pkgconfig autotools systemd gtk-doc
+
+# gtkdocsize runs before autotools do_configure and it copies gtk-doc.m4 and fails
+# to copy becuase there is no m4 dir yet.
+do_configure_prepend () {
+        mkdir -p ${S}/m4
+}
 
 EXTRA_OECONF = " \
                  --with-systemdsystemunitdir=${systemd_system_unitdir} \
diff --git a/recipes-bsp/thermald/thermald/0001-configure.ac-disable-werror.patch b/recipes-bsp/thermald/thermald/0001-configure.ac-disable-werror.patch
deleted file mode 100644
index b8639e0e..00000000
--- a/recipes-bsp/thermald/thermald/0001-configure.ac-disable-werror.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From b20692607ec8b0895c5ac0c23b0393ad3048640d Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Mon, 22 Jun 2020 09:34:51 +0800
-Subject: [PATCH] configure.ac: disable werror
-
-Upstream-Status: Inappropriate
-
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
----
- configure.ac | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 7d6c13c..3e1a8bf 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -84,7 +84,6 @@ for flag in \
-     -Wall \
-     -Wclobbered \
-     -Wempty-body \
--    -Werror \
-     -Wformat \
-     -Wignored-qualifiers \
-     -Wmissing-field-initializers \
--- 
-2.25.4
-