ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 05:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert kernel modules changes to support the Coreboot framebuffer

Browse source 
These changes broke the creation of the 'linux-modules-database' for all kernel
series besides 5.15, 5.4, and 5.10, like this:

------
gnu/build/linux-modules.scm:257:5: kernel module not found "framebuffer_coreboot" "/gnu/store/yff45fr6q93mw44zdql9ffr95zcvwxcn-linux-libre-4.9.299/lib/modules"
------

We should support the coreboot framebuffer, but we need to test that change more
completely before deploying it.

This effectively reverts the following commits:
1dfe8c3721 "gnu: linux-libre: Build simplefb into all x86{,_64} kernels."
bc09e7ab56 "gnu: linux-libre: Support the Coreboot framebuffer."

Fixes <https://issues.guix.gnu.org/52667> "System reconfiguration fails to build
linux-modules.drv".
This commit is contained in:
Leo Famulari 2022-02-03 11:57:49 -05:00
parent 0f97729034
commit fd6cfbc05a
No known key found for this signature in database
GPG key ID: 2646FA30BACA7F08
13 changed files with 27 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gnu/packages/aux-files/linux-libre/4.14-i686.conf
View file

@ -938,7 +938,7 @@ CONFIG_RAPIDIO_CPS_XX=m
CONFIG_RAPIDIO_TSI568=m CONFIG_RAPIDIO_TSI568=m
CONFIG_RAPIDIO_CPS_GEN2=m CONFIG_RAPIDIO_CPS_GEN2=m
CONFIG_RAPIDIO_RXS_GEN3=m CONFIG_RAPIDIO_RXS_GEN3=m
CONFIG_X86_SYSFB=y # CONFIG_X86_SYSFB is not set
# #
# Executable file formats / Emulations # Executable file formats / Emulations
@ -8495,13 +8495,7 @@ CONFIG_ISCSI_IBFT_FIND=y
CONFIG_ISCSI_IBFT=m CONFIG_ISCSI_IBFT=m
CONFIG_FW_CFG_SYSFS=m CONFIG_FW_CFG_SYSFS=m
# CONFIG_FW_CFG_SYSFS_CMDLINE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set
CONFIG_GOOGLE_FIRMWARE=y # CONFIG_GOOGLE_FIRMWARE is not set
# CONFIG_GOOGLE_SMI is not set
CONFIG_GOOGLE_COREBOOT_TABLE=y
# CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set
CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m
# CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set
# CONFIG_GOOGLE_VPD is not set
# #
# EFI (Extensible Firmware Interface) Support # EFI (Extensible Firmware Interface) Support

10
gnu/packages/aux-files/linux-libre/4.14-x86_64.conf
View file

@ -928,7 +928,7 @@ CONFIG_RAPIDIO_CPS_XX=m
CONFIG_RAPIDIO_TSI568=m CONFIG_RAPIDIO_TSI568=m
CONFIG_RAPIDIO_CPS_GEN2=m CONFIG_RAPIDIO_CPS_GEN2=m
CONFIG_RAPIDIO_RXS_GEN3=m CONFIG_RAPIDIO_RXS_GEN3=m
CONFIG_X86_SYSFB=y # CONFIG_X86_SYSFB is not set
# #
# Executable file formats / Emulations # Executable file formats / Emulations
@ -8334,13 +8334,7 @@ CONFIG_ISCSI_IBFT_FIND=y
CONFIG_ISCSI_IBFT=m CONFIG_ISCSI_IBFT=m
CONFIG_FW_CFG_SYSFS=m CONFIG_FW_CFG_SYSFS=m
# CONFIG_FW_CFG_SYSFS_CMDLINE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set
CONFIG_GOOGLE_FIRMWARE=y # CONFIG_GOOGLE_FIRMWARE is not set
# CONFIG_GOOGLE_SMI is not set
CONFIG_GOOGLE_COREBOOT_TABLE=y
# CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set
CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m
# CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set
# CONFIG_GOOGLE_VPD is not set
# #
# EFI (Extensible Firmware Interface) Support # EFI (Extensible Firmware Interface) Support

