[Buildroot] [PATCH 1/2] package/thermald: bump to version 2.2

[Buildroot] [PATCH 1/2] package/thermald: bump to version 2.2

[Fabrice Fontaine]

host-autoconf-archive is needed for AX_CHECK_COMPILE_FLAG since version
2.1 and
https://github.com/intel/thermal_daemon/commit/16e067427e9cbc3d69500d351b4e6a2fba5df4a6

Extract from README.txt:

Release 2.2
- Ignore PPCC power limits when max and min power is same
- Regression in cpufreq cooling device causing min state to get stuck

Release 2.1
- Workaround for invalid PPCC power limits
- Reduce polling for power when PPCC is not present

Release 2.0
- Tiger Lake support
- PL1 limit setting from PPCC as is
- Optimize multi step, multi zone control
- Add new tag for product identification "product_sku"

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/thermald/thermald.hash | 2 +-
 package/thermald/thermald.mk   | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/package/thermald/thermald.hash b/package/thermald/thermald.hash
index 34094ac8c0..6dda67e7e1 100644
--- a/package/thermald/thermald.hash
+++ b/package/thermald/thermald.hash
@@ -1,3 +1,3 @@
 # Locally computed:
-sha256  aaf5ffdc12344eef2417b41b433094bb30e4ebf321f0140b090f97bfcf24ea1f  thermald-1.9.1.tar.gz
+sha256  d23042e84dbd8a81c32fdc7bef3e2524b75ec68184a9ae3a324f54de382ea23f  thermald-2.2.tar.gz
 sha256  e98be8bc482e038a14bfbc01caf800bbd0024fff275ef14cd999db6560254a8d  COPYING
diff --git a/package/thermald/thermald.mk b/package/thermald/thermald.mk
index 98e9c361e5..3c0356a04d 100644
--- a/package/thermald/thermald.mk
+++ b/package/thermald/thermald.mk
@@ -4,11 +4,13 @@
 #
 ################################################################################
 
-THERMALD_VERSION = 1.9.1
+THERMALD_VERSION = 2.2
 THERMALD_SITE = $(call github,intel,thermal_daemon,v$(THERMALD_VERSION))
 # fetched from Github, with no configure script
 THERMALD_AUTORECONF = YES
-THERMALD_DEPENDENCIES = dbus dbus-glib libxml2 $(TARGET_NLS_DEPENDENCIES)
+THERMALD_AUTORECONF_OPTS = --include=$(HOST_DIR)/share/autoconf-archive
+THERMALD_DEPENDENCIES = \
+	host-autoconf-archive dbus dbus-glib libxml2 $(TARGET_NLS_DEPENDENCIES)
 # tools are GPL-3.0+ but are not added to the target
 THERMALD_LICENSE = GPL-2.0+
 THERMALD_LICENSE_FILES = COPYING
-- 
2.27.0

[Buildroot] [PATCH 2/2] package/thermald: disable werror

[Fabrice Fontaine]

Fixes:
 - http://autobuild.buildroot.org/results/80a126c225a9e9cbfdc30882c4ce00517d853d8b

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ....ac-allow-the-user-to-disable-Werror.patch | 51 +++++++++++++++++++
 package/thermald/thermald.mk                  |  1 +
 2 files changed, 52 insertions(+)
 create mode 100644 package/thermald/0001-configure.ac-allow-the-user-to-disable-Werror.patch

