diff --git a/SOURCES/1000-Update-extlinux.conf-with-sed-instead-of-backporting.patch b/SOURCES/1000-Update-extlinux.conf-with-sed-instead-of-backporting.patch new file mode 100644 index 0000000..89e31c1 --- /dev/null +++ b/SOURCES/1000-Update-extlinux.conf-with-sed-instead-of-backporting.patch @@ -0,0 +1,29 @@ +From 89e1bba74b80152664bd2ec4d8e45df88051f3bf Mon Sep 17 00:00:00 2001 +From: Pablo Greco +Date: Wed, 21 Mar 2018 12:21:24 +0000 +Subject: [PATCH] Update extlinux.conf with sed instead of backporting upstream + patches + +--- + new-kernel-pkg | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/new-kernel-pkg b/new-kernel-pkg +index 847e959..6b8bf8f 100755 +--- a/new-kernel-pkg ++++ b/new-kernel-pkg +@@ -308,6 +308,11 @@ install() { + + rungrubby ${ARGS} $makedefault + rungrubby --debug ${ARGS} --set-index=1 ++ sed -i \ ++ -e '/fdtdir/d' \ ++ -e '/ kernel/{h;s/kernel/fdtdir/g;s/vmlinuz/dtb/g;x}' \ ++ -e '/ append/{p;x}' \ ++ $extlinuxConfig + else + [ -n "$verbose" ] && echo "$extlinuxConfig does not exist, not running grubby for extlinux" + fi +-- +1.8.3.1 + diff --git a/SPECS/grubby.spec b/SPECS/grubby.spec index 6690aa5..1ac330e 100644 --- a/SPECS/grubby.spec +++ b/SPECS/grubby.spec @@ -84,6 +84,9 @@ Patch0074: 0074-Add-s390-s390x-set-default-index-test-1285601.patch Patch0075: 0075-Fix-setDefaultImage-for-s390-s390x-1285601.patch Patch0076: 0076-grubby-Make-sure-configure-BOOTLOADER-variables-are-.patch +##only for arm +Patch1000: 1000-Update-extlinux.conf-with-sed-instead-of-backporting.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig glib2-devel popt-devel BuildRequires: libblkid-devel git @@ -97,6 +100,7 @@ Requires: s390utils-base %endif %ifarch %{arm} Requires: uboot-tools +Requires: extlinux-bootloader %endif Requires: system-release @@ -160,6 +164,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Oct 30 2018 pablo@fliagreco.com.ar - 8.28-25 +- Fix fdtdir on extlinux.conf +- Add extlinux-bootloader require on armhfp + * Tue Aug 14 2018 Peter Jones - 8.28-25 - Ensure /etc/sysconfig/kernel has a stable mode, now that rpm handles ghost files differently.