10
gnu/packages/aux-files/linux-libre/4.19-i686.conf
View file

@ -713,7 +713,7 @@ CONFIG_RAPIDIO_CPS_XX=m
CONFIG_RAPIDIO_TSI568=m CONFIG_RAPIDIO_TSI568=m
CONFIG_RAPIDIO_CPS_GEN2=m CONFIG_RAPIDIO_CPS_GEN2=m
CONFIG_RAPIDIO_RXS_GEN3=m CONFIG_RAPIDIO_RXS_GEN3=m
CONFIG_X86_SYSFB=y # CONFIG_X86_SYSFB is not set
# #
# Binary Emulations # Binary Emulations
@ -737,13 +737,7 @@ CONFIG_ISCSI_IBFT_FIND=y
CONFIG_ISCSI_IBFT=m CONFIG_ISCSI_IBFT=m
CONFIG_FW_CFG_SYSFS=m CONFIG_FW_CFG_SYSFS=m
# CONFIG_FW_CFG_SYSFS_CMDLINE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set
CONFIG_GOOGLE_FIRMWARE=y # CONFIG_GOOGLE_FIRMWARE is not set
# CONFIG_GOOGLE_SMI is not set
CONFIG_GOOGLE_COREBOOT_TABLE=y
# CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set
CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m
# CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set
# CONFIG_GOOGLE_VPD is not set
# #
# EFI (Extensible Firmware Interface) Support # EFI (Extensible Firmware Interface) Support

10
gnu/packages/aux-files/linux-libre/4.19-x86_64.conf
View file

@ -684,7 +684,7 @@ CONFIG_RAPIDIO_CPS_XX=m
CONFIG_RAPIDIO_TSI568=m CONFIG_RAPIDIO_TSI568=m
CONFIG_RAPIDIO_CPS_GEN2=m CONFIG_RAPIDIO_CPS_GEN2=m
CONFIG_RAPIDIO_RXS_GEN3=m CONFIG_RAPIDIO_RXS_GEN3=m
CONFIG_X86_SYSFB=y # CONFIG_X86_SYSFB is not set
# #
# Binary Emulations # Binary Emulations
@ -714,13 +714,7 @@ CONFIG_ISCSI_IBFT_FIND=y
CONFIG_ISCSI_IBFT=m CONFIG_ISCSI_IBFT=m
CONFIG_FW_CFG_SYSFS=m CONFIG_FW_CFG_SYSFS=m
# CONFIG_FW_CFG_SYSFS_CMDLINE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set
CONFIG_GOOGLE_FIRMWARE=y # CONFIG_GOOGLE_FIRMWARE is not set
# CONFIG_GOOGLE_SMI is not set
CONFIG_GOOGLE_COREBOOT_TABLE=y
# CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set
CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m
# CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set
# CONFIG_GOOGLE_VPD is not set
# #
# EFI (Extensible Firmware Interface) Support # EFI (Extensible Firmware Interface) Support

10
gnu/packages/aux-files/linux-libre/4.4-i686.conf
View file

@ -825,7 +825,7 @@ CONFIG_RAPIDIO_TSI57X=m
CONFIG_RAPIDIO_CPS_XX=m CONFIG_RAPIDIO_CPS_XX=m
CONFIG_RAPIDIO_TSI568=m CONFIG_RAPIDIO_TSI568=m
CONFIG_RAPIDIO_CPS_GEN2=m CONFIG_RAPIDIO_CPS_GEN2=m
CONFIG_X86_SYSFB=y # CONFIG_X86_SYSFB is not set
# #
# Executable file formats / Emulations # Executable file formats / Emulations
@ -7679,13 +7679,7 @@ CONFIG_DMI_SYSFS=m
CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
CONFIG_ISCSI_IBFT_FIND=y CONFIG_ISCSI_IBFT_FIND=y
CONFIG_ISCSI_IBFT=m CONFIG_ISCSI_IBFT=m
CONFIG_GOOGLE_FIRMWARE=y # CONFIG_GOOGLE_FIRMWARE is not set
# CONFIG_GOOGLE_SMI is not set
CONFIG_GOOGLE_COREBOOT_TABLE=y
# CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set
CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m
# CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set
# CONFIG_GOOGLE_VPD is not set
# #
# EFI (Extensible Firmware Interface) Support # EFI (Extensible Firmware Interface) Support

