pmaports/device/testing/linux-google-crosshatch/thermal-fix-build-error.patch
Zhuowei Zhang 129f93ec5b
google-crosshatch: update downstream kernel to LineageOS 17.1 kernel (!1040)
This updates google-crosshatch's downstream kernel to Lineage 17.1's
version (4.9.200, shared with Lineage's Pixel 3a port).

The newer kernel is needed because this device's kernel requires a
matching dtbo partition. The previous kernel would fail to boot with an
Android 10 dtbo partition.

Two patches were removed: Android 10's bootloader no longer passes the dm
or skip_initramfs boot arguments because of the new dynamic partitions
(https://source.android.com/devices/tech/ota/dynamic_partitions/ab_legacy).

Changes from the LineageOS kernel config:
https://gist.github.com/zhuowei/89b4135ff27e88f5a3dd3e4bf3cd31ab

Tested by booting to USB networking and debug-shell: I have not tested
flashing full pmOS using this kernel yet.

For some reason, on this kernel, when pmOS can't find system partitions
during the "Trying to mount subpartitions for 10 seconds..." stage, it
waits for 70 seconds instead of 10 seconds. I'm not sure why. It does go
to debug-shell correctly after a minute.

[ci:skip-build]: already built successfully in CI
2020-04-05 14:27:17 +02:00

30 lines
847 B
Diff

From a0cb8c6463e5945e6f5c03db1e7db06f90a73160 Mon Sep 17 00:00:00 2001
From: Zhuowei Zhang <linux@worthdoingbadly.com>
Date: Sat, 7 Mar 2020 22:07:45 -0500
Subject: [PATCH] thermal: fix build error
When building in-tree, I get:
```
drivers/thermal/thermal_core.c:42:10: fatal error: ../base/base.h: No such file or directory
```
---
drivers/thermal/thermal_core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 3ac29325ccbf..bb33c55b6592 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -39,7 +39,7 @@
#include <net/genetlink.h>
#include <linux/suspend.h>
#include <linux/kobject.h>
-#include <../base/base.h>
+#include "../base/base.h"
#define CREATE_TRACE_POINTS
#include <trace/events/thermal.h>
--
2.20.1