vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: thermal daemon workspace integration (19 patches)

Browse Source 
Fixed common dependency path (../../common → ../common).
Added workspace member entry for drivers/thermald.
thermald now builds as part of base recipe.

19/19 patches. base + base-initfs build.
This commit is contained in:
Vasilito
2026-05-03 16:00:59 +01:00
parent 5160df6313
commit c9bf8a1efa
4 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
local/patches/base/P4-thermal-daemon.patch
+14 -10
View File
@@ -1,5 +1,5 @@
--- a/drivers/thermald/Cargo.toml 1970-01-01 00:00:00.000000000 +0000 --- a/drivers/thermald/Cargo.toml 1970-01-01 00:00:00.000000000 +0000
+++ b/drivers/thermald/Cargo.toml 2026-05-03 15:36:46.091061688 +0100 +++ b/drivers/thermald/Cargo.toml 2026-05-03 15:54:52.487976196 +0100
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
+[package] +[package]
+name = "thermald" +name = "thermald"
@@ -9,13 +9,13 @@
+[dependencies] +[dependencies]
+log.workspace = true +log.workspace = true
+anyhow.workspace = true +anyhow.workspace = true
+common = { path = "../../common" } +common = { path = "../common" }
+ +
+[lints] +[lints]
+workspace = true +workspace = true
--- a/drivers/thermald/src/main.rs 1970-01-01 00:00:00.000000000 +0000 --- a/drivers/thermald/src/main.rs 1970-01-01 00:00:00.000000000 +0000
+++ b/drivers/thermald/src/main.rs 2026-05-03 15:36:46.091037823 +0100 +++ b/drivers/thermald/src/main.rs 2026-05-03 15:54:52.488780946 +0100
@@ -0,0 +1,32 @@ @@ -0,0 +1,30 @@
+use anyhow::{Context, Result}; +use anyhow::{Context, Result};
+use std::{thread, time}; +use std::{thread, time};
+ +
@@ -41,14 +41,18 @@
+ log::error!("thermald: CRITICAL {:.1}C", temp); + log::error!("thermald: CRITICAL {:.1}C", temp);
+ } else if temp > 70.0 { + } else if temp > 70.0 {
+ log::warn!("thermald: WARNING {:.1}C", temp); + log::warn!("thermald: WARNING {:.1}C", temp);
+ } else {
+ log::info!("thermald: {:.1}C", temp);
+ } + }
+ } + }
+ thread::sleep(time::Duration::from_secs(5)); + thread::sleep(time::Duration::from_secs(5));
+ } + }
+} +}
--- a/.gitkeep 2026-05-03 15:36:46.091061688 +0100 --- a/init.d/30_thermald.service 1970-01-01 00:00:00.000000000 +0000
+++ b/.gitkeep 1970-01-01 00:00:00.000000000 +0000 +++ b/init.d/30_thermald.service 2026-05-03 15:54:52.489441597 +0100
@@ -1 +0,0 @@ @@ -0,0 +1,7 @@
- +[unit]
+description = "CPU Thermal Monitor"
+requires_weak = ["00_base.target"]
+
+[service]
+cmd = "thermald"
+type = "oneshot_async"
local/patches/base/P4-thermald-workspace.patch
+10
View File
@@ -0,0 +1,10 @@
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -46,6 +46,7 @@
"drivers/input/ps2d",
"drivers/input/usbhidd",
+ "drivers/thermald",
"drivers/net/driver-network",
"drivers/net/e1000d",
"drivers/net/ixgbed",
recipes/core/base/P4-thermald-workspace.patch
Symlink
+1
View File
@@ -0,0 +1 @@
../../../local/patches/base/P4-thermald-workspace.patch
recipes/core/base/recipe.toml
+2
View File
@@ -20,6 +20,7 @@ patches = [
"P4-initfs-dbus-services.patch", "P4-initfs-dbus-services.patch",
"P4-fbcond-scrollback.patch", "P4-fbcond-scrollback.patch",
"P4-thermal-daemon.patch", "P4-thermal-daemon.patch",
"P4-thermald-workspace.patch",
] ]
[build] [build]
@@ -67,6 +68,7 @@ BINS=(
rtl8168d rtl8168d
usbctl usbctl
usbhidd usbhidd
thermald
usbhubd usbhubd
ucsid ucsid
usbscsid usbscsid