10
gnu/packages/aux-files/linux-libre/4.4-x86_64.conf
View file

@ -795,7 +795,7 @@ CONFIG_RAPIDIO_TSI57X=m
CONFIG_RAPIDIO_CPS_XX=m CONFIG_RAPIDIO_CPS_XX=m
CONFIG_RAPIDIO_TSI568=m CONFIG_RAPIDIO_TSI568=m
CONFIG_RAPIDIO_CPS_GEN2=m CONFIG_RAPIDIO_CPS_GEN2=m
CONFIG_X86_SYSFB=y # CONFIG_X86_SYSFB is not set
# #
# Executable file formats / Emulations # Executable file formats / Emulations
@ -7463,13 +7463,7 @@ CONFIG_DMI_SYSFS=m
CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
CONFIG_ISCSI_IBFT_FIND=y CONFIG_ISCSI_IBFT_FIND=y
CONFIG_ISCSI_IBFT=m CONFIG_ISCSI_IBFT=m
CONFIG_GOOGLE_FIRMWARE=y # CONFIG_GOOGLE_FIRMWARE is not set
# CONFIG_GOOGLE_SMI is not set
CONFIG_GOOGLE_COREBOOT_TABLE=y
# CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set
CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m
# CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set
# CONFIG_GOOGLE_VPD is not set
# #
# EFI (Extensible Firmware Interface) Support # EFI (Extensible Firmware Interface) Support

10
gnu/packages/aux-files/linux-libre/5.10-i686.conf
View file

@ -650,7 +650,7 @@ CONFIG_ALIX=y
CONFIG_NET5501=y CONFIG_NET5501=y
CONFIG_GEOS=y CONFIG_GEOS=y
CONFIG_AMD_NB=y CONFIG_AMD_NB=y
CONFIG_X86_SYSFB=y # CONFIG_X86_SYSFB is not set
# end of Bus options (PCI etc.) # end of Bus options (PCI etc.)
# #
@ -674,13 +674,7 @@ CONFIG_ISCSI_IBFT_FIND=y
CONFIG_ISCSI_IBFT=m CONFIG_ISCSI_IBFT=m
CONFIG_FW_CFG_SYSFS=m CONFIG_FW_CFG_SYSFS=m
# CONFIG_FW_CFG_SYSFS_CMDLINE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set
CONFIG_GOOGLE_FIRMWARE=y # CONFIG_GOOGLE_FIRMWARE is not set
# CONFIG_GOOGLE_SMI is not set
CONFIG_GOOGLE_COREBOOT_TABLE=y
# CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set
CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m
# CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set
# CONFIG_GOOGLE_VPD is not set
# #
# EFI (Extensible Firmware Interface) Support # EFI (Extensible Firmware Interface) Support

10
gnu/packages/aux-files/linux-libre/5.10-x86_64.conf
View file

