initial buildroot for linux 5.15
This commit is contained in:
@@ -0,0 +1,53 @@
|
||||
From 074575bf3640485ab6d43ae1efed3eff9cebae13 Mon Sep 17 00:00:00 2001
|
||||
From: Naveen Saini <naveen.kumar.saini@intel.com>
|
||||
Date: Thu, 5 Mar 2020 13:45:57 +0800
|
||||
Subject: [PATCH] thd_trip_point: fix 32-bit build error with musl v1.2.0
|
||||
|
||||
Error log:
|
||||
../git/src/thd_trip_point.cpp: In member function 'bool cthd_trip_point::thd_trip_point_check(int, unsigned int, int, bool*)':
|
||||
| ../git/src/thd_trip_point.cpp:250:19: error: format '%ld' expects argument of type 'long int', but argument 6 has type 'time_t' {aka 'long long int'} [-Werror=format=]
|
||||
| 250 | thd_log_info("Too early to act zone:%d index %d tm %ld\n",
|
||||
|
||||
musl 1.2.0 have new feature:
|
||||
time_t is now 64-bit on all archs (not just 64-bit archs)
|
||||
|
||||
Commit id:
|
||||
https://git.musl-libc.org/cgit/musl/commit/?id=38143339646a4ccce8afe298c34467767c899f51
|
||||
|
||||
Release note link for musl 1.2.0:
|
||||
https://git.musl-libc.org/cgit/musl/diff/
|
||||
|
||||
use %jd and typecast with intmax_t which is maximum width integer type
|
||||
|
||||
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
|
||||
[Upstream: https://github.com/intel/thermal_daemon/commit/a7136682b9e6ebdb53c3c8b472bcd5039d62dc78.patch]
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
src/thd_trip_point.cpp | 10 ++--------
|
||||
1 file changed, 2 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/src/thd_trip_point.cpp b/src/thd_trip_point.cpp
|
||||
index 46f692d..6358c27 100644
|
||||
--- a/src/thd_trip_point.cpp
|
||||
+++ b/src/thd_trip_point.cpp
|
||||
@@ -242,15 +242,9 @@ bool cthd_trip_point::thd_trip_point_check(int id, unsigned int read_temp,
|
||||
time_t tm;
|
||||
time(&tm);
|
||||
if ((tm - cdevs[i].last_op_time) < cdevs[i].sampling_priod) {
|
||||
-#if defined __x86_64__ && defined __ILP32__
|
||||
- thd_log_info("Too early to act zone:%d index %d tm %lld\n",
|
||||
+ thd_log_info("Too early to act zone:%d index %d tm %jd\n",
|
||||
zone_id, cdev->thd_cdev_get_index(),
|
||||
- tm - cdevs[i].last_op_time);
|
||||
-#else
|
||||
- thd_log_info("Too early to act zone:%d index %d tm %ld\n",
|
||||
- zone_id, cdev->thd_cdev_get_index(),
|
||||
- tm - cdevs[i].last_op_time);
|
||||
-#endif
|
||||
+ (intmax_t)tm - cdevs[i].last_op_time);
|
||||
break;
|
||||
}
|
||||
cdevs[i].last_op_time = tm;
|
||||
--
|
||||
2.29.2
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
config BR2_PACKAGE_THERMALD
|
||||
bool "thermald"
|
||||
depends on BR2_i386 || BR2_x86_64 # needs <cpuid.h>
|
||||
depends on BR2_USE_MMU # uses fork()
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus-glib -> glib2, dbus
|
||||
depends on BR2_USE_WCHAR # dbus-glib -> glib2
|
||||
select BR2_PACKAGE_DBUS
|
||||
select BR2_PACKAGE_DBUS_GLIB
|
||||
select BR2_PACKAGE_LIBXML2
|
||||
help
|
||||
Thermal Daemon is a Linux daemon for monitoring and
|
||||
controlling platform temperatures. Once the system temperature
|
||||
reaches a certain threshold, the Linux daemon activates
|
||||
various cooling methods to try to cool the system.
|
||||
|
||||
https://01.org/linux-thermal-daemon
|
||||
|
||||
comment "thermald needs a toolchain w/ C++, wchar, threads"
|
||||
depends on BR2_i386 || BR2_x86_64
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
!BR2_INSTALL_LIBSTDCPP
|
||||
@@ -0,0 +1,3 @@
|
||||
# Locally computed:
|
||||
sha256 aaf5ffdc12344eef2417b41b433094bb30e4ebf321f0140b090f97bfcf24ea1f thermald-1.9.1.tar.gz
|
||||
sha256 e98be8bc482e038a14bfbc01caf800bbd0024fff275ef14cd999db6560254a8d COPYING
|
||||
@@ -0,0 +1,23 @@
|
||||
################################################################################
|
||||
#
|
||||
# thermald
|
||||
#
|
||||
################################################################################
|
||||
|
||||
THERMALD_VERSION = 1.9.1
|
||||
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)
|
||||
# tools are GPL-3.0+ but are not added to the target
|
||||
THERMALD_LICENSE = GPL-2.0+
|
||||
THERMALD_LICENSE_FILES = COPYING
|
||||
THERMALD_CPE_ID_VENDOR = intel
|
||||
THERMALD_CONF_ENV = LIBS=$(TARGET_NLS_LIBS)
|
||||
|
||||
ifeq ($(BR2_INIT_SYSTEMD),y)
|
||||
THERMALD_DEPENDENCIES += systemd
|
||||
THERMALD_CONF_OPTS += --with-systemdsystemunitdir=/usr/lib/systemd/system
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user