diff --git a/package/thermald/0001-configure.ac-allow-the-user-to-disable-Werror.patch b/package/thermald/0001-configure.ac-allow-the-user-to-disable-Werror.patch
new file mode 100644
index 0000000000..3aea5d4247
--- /dev/null
+++ b/package/thermald/0001-configure.ac-allow-the-user-to-disable-Werror.patch
@@ -0,0 +1,51 @@
+From 65afca34f76f6e3c955569988c0de3a6f8be8710 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Mon, 17 Aug 2020 09:49:15 +0200
+Subject: [PATCH] configure.ac: allow the user to disable -Werror
+
+This will fix the following build failure which is related to glib:
+
+In file included from /home/buildroot/autobuild/run/instance-1/output-1/host/bin/../x86_64-buildroot-linux-gnu/sysroot/usr/include/glib-2.0/glib/gthread.h:32:0,
+                 from /home/buildroot/autobuild/run/instance-1/output-1/host/bin/../x86_64-buildroot-linux-gnu/sysroot/usr/include/glib-2.0/glib/gasyncqueue.h:32,
+                 from /home/buildroot/autobuild/run/instance-1/output-1/host/bin/../x86_64-buildroot-linux-gnu/sysroot/usr/include/glib-2.0/glib.h:32,
+                 from src/thermald.h:70,
+                 from src/thd_dbus_interface.cpp:25:
+src/thd_dbus_interface.cpp: In function 'GType pref_object_get_type()':
+/home/buildroot/autobuild/run/instance-1/output-1/host/bin/../x86_64-buildroot-linux-gnu/sysroot/usr/include/glib-2.0/glib/gatomic.h:128:15: error: variable 'gapg_temp_atomic' set but not used [-Werror=unused-but-set-variable]
+     gpointer *gapg_temp_atomic = (gpointer *)(atomic);                       \
+               ^
+
+Fixes:
+ - http://autobuild.buildroot.org/results/80a126c225a9e9cbfdc30882c4ce00517d853d8b
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status: https://github.com/intel/thermal_daemon/pull/251]
+---
+ configure.ac | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0e81ebc..71aeb54 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -95,7 +95,6 @@ for flag in \
+     -Wall \
+     -Wclobbered \
+     -Wempty-body \
+-    -Werror \
+     -Wformat \
+     -Wignored-qualifiers \
+     -Wmissing-field-initializers \
+@@ -111,6 +110,9 @@ for flag in \
+ done
+ ], [AC_MSG_ERROR([AX_CHECK_COMPILE_FLAG not found, you'll need to install autoconf-archive])])
+ 
++AC_ARG_ENABLE(werror, AS_HELP_STRING([--disable-werror], [Disable -Werror]))
++AS_IF([test "x$enable_werror" != "xno"], [CXXFLAGS="$CXXFLAGS -Werror"])
++
+ AC_CONFIG_FILES([Makefile
+                  docs/Makefile
+                  docs/version.xml
+-- 
+2.27.0
+
diff --git a/package/thermald/thermald.mk b/package/thermald/thermald.mk
index 3c0356a04d..27e657a56d 100644
--- a/package/thermald/thermald.mk
+++ b/package/thermald/thermald.mk
@@ -15,6 +15,7 @@ THERMALD_DEPENDENCIES = \
 THERMALD_LICENSE = GPL-2.0+
 THERMALD_LICENSE_FILES = COPYING
 THERMALD_CONF_ENV = LIBS=$(TARGET_NLS_LIBS)
+THERMALD_CONF_OPTS = --disable-werror
 
 ifeq ($(BR2_INIT_SYSTEMD),y)
 THERMALD_DEPENDENCIES += systemd
-- 
2.27.0

[Buildroot] [PATCH 2/2] package/thermald: disable werror

[Thomas Petazzoni]

On Mon, 17 Aug 2020 20:36:12 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> Fixes:
>  - http://autobuild.buildroot.org/results/80a126c225a9e9cbfdc30882c4ce00517d853d8b
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  ....ac-allow-the-user-to-disable-Werror.patch | 51 +++++++++++++++++++
>  package/thermald/thermald.mk                  |  1 +
>  2 files changed, 52 insertions(+)
>  create mode 100644 package/thermald/0001-configure.ac-allow-the-user-to-disable-Werror.patch

Is there a reason why this patch (fixing an autobuilder issue) is PATCH
2/2 and not PATCH 1/2 ?

Indeed, we normally want to fix existing issues before bumping the
version, as fixes currently go to master, while version bumps go to
next.

Could you clarify ?

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 2/2] package/thermald: disable werror

[Fabrice Fontaine]

Le mar. 18 ao?t 2020 ? 16:40, Thomas Petazzoni
<thomas.petazzoni@bootlin.com> a ?crit :
>
> On Mon, 17 Aug 2020 20:36:12 +0200
> Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
>
> > Fixes:
> >  - http://autobuild.buildroot.org/results/80a126c225a9e9cbfdc30882c4ce00517d853d8b
> >
> > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> > ---
> >  ....ac-allow-the-user-to-disable-Werror.patch | 51 +++++++++++++++++++
> >  package/thermald/thermald.mk                  |  1 +
> >  2 files changed, 52 insertions(+)
> >  create mode 100644 package/thermald/0001-configure.ac-allow-the-user-to-disable-Werror.patch
>
> Is there a reason why this patch (fixing an autobuilder issue) is PATCH
> 2/2 and not PATCH 1/2 ?
>
> Indeed, we normally want to fix existing issues before bumping the
> version, as fixes currently go to master, while version bumps go to
> next.
>
> Could you clarify ?
Because, the patch fixing the build failure does not apply cleanly on
current version.
So, instead of backporting my patch, I thought it would be easier to
bump to the latest official release.
>
> Best regards,
>
> Thomas
> --
> Thomas Petazzoni, CTO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
Best Regards,

Fabrice

[Buildroot] [PATCH 2/2] package/thermald: disable werror

[Thomas Petazzoni]

On Tue, 18 Aug 2020 16:47:41 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> Because, the patch fixing the build failure does not apply cleanly on
> current version.
> So, instead of backporting my patch, I thought it would be easier to
> bump to the latest official release.

Except we are now wait past -rc1, so we try to avoid merging version
bumps in master, otherwise we'll never manage to stabilize the master
branch.

So in this sort of situation, we want:

 - PATCH 1/2 that fixes the build issue, which we apply to master and
   next

 - PATCH 2/2 which does the version bump

Could you rework in this direction ?

Thanks a lot!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com