From 75b118ab06799161000018d9b9616e639c33182f Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 24 Jan 2024 11:43:46 -0800 Subject: [PATCH] dracut: don't include amd-ucode README in ucode --- srcpkgs/dracut/patches/amd-ucode-readme.patch | 26 +++++++++++++++++++ srcpkgs/dracut/template | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/dracut/patches/amd-ucode-readme.patch diff --git a/srcpkgs/dracut/patches/amd-ucode-readme.patch b/srcpkgs/dracut/patches/amd-ucode-readme.patch new file mode 100644 index 00000000000..a2ea1288d23 --- /dev/null +++ b/srcpkgs/dracut/patches/amd-ucode-readme.patch @@ -0,0 +1,26 @@ +From c1a69b81f6ebd62a40054be2375cb77c040694aa Mon Sep 17 00:00:00 2001 +From: Antonio Alvarez Feijoo +Date: Mon, 30 Oct 2023 14:56:39 +0100 +Subject: [PATCH] fix(dracut.sh): skip README for AMD microcode generation + +This file was added in https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/amd-ucode/README?id=89ec6198f13d1007563ff87aae5de209e993be07 +and it should be skipped. + +Fixes #2541 +--- + dracut.sh | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/dracut.sh b/dracut.sh +index 3b292910f..bd730cbe9 100755 +--- a/dracut.sh ++++ b/dracut.sh +@@ -2154,6 +2154,8 @@ if [[ $early_microcode == yes ]]; then + done + for i in $_fwdir/$_fw/$_src; do + [[ -e $i ]] || continue ++ # skip README{.xz,.zst,...} ++ str_starts "$i" "$_fwdir/$_fw/README" && continue + # skip gpg files + str_ends "$i" ".asc" && continue + cat "$i" >> "$_dest_dir/${ucode_dest[$idx]}" diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template index 5c98d2231cc..66231d6ff4d 100644 --- a/srcpkgs/dracut/template +++ b/srcpkgs/dracut/template @@ -1,7 +1,7 @@ # Template file for 'dracut' pkgname=dracut version=059 -revision=5 +revision=6 build_style=configure configure_args="--prefix=/usr --sysconfdir=/etc" conf_files="/etc/dracut.conf"