diff options
author | Naveen Saini <naveen.kumar.saini@intel.com> | 2021-02-11 18:23:15 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2021-02-16 15:08:12 +0800 |
commit | d7670a5d243d879897cbdb9acad8779c0e413045 (patch) | |
tree | e201bf2ec81450e0dbb29e88ce3a6e151fc1e3c3 | |
parent | 9deb61d0ffdcc83fb1d267e6bed6af6e0af07ac3 (diff) | |
download | meta-intel-d7670a5d243d879897cbdb9acad8779c0e413045.tar.gz |
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>
-rw-r--r-- | dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.4.2.bb (renamed from recipes-bsp/thermald/thermald_2.2.bb) | 14 | ||||
-rw-r--r-- | recipes-bsp/thermald/thermald/0001-configure.ac-disable-werror.patch | 27 |
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." | |||
6 | 6 | ||
7 | HOMEPAGE = "https://github.com/01org/thermal_daemon" | 7 | HOMEPAGE = "https://github.com/01org/thermal_daemon" |
8 | 8 | ||
9 | DEPENDS = "dbus dbus-glib dbus-glib-native libxml2 glib-2.0 glib-2.0-native" | 9 | DEPENDS = "dbus dbus-glib dbus-glib-native libxml2 glib-2.0 glib-2.0-native upower libevdev" |
10 | LICENSE = "GPLv2" | 10 | LICENSE = "GPLv2" |
11 | LIC_FILES_CHKSUM = "file://COPYING;md5=ea8831610e926e2e469075b52bf08848" | 11 | LIC_FILES_CHKSUM = "file://COPYING;md5=ea8831610e926e2e469075b52bf08848" |
12 | 12 | ||
13 | SRC_URI = "git://github.com/intel/thermal_daemon/ \ | 13 | SRC_URI = "git://github.com/intel/thermal_daemon/ \ |
14 | file://0001-configure.ac-disable-werror.patch \ | ||
15 | " | 14 | " |
16 | SRCREV = "4f0e68974c26749191ac945586b8cc97800d5d02" | 15 | |
16 | SRCREV = "86d6634b7e648ad5a3304e8dcf4eee613fa07fac" | ||
17 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
18 | 18 | ||
19 | inherit pkgconfig autotools systemd | 19 | inherit pkgconfig autotools systemd gtk-doc |
20 | |||
21 | # gtkdocsize runs before autotools do_configure and it copies gtk-doc.m4 and fails | ||
22 | # to copy becuase there is no m4 dir yet. | ||
23 | do_configure_prepend () { | ||
24 | mkdir -p ${S}/m4 | ||
25 | } | ||
20 | 26 | ||
21 | EXTRA_OECONF = " \ | 27 | EXTRA_OECONF = " \ |
22 | --with-systemdsystemunitdir=${systemd_system_unitdir} \ | 28 | --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 @@ | |||
1 | From b20692607ec8b0895c5ac0c23b0393ad3048640d Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Mon, 22 Jun 2020 09:34:51 +0800 | ||
4 | Subject: [PATCH] configure.ac: disable werror | ||
5 | |||
6 | Upstream-Status: Inappropriate | ||
7 | |||
8 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
9 | --- | ||
10 | configure.ac | 1 - | ||
11 | 1 file changed, 1 deletion(-) | ||
12 | |||
13 | diff --git a/configure.ac b/configure.ac | ||
14 | index 7d6c13c..3e1a8bf 100644 | ||
15 | --- a/configure.ac | ||
16 | +++ b/configure.ac | ||
17 | @@ -84,7 +84,6 @@ for flag in \ | ||
18 | -Wall \ | ||
19 | -Wclobbered \ | ||
20 | -Wempty-body \ | ||
21 | - -Werror \ | ||
22 | -Wformat \ | ||
23 | -Wignored-qualifiers \ | ||
24 | -Wmissing-field-initializers \ | ||
25 | -- | ||
26 | 2.25.4 | ||
27 | |||