From e59efd2e653cf1e1cedf4537dbe72b577e0aa11e Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Thu, 22 Nov 2018 14:56:32 -0300 Subject: [PATCH] Avoid multiple fdtdir entries per kernel by deleting before adding --- extlinux-bootloader.spec | 5 ++++- extlinux.sh | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/extlinux-bootloader.spec b/extlinux-bootloader.spec index 98f8dc4..3cdfcda 100644 --- a/extlinux-bootloader.spec +++ b/extlinux-bootloader.spec @@ -1,6 +1,6 @@ Name: extlinux-bootloader Version: 1.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: The EXTLINUX bootloader framework, for booting the local system License: GPLv2+ @@ -38,6 +38,9 @@ install -p %{SOURCE1} %{buildroot}%{_sbindir}/extlinux %changelog +* Thu Nov 22 2018 Pablo Greco - 1.2-6 +* Avoid multiple fdtdir entries + * Fri Jul 13 2018 Fedora Release Engineering - 1.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/extlinux.sh b/extlinux.sh index c3dc3b7..c64bf36 100755 --- a/extlinux.sh +++ b/extlinux.sh @@ -26,6 +26,7 @@ insert_fdtdir() { # for every 'kernel' directive found, map it to an 'fdtdir' directive # referencing the dtb directory and add it after the 'append' directive sed -i \ + -e '/ fdtdir/d' \ -e '/ kernel/{h;s/kernel/fdtdir/g;s/vmlinuz/dtb/g;x}' \ -e '/ append/{p;x}' \ /boot/extlinux/extlinux.conf