@ -643,7 +643,7 @@ CONFIG_MMCONF_FAM10H=y
# CONFIG_ISA_BUS is not set # CONFIG_ISA_BUS is not set
CONFIG_ISA_DMA_API=y CONFIG_ISA_DMA_API=y
CONFIG_AMD_NB=y CONFIG_AMD_NB=y
CONFIG_X86_SYSFB=y # CONFIG_X86_SYSFB is not set
# end of Bus options (PCI etc.) # end of Bus options (PCI etc.)
# #
@ -670,13 +670,7 @@ CONFIG_ISCSI_IBFT_FIND=y
CONFIG_ISCSI_IBFT=m CONFIG_ISCSI_IBFT=m
CONFIG_FW_CFG_SYSFS=m CONFIG_FW_CFG_SYSFS=m
# CONFIG_FW_CFG_SYSFS_CMDLINE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set
CONFIG_GOOGLE_FIRMWARE=y # CONFIG_GOOGLE_FIRMWARE is not set
# CONFIG_GOOGLE_SMI is not set
CONFIG_GOOGLE_COREBOOT_TABLE=y
# CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set
CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m
# CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set
# CONFIG_GOOGLE_VPD is not set
# #
# EFI (Extensible Firmware Interface) Support # EFI (Extensible Firmware Interface) Support

12
gnu/packages/aux-files/linux-libre/5.15-i686.conf
View file

@ -2249,14 +2249,8 @@ CONFIG_ISCSI_IBFT=m
CONFIG_FW_CFG_SYSFS=m CONFIG_FW_CFG_SYSFS=m
# CONFIG_FW_CFG_SYSFS_CMDLINE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set
CONFIG_SYSFB=y CONFIG_SYSFB=y
CONFIG_SYSFB_SIMPLEFB=y # CONFIG_SYSFB_SIMPLEFB is not set
CONFIG_GOOGLE_FIRMWARE=y # CONFIG_GOOGLE_FIRMWARE is not set
# CONFIG_GOOGLE_SMI is not set
CONFIG_GOOGLE_COREBOOT_TABLE=m
# CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set
CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m
# CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set
# CONFIG_GOOGLE_VPD is not set
# #
# EFI (Extensible Firmware Interface) Support # EFI (Extensible Firmware Interface) Support
@ -6731,7 +6725,7 @@ CONFIG_FB_MB862XX=m
CONFIG_FB_MB862XX_PCI_GDC=y CONFIG_FB_MB862XX_PCI_GDC=y
CONFIG_FB_MB862XX_I2C=y CONFIG_FB_MB862XX_I2C=y
CONFIG_FB_HYPERV=m CONFIG_FB_HYPERV=m
CONFIG_FB_SIMPLE=y CONFIG_FB_SIMPLE=m
CONFIG_FB_SSD1307=m CONFIG_FB_SSD1307=m
CONFIG_FB_SM712=m CONFIG_FB_SM712=m
# end of Frame buffer Devices # end of Frame buffer Devices

12
gnu/packages/aux-files/linux-libre/5.15-x86_64.conf
View file

@ -2282,14 +2282,8 @@ CONFIG_ISCSI_IBFT=m
CONFIG_FW_CFG_SYSFS=m CONFIG_FW_CFG_SYSFS=m
# CONFIG_FW_CFG_SYSFS_CMDLINE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set
CONFIG_SYSFB=y CONFIG_SYSFB=y
CONFIG_SYSFB_SIMPLEFB=y # CONFIG_SYSFB_SIMPLEFB is not set
CONFIG_GOOGLE_FIRMWARE=y # CONFIG_GOOGLE_FIRMWARE is not set
# CONFIG_GOOGLE_SMI is not set
CONFIG_GOOGLE_COREBOOT_TABLE=m
# CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set
CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m
# CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set
# CONFIG_GOOGLE_VPD is not set
# #
# EFI (Extensible Firmware Interface) Support # EFI (Extensible Firmware Interface) Support
@ -6688,7 +6682,7 @@ CONFIG_FB_MB862XX=m
CONFIG_FB_MB862XX_PCI_GDC=y CONFIG_FB_MB862XX_PCI_GDC=y
CONFIG_FB_MB862XX_I2C=y CONFIG_FB_MB862XX_I2C=y
CONFIG_FB_HYPERV=m CONFIG_FB_HYPERV=m
CONFIG_FB_SIMPLE=y CONFIG_FB_SIMPLE=m
CONFIG_FB_SSD1307=m CONFIG_FB_SSD1307=m
CONFIG_FB_SM712=m CONFIG_FB_SM712=m
# end of Frame buffer Devices # end of Frame buffer Devices

