diff options
author | Eggz | 2024-04-13 19:30:08 +0200 |
---|---|---|
committer | Eggz | 2024-04-13 19:30:08 +0200 |
commit | 35cabdbfe185c513d7580c6071873172fad4c505 (patch) | |
tree | 4d14796530841417b01656ce59cb2459def0bd45 | |
parent | d9b82b74c88dec7178760f1c1d246b34b75501ec (diff) | |
download | aur-35cabdbfe185c513d7580c6071873172fad4c505.tar.gz |
EFI is back + drop ramdisk preset file
-rw-r--r-- | .SRCINFO | 7 | ||||
-rw-r--r-- | PKGBUILD | 18 | ||||
-rw-r--r-- | config.x86_64 | 59 | ||||
-rw-r--r-- | linux-amd-znver3.preset | 16 |
4 files changed, 60 insertions, 40 deletions
@@ -1,6 +1,6 @@ pkgbase = linux-amd-znver3 pkgver = 6.8.v.6 - pkgrel = 1 + pkgrel = 2 url = https://www.kernel.org/ arch = x86_64 license = GPL2 @@ -16,11 +16,9 @@ pkgbase = linux-amd-znver3 options = !strip source = git+https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git#tag=v6.8.6 source = config.x86_64 - source = linux-amd-znver3.preset source = https://raw.githubusercontent.com/graysky2/kernel_compiler_patch/20240221.2/more-uarches-for-kernel-6.8-rc4+.patch sha256sums = SKIP - sha256sums = 5d204cbbccf50c1ef42d99fe93648513e3b20439c9422de2e65189c4bc525c47 - sha256sums = 26828ab61a69fca7ecdbba4179311f7cc3c59e1f8c070bcc626c68065187222b + sha256sums = 3d99340351bd5c0e08653dfee566db8bf2c5fcd0650f4605f89e80888aa9ff46 sha256sums = d69232afd0dd6982ae941cf2d1f577f4be2011e3bb847d1db37952acf416b5d3 pkgname = linux-amd-znver3 @@ -30,7 +28,6 @@ pkgname = linux-amd-znver3 depends = kmod depends = lzop optdepends = crda: to set the correct wireless channels of your country - backup = etc/mkinitcpio.d/linux-amd-znver3.preset pkgname = linux-amd-znver3-headers pkgdesc = Header files and scripts for building modules for the linux-amd-znver3 kernel @@ -6,7 +6,7 @@ gitver=v6.8.6 patchver=20240221.2 patchname=more-uarches-for-kernel-6.8-rc4+.patch pkgver=6.8.v.6 -pkgrel=1 +pkgrel=2 arch=('x86_64') url="https://www.kernel.org/" license=('GPL2') @@ -16,16 +16,12 @@ options=('!strip') source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git#tag=$gitver" # the main kernel config files 'config.x86_64' - # standard config files for mkinitcpio ramdisk - "${pkgbase}.preset" # patch from our graysky archlinux colleague "https://raw.githubusercontent.com/graysky2/kernel_compiler_patch/$patchver/$patchname" ) sha256sums=('SKIP' #config.x86_64 - '5d204cbbccf50c1ef42d99fe93648513e3b20439c9422de2e65189c4bc525c47' - #.preset file - '26828ab61a69fca7ecdbba4179311f7cc3c59e1f8c070bcc626c68065187222b' + '3d99340351bd5c0e08653dfee566db8bf2c5fcd0650f4605f89e80888aa9ff46' #grayskypatch 'd69232afd0dd6982ae941cf2d1f577f4be2011e3bb847d1db37952acf416b5d3' ) @@ -78,7 +74,6 @@ _package() { pkgdesc="Linux kernel aimed at the znver3 AMD Ryzen CPU based hardware" depends=('coreutils' 'linux-firmware' 'kmod' 'lzop') optdepends=('crda: to set the correct wireless channels of your country') - backup=("etc/mkinitcpio.d/${pkgbase}.preset") cd "${_srcname}" @@ -92,15 +87,6 @@ _package() { mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot} make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}" modules_install - # install mkinitcpio preset file for kernel - install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" - sed \ - -e "1s|'linux.*'|'${pkgbase}'|" \ - -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgbase}\"|" \ - -e "s|default_image=.*|default_image=\"/boot/initramfs-${pkgbase}.img\"|" \ - -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgbase}-fallback.img\"|" \ - -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" - # remove build link rm -f "${pkgdir}"/lib/modules/${_kernver}/build # remove the firmware diff --git a/config.x86_64 b/config.x86_64 index cdeeeda041f8..3822d734e3e5 100644 --- a/config.x86_64 +++ b/config.x86_64 @@ -334,6 +334,7 @@ CONFIG_AUDIT_ARCH=y CONFIG_X86_64_SMP=y CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_FIX_EARLYCON_MEM=y +CONFIG_DYNAMIC_PHYSICAL_MASK=y CONFIG_PGTABLE_LEVELS=4 CONFIG_CC_HAS_SANE_STACKPROTECTOR=y @@ -481,6 +482,8 @@ CONFIG_X86_CPUID=m # CONFIG_X86_5LEVEL is not set CONFIG_X86_DIRECT_GBPAGES=y CONFIG_X86_CPA_STATISTICS=y +CONFIG_X86_MEM_ENCRYPT=y +CONFIG_AMD_MEM_ENCRYPT=y CONFIG_NUMA=y # CONFIG_AMD_NUMA is not set CONFIG_X86_64_ACPI_NUMA=y @@ -506,7 +509,12 @@ CONFIG_CC_HAS_IBT=y # CONFIG_X86_KERNEL_IBT is not set CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y # CONFIG_X86_USER_SHADOW_STACK is not set -# CONFIG_EFI is not set +CONFIG_EFI=y +CONFIG_EFI_STUB=y +# CONFIG_EFI_HANDOVER_PROTOCOL is not set +CONFIG_EFI_MIXED=y +# CONFIG_EFI_FAKE_MEMMAP is not set +CONFIG_EFI_RUNTIME_MAP=y # CONFIG_HZ_100 is not set # CONFIG_HZ_250 is not set CONFIG_HZ_300=y @@ -632,6 +640,7 @@ CONFIG_ACPI_HOTPLUG_IOAPIC=y CONFIG_ACPI_SBS=m CONFIG_ACPI_HED=y CONFIG_ACPI_CUSTOM_METHOD=m +CONFIG_ACPI_BGRT=y # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set CONFIG_ACPI_NFIT=m # CONFIG_NFIT_SECURITY_DEBUG is not set @@ -654,6 +663,7 @@ CONFIG_ACPI_PCC=y # CONFIG_ACPI_FFH is not set CONFIG_PMIC_OPREGION=y CONFIG_XPOWER_PMIC_OPREGION=y +CONFIG_ACPI_PRMT=y CONFIG_X86_PM_TIMER=y # @@ -900,8 +910,10 @@ CONFIG_STRICT_KERNEL_RWX=y CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y CONFIG_STRICT_MODULE_RWX=y CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y +CONFIG_ARCH_USE_MEMREMAP_PROT=y # CONFIG_LOCK_EVENT_COUNTS is not set CONFIG_ARCH_HAS_MEM_ENCRYPT=y +CONFIG_ARCH_HAS_CC_PLATFORM=y CONFIG_HAVE_STATIC_CALL=y CONFIG_HAVE_STATIC_CALL_INLINE=y CONFIG_HAVE_PREEMPT_DYNAMIC=y @@ -2280,6 +2292,31 @@ CONFIG_SYSFB=y # CONFIG_SYSFB_SIMPLEFB is not set CONFIG_FW_CS_DSP=m # CONFIG_GOOGLE_FIRMWARE is not set + +# +# EFI (Extensible Firmware Interface) Support +# +CONFIG_EFI_ESRT=y +CONFIG_EFI_VARS_PSTORE=y +# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set +CONFIG_EFI_DXE_MEM_ATTRIBUTES=y +CONFIG_EFI_RUNTIME_WRAPPERS=y +# CONFIG_EFI_BOOTLOADER_CONTROL is not set +CONFIG_EFI_CAPSULE_LOADER=m +# CONFIG_EFI_TEST is not set +CONFIG_EFI_DEV_PATH_PARSER=y +CONFIG_APPLE_PROPERTIES=y +# CONFIG_RESET_ATTACK_MITIGATION is not set +# CONFIG_EFI_RCI2_TABLE is not set +# CONFIG_EFI_DISABLE_PCI_DMA is not set +CONFIG_EFI_EARLYCON=y +CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y +# CONFIG_EFI_DISABLE_RUNTIME is not set +# CONFIG_EFI_COCO_SECRET is not set +CONFIG_UNACCEPTED_MEMORY=y +CONFIG_EFI_EMBEDDED_FIRMWARE=y +# end of EFI (Extensible Firmware Interface) Support + CONFIG_UEFI_CPER=y CONFIG_UEFI_CPER_X86=y @@ -3783,6 +3820,7 @@ CONFIG_INPUT_KEYBOARD=y # CONFIG_KEYBOARD_ADC is not set # CONFIG_KEYBOARD_ADP5588 is not set # CONFIG_KEYBOARD_ADP5589 is not set +# CONFIG_KEYBOARD_APPLESPI is not set CONFIG_KEYBOARD_ATKBD=m # CONFIG_KEYBOARD_QT1050 is not set # CONFIG_KEYBOARD_QT1070 is not set @@ -6240,7 +6278,7 @@ CONFIG_DRM_VBOXVIDEO=m # CONFIG_DRM_GUD is not set # CONFIG_DRM_SSD130X is not set # CONFIG_DRM_HYPERV is not set -CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m +CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y CONFIG_DRM_PRIVACY_SCREEN=y # @@ -6256,6 +6294,7 @@ CONFIG_FB=y CONFIG_FB_VGA16=m CONFIG_FB_UVESA=m CONFIG_FB_VESA=y +CONFIG_FB_EFI=y # CONFIG_FB_N411 is not set # CONFIG_FB_HGA is not set # CONFIG_FB_OPENCORES is not set @@ -6516,8 +6555,11 @@ CONFIG_SND_HDA_RECONFIG=y CONFIG_SND_HDA_INPUT_BEEP=y CONFIG_SND_HDA_INPUT_BEEP_MODE=1 CONFIG_SND_HDA_PATCH_LOADER=y +# CONFIG_SND_HDA_SCODEC_CS35L41_I2C is not set +# CONFIG_SND_HDA_SCODEC_CS35L41_SPI is not set # CONFIG_SND_HDA_SCODEC_CS35L56_I2C is not set # CONFIG_SND_HDA_SCODEC_CS35L56_SPI is not set +# CONFIG_SND_HDA_SCODEC_TAS2781_I2C is not set CONFIG_SND_HDA_CODEC_REALTEK=m CONFIG_SND_HDA_CODEC_ANALOG=m CONFIG_SND_HDA_CODEC_SIGMATEL=m @@ -7741,6 +7783,9 @@ CONFIG_VIRT_DRIVERS=y CONFIG_VMGENID=y CONFIG_VBOXGUEST=m # CONFIG_NITRO_ENCLAVES is not set +CONFIG_TSM_REPORTS=m +# CONFIG_EFI_SECRET is not set +CONFIG_SEV_GUEST=m CONFIG_VIRTIO_ANCHOR=y CONFIG_VIRTIO=m CONFIG_VIRTIO_PCI_LIB=m @@ -7803,6 +7848,7 @@ CONFIG_XEN_PRIVCMD=m CONFIG_XEN_ACPI_PROCESSOR=m CONFIG_XEN_MCE_LOG=y CONFIG_XEN_HAVE_PVMMU=y +CONFIG_XEN_EFI=y CONFIG_XEN_AUTO_XLATE=y CONFIG_XEN_ACPI=y CONFIG_XEN_SYMS=y @@ -7944,6 +7990,7 @@ CONFIG_VT6656=m # CONFIG_FB_SM750 is not set CONFIG_STAGING_MEDIA=y +# CONFIG_INTEL_ATOMISP is not set # CONFIG_DVB_AV7110 is not set # CONFIG_VIDEO_IPU3_IMGU is not set @@ -8059,6 +8106,7 @@ CONFIG_TOPSTAR_LAPTOP=m # CONFIG_MLX_PLATFORM is not set CONFIG_TOUCHSCREEN_DMI=y # CONFIG_INSPUR_PLATFORM_PROFILE is not set +# CONFIG_X86_ANDROID_TABLETS is not set # CONFIG_INTEL_IPS is not set # CONFIG_INTEL_SCU_PCI is not set # CONFIG_INTEL_SCU_PLATFORM is not set @@ -9113,6 +9161,7 @@ CONFIG_HUGETLB_PAGE=y CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y CONFIG_ARCH_HAS_GIGANTIC_PAGE=y CONFIG_CONFIGFS_FS=y +CONFIG_EFIVAR_FS=y # end of Pseudo filesystems CONFIG_MISC_FILESYSTEMS=y @@ -9357,6 +9406,7 @@ CONFIG_SECURITY_YAMA=y CONFIG_INTEGRITY=y # CONFIG_INTEGRITY_SIGNATURE is not set # CONFIG_IMA is not set +# CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set # CONFIG_EVM is not set CONFIG_DEFAULT_SECURITY_DAC=y CONFIG_LSM="yama,loadpin,safesetid,integrity" @@ -9783,8 +9833,10 @@ CONFIG_NEED_SG_DMA_FLAGS=y CONFIG_NEED_SG_DMA_LENGTH=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_ARCH_DMA_ADDR_T_64BIT=y +CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED=y CONFIG_SWIOTLB=y # CONFIG_SWIOTLB_DYNAMIC is not set +CONFIG_DMA_COHERENT_POOL=y # CONFIG_DMA_API_DEBUG is not set # CONFIG_DMA_MAP_BENCHMARK is not set CONFIG_SGL_ALLOC=y @@ -9801,7 +9853,7 @@ CONFIG_IRQ_POLL=y CONFIG_MPILIB=y CONFIG_DIMLIB=y CONFIG_OID_REGISTRY=y -CONFIG_UCS2_STRING=m +CONFIG_UCS2_STRING=y CONFIG_HAVE_GENERIC_VDSO=y CONFIG_GENERIC_GETTIMEOFDAY=y CONFIG_GENERIC_VDSO_TIME_NS=y @@ -10142,6 +10194,7 @@ CONFIG_IO_STRICT_DEVMEM=y CONFIG_EARLY_PRINTK=y # CONFIG_EARLY_PRINTK_DBGP is not set # CONFIG_EARLY_PRINTK_USB_XDBC is not set +# CONFIG_EFI_PGT_DUMP is not set # CONFIG_DEBUG_TLBFLUSH is not set CONFIG_HAVE_MMIOTRACE_SUPPORT=y # CONFIG_X86_DECODER_SELFTEST is not set diff --git a/linux-amd-znver3.preset b/linux-amd-znver3.preset deleted file mode 100644 index 102d44c251a0..000000000000 --- a/linux-amd-znver3.preset +++ /dev/null @@ -1,16 +0,0 @@ -# mkinitcpio preset file for the 'linux-amd-znver3' package - -ALL_config="/etc/mkinitcpio.conf" -ALL_kver="/boot/vmlinuz-linux-amd-znver3" - -export COMPRESSION="lzop" - -PRESETS=('default' 'fallback') - -#default_config="/etc/mkinitcpio.conf" -default_image="/boot/initramfs-linux-amd-znver3.img" -#default_options="" - -#fallback_config="/etc/mkinitcpio.conf" -fallback_image="/boot/initramfs-linux-amd-znver3-fallback.img" -fallback_options="-S autodetect" |