From 7b6920a25f5d0561c338fa67c06b09c72dd8253c Mon Sep 17 00:00:00 2001 From: lanefu Date: Fri, 18 Sep 2020 16:29:22 +0000 Subject: [PATCH] 5.8.10 fixes (#2217) * Update 0001-bootsplash.patch dummyblit.c from patch/misc-001 will not compile with 5.8.10-- Change dummy_cursor declaration in dummyblit.c in misc-001 to match changes in fbcon.h see https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/drivers/video/fbdev/core/fbcon.h?h=v5.8.10&id=ffa74c8e58b8f42b2d95b29443befba2e28fb260 * Import bootsplash fix for kernel 5.8.10 from #2210 20a56315805232097bd2e73adef4fb73cc85caac * simplifying assumption to kernel 5.8... will need ot make sure we patch up to 5.8.10 * corrected 5.8 bootsplash workaround Co-authored-by: belfastraven --- lib/compilation-prepare.sh | 4 ++-- ...-bootsplash-pre-5.8.10.patch => 0001-bootsplash-5.8.patch} | 2 +- patch/misc/0001-bootsplash.patch | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename patch/misc/{0001-bootsplash-pre-5.8.10.patch => 0001-bootsplash-5.8.patch} (99%) diff --git a/lib/compilation-prepare.sh b/lib/compilation-prepare.sh index 442d0b79e..f350ba335 100644 --- a/lib/compilation-prepare.sh +++ b/lib/compilation-prepare.sh @@ -78,8 +78,8 @@ compilation_prepare() if linux-version compare "${version}" ge 5.4; then display_alert "Adding" "Kernel splash file" "info" - if linux-version compare "${version}" lt 5.8; then - process_patch_file "${SRC}/patch/misc/0001-bootsplash-pre-5.8.10.patch" "applying" + if linux-version compare "${version}" ge 5.8 && linux-version compare "${version}" lt 5.9 ; then + process_patch_file "${SRC}/patch/misc/0001-bootsplash-5.8.patch" "applying -- assumes patchlevel 5.8.10 or above" else process_patch_file "${SRC}/patch/misc/0001-bootsplash.patch" "applying" fi diff --git a/patch/misc/0001-bootsplash-pre-5.8.10.patch b/patch/misc/0001-bootsplash-5.8.patch similarity index 99% rename from patch/misc/0001-bootsplash-pre-5.8.10.patch rename to patch/misc/0001-bootsplash-5.8.patch index d5835e5ca..4d9d733bf 100644 --- a/patch/misc/0001-bootsplash-pre-5.8.10.patch +++ b/patch/misc/0001-bootsplash-5.8.patch @@ -581,7 +581,7 @@ index 000000000000..8c22ff92ce24 +} + +static void dummy_cursor(struct vc_data *vc, struct fb_info *info, int mode, -+ int softback_lines, int fg, int bg) ++ int fg, int bg) +{ + ; +} diff --git a/patch/misc/0001-bootsplash.patch b/patch/misc/0001-bootsplash.patch index 4d9d733bf..d5835e5ca 100644 --- a/patch/misc/0001-bootsplash.patch +++ b/patch/misc/0001-bootsplash.patch @@ -581,7 +581,7 @@ index 000000000000..8c22ff92ce24 +} + +static void dummy_cursor(struct vc_data *vc, struct fb_info *info, int mode, -+ int fg, int bg) ++ int softback_lines, int fg, int bg) +{ + ; +}