10
gnu/packages/aux-files/linux-libre/5.4-i686.conf
View file

@ -648,7 +648,7 @@ CONFIG_ALIX=y
CONFIG_NET5501=y CONFIG_NET5501=y
CONFIG_GEOS=y CONFIG_GEOS=y
CONFIG_AMD_NB=y CONFIG_AMD_NB=y
CONFIG_X86_SYSFB=y # CONFIG_X86_SYSFB is not set
# end of Bus options (PCI etc.) # end of Bus options (PCI etc.)
# #
@ -672,13 +672,7 @@ CONFIG_ISCSI_IBFT_FIND=y
CONFIG_ISCSI_IBFT=m CONFIG_ISCSI_IBFT=m
CONFIG_FW_CFG_SYSFS=m CONFIG_FW_CFG_SYSFS=m
# CONFIG_FW_CFG_SYSFS_CMDLINE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set
CONFIG_GOOGLE_FIRMWARE=y # CONFIG_GOOGLE_FIRMWARE is not set
# CONFIG_GOOGLE_SMI is not set
CONFIG_GOOGLE_COREBOOT_TABLE=y
# CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set
CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m
# CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set
# CONFIG_GOOGLE_VPD is not set
# #
# EFI (Extensible Firmware Interface) Support # EFI (Extensible Firmware Interface) Support

10
gnu/packages/aux-files/linux-libre/5.4-x86_64.conf
View file

@ -632,7 +632,7 @@ CONFIG_MMCONF_FAM10H=y
# CONFIG_ISA_BUS is not set # CONFIG_ISA_BUS is not set
CONFIG_ISA_DMA_API=y CONFIG_ISA_DMA_API=y
CONFIG_AMD_NB=y CONFIG_AMD_NB=y
CONFIG_X86_SYSFB=y # CONFIG_X86_SYSFB is not set
# end of Bus options (PCI etc.) # end of Bus options (PCI etc.)
# #
@ -659,13 +659,7 @@ CONFIG_ISCSI_IBFT_FIND=y
CONFIG_ISCSI_IBFT=m CONFIG_ISCSI_IBFT=m
CONFIG_FW_CFG_SYSFS=m CONFIG_FW_CFG_SYSFS=m
# CONFIG_FW_CFG_SYSFS_CMDLINE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set
CONFIG_GOOGLE_FIRMWARE=y # CONFIG_GOOGLE_FIRMWARE is not set
# CONFIG_GOOGLE_SMI is not set
CONFIG_GOOGLE_COREBOOT_TABLE=y
# CONFIG_GOOGLE_MEMCONSOLE_X86_LEGACY is not set
CONFIG_GOOGLE_FRAMEBUFFER_COREBOOT=m
# CONFIG_GOOGLE_MEMCONSOLE_COREBOOT is not set
# CONFIG_GOOGLE_VPD is not set
# #
# EFI (Extensible Firmware Interface) Support # EFI (Extensible Firmware Interface) Support

3
gnu/system/linux-initrd.scm
View file

@ -352,8 +352,7 @@ (define virtio-modules
"dm-crypt" "xts" "serpent_generic" "wp512" ;for encrypted root partitions "dm-crypt" "xts" "serpent_generic" "wp512" ;for encrypted root partitions
"nls_iso8859-1" ;for `mkfs.fat`, et.al "nls_iso8859-1" ;for `mkfs.fat`, et.al
,@(if (string-match "^(x86_64|i[3-6]86)-" system) ,@(if (string-match "^(x86_64|i[3-6]86)-" system)
'("framebuffer_coreboot" ;for display during early (Core)boot '("pata_acpi" "pata_atiixp" ;for ATA controllers
"pata_acpi" "pata_atiixp" ;for ATA controllers
"isci") ;for SAS controllers like Intel C602 "isci") ;for SAS controllers like Intel C602
'()) '())