From 43a488b92036b2e3a0e7e1664845ba73ee1ef9a3 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Tue, 10 Oct 2023 18:43:25 +0000 Subject: [PATCH] 20-grub.install: Copy device-tree directory recursively 8800efcb0bea replaced '-a' with '--preserve=timestamps' to avoid preserving ownership information on non vfat file systems. This breaks copying of the 'dtb' directory on aarch64 systems since '-a' implies '-r'. Add '-r' to the single place where 'dtb/' is copied to /boot. Resolves: #2243060 Fixes: 8800efcb0bea ("Do not preserve ownership or xattrs on copied files") Signed-off-by: Janne Grunau Signed-off-by: Nicolas Frayer --- 20-grub.install | 2 +- grub2.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/20-grub.install b/20-grub.install index 5ef2132..afc706d 100755 --- a/20-grub.install +++ b/20-grub.install @@ -69,7 +69,7 @@ case "$COMMAND" in "$KERNEL_DIR"/dtb do [[ -e "$i" ]] || continue - cp --remove-destination --preserve=timestamps -T "$i" "/boot/${i##*/}-${KERNEL_VERSION}" + cp --remove-destination --preserve=timestamps -rT "$i" "/boot/${i##*/}-${KERNEL_VERSION}" command -v restorecon &>/dev/null && \ restorecon -R "/boot/${i##*/}-${KERNEL_VERSION}" done diff --git a/grub2.spec b/grub2.spec index a99ce0e..f744a47 100644 --- a/grub2.spec +++ b/grub2.spec @@ -17,7 +17,7 @@ Name: grub2 Epoch: 1 Version: 2.06 -Release: 103%{?dist} +Release: 104%{?dist} Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -548,6 +548,10 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg %endif %changelog +* Wed Oct 11 2023 Janne Grunau - 2.06-104 +- 20-grub.install: Copy device-tree directory recursively +- Resolves: #2243060 + * Fri Sep 29 2023 Zbigniew Jedrzejewski-Szmek - 1:2.06-103 - Rename installed kernel to match name used in boot entry - Resolves: #2239008