Skip to content

Commit

Permalink
Rollback Linus changes related to software scrollback support which p…
Browse files Browse the repository at this point in the history 
…revented bootsplash logo to show up (#2219)

https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/drivers/video/fbdev/core?h=v5.8.10&id=20782abbbdfe922496a28f9cc0c3c0030f7dfb8f
  • Loading branch information
@igorpecovnik
igorpecovnik committed Sep 21, 2020
1 parent 3daec70 commit 33d9a4c
Show file tree
Hide file tree
Showing 5 changed files with 1,042 additions and 750 deletions.
12 changes: 8 additions & 4 deletions lib/compilation-prepare.sh
View file
Expand Up @@ -78,11 +78,15 @@ compilation_prepare()
if linux-version compare "${version}" ge 5.4; then

display_alert "Adding" "Kernel splash file" "info"
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"

if linux-version compare "${version}" ge 5.8.10; then

This comment has been minimized.

Sign in to view

Copy link
@lanefu

lanefu Sep 21, 2020

Member

@igorpecovnik FYI we had a back-and-forth here where this evaluation won't work for kernels that are below 5.8.10 before patching due to the timing.

the ge 5.8 and lt 5.9 was to simplify and just assume all 5.8 kernels are patched to 5.8.10

#2210 (comment)

This comment has been minimized.

Sign in to view

Copy link
@igorpecovnik

igorpecovnik Sep 21, 2020

Author Member

all 5.8 kernels are patched to 5.8.10

They are patched now.

we had a back-and-forth here where this evaluation won't work for kernels that are below 5.8.10 before patching due to the timing.

But the problem is with K5.4 ... quick option is to just leave it for 5.8.y and up?

process_patch_file "${SRC}/patch/misc/bootsplash-5.8.10-0001-Revert-vgacon-remove-software-scrollback-support.patch" "applying"
process_patch_file "${SRC}/patch/misc/bootsplash-5.8.10-0002-Revert-fbcon-remove-now-unusued-softback_lines-curso.patch" "applying"
process_patch_file "${SRC}/patch/misc/bootsplash-5.8.10-0003-Revert-fbcon-remove-soft-scrollback-code.patch" "applying"
fi

process_patch_file "${SRC}/patch/misc/0001-bootsplash.patch" "applying"
process_patch_file "${SRC}/patch/misc/0002-bootsplash.patch" "applying"
process_patch_file "${SRC}/patch/misc/0003-bootsplash.patch" "applying"
process_patch_file "${SRC}/patch/misc/0004-bootsplash.patch" "applying"
Expand Down

0 comments on commit 33d9a4c

Please sign in to comment.