From 4c29d22f0b77aa6dbb81d05db701ecc5baf7dd6f Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 12 Nov 2021 20:41:40 +0100 Subject: [PATCH] linux5.15: revert CONFIG_SYSFB_SIMPLEFB=y. This causes issues on all kinds of systems (with Intel, AMD, Nvidia graphics), and sometimes can be remedied by adding graphics drivers into the initramfs. But disabling is easier for now and this setting can be revisited at a later time. Closes #34035. --- srcpkgs/linux5.15/files/arm64-dotconfig | 4 ++-- srcpkgs/linux5.15/files/i386-dotconfig | 4 ++-- srcpkgs/linux5.15/files/x86_64-dotconfig | 4 ++-- srcpkgs/linux5.15/template | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/linux5.15/files/arm64-dotconfig b/srcpkgs/linux5.15/files/arm64-dotconfig index e75c7ade762..2de7a57b249 100644 --- a/srcpkgs/linux5.15/files/arm64-dotconfig +++ b/srcpkgs/linux5.15/files/arm64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.15.0 Kernel Configuration +# Linux/arm64 5.15.2 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203" CONFIG_CC_IS_GCC=y @@ -2381,7 +2381,7 @@ CONFIG_INTEL_STRATIX10_RSU=m CONFIG_QCOM_SCM=y # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set CONFIG_SYSFB=y -CONFIG_SYSFB_SIMPLEFB=y +# CONFIG_SYSFB_SIMPLEFB is not set CONFIG_TURRIS_MOX_RWTM=m CONFIG_ARM_FFA_TRANSPORT=m CONFIG_ARM_FFA_SMCCC=y diff --git a/srcpkgs/linux5.15/files/i386-dotconfig b/srcpkgs/linux5.15/files/i386-dotconfig index 7128001d7d1..fd370c34915 100644 --- a/srcpkgs/linux5.15/files/i386-dotconfig +++ b/srcpkgs/linux5.15/files/i386-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 5.15.0 Kernel Configuration +# Linux/i386 5.15.2 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203" CONFIG_CC_IS_GCC=y @@ -2120,7 +2120,7 @@ CONFIG_ISCSI_IBFT=m CONFIG_FW_CFG_SYSFS=m CONFIG_FW_CFG_SYSFS_CMDLINE=y CONFIG_SYSFB=y -CONFIG_SYSFB_SIMPLEFB=y +# CONFIG_SYSFB_SIMPLEFB is not set # CONFIG_GOOGLE_FIRMWARE is not set # diff --git a/srcpkgs/linux5.15/files/x86_64-dotconfig b/srcpkgs/linux5.15/files/x86_64-dotconfig index 3f0a39a8778..2f828640fa4 100644 --- a/srcpkgs/linux5.15/files/x86_64-dotconfig +++ b/srcpkgs/linux5.15/files/x86_64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 5.15.0 Kernel Configuration +# Linux/x86_64 5.15.2 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203" CONFIG_CC_IS_GCC=y @@ -2185,7 +2185,7 @@ CONFIG_ISCSI_IBFT=m CONFIG_FW_CFG_SYSFS=m # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_SYSFB=y -CONFIG_SYSFB_SIMPLEFB=y +# CONFIG_SYSFB_SIMPLEFB is not set # CONFIG_GOOGLE_FIRMWARE is not set # diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template index 056b001722f..e877db05539 100644 --- a/srcpkgs/linux5.15/template +++ b/srcpkgs/linux5.15/template @@ -1,7 +1,7 @@ # Template file for 'linux5.15' pkgname=linux5.15 version=5.15.2 -revision=1 +revision=2 wrksrc="linux-${version%.*}" short_desc="Linux kernel and modules (${version%.*} series)" maintainer="Leah Neukirchen "