add patch to update extlinux.conf file on arm if it exists

This commit is contained in:
Dennis Gilmore 2013-06-07 14:54:11 -05:00
parent efdb493d76
commit 223896f6d9
2 changed files with 29 additions and 1 deletions

View File

@ -0,0 +1,24 @@
From 661b4c80512dc41353b0f3639c512d719cbf9d86 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Thu, 6 Jun 2013 04:19:38 -0500
Subject: [PATCH] update extlinux.conf on arm arches if it exists
---
new-kernel-pkg | 1 +
1 file changed, 1 insertion(+)
diff --git a/new-kernel-pkg b/new-kernel-pkg
index f248e7e..3206155 100755
--- a/new-kernel-pkg
+++ b/new-kernel-pkg
@@ -82,6 +82,7 @@ elif [ $ARCH = 's390' -o $ARCH = 's390x' ]; then
elif [[ ${ARCH} =~ armv[5|7].*l ]] ; then
liloConfig=""
bootPrefix=/boot
+ extlinuxConfig=$(readlink -f /etc/extlinux.conf 2>/dev/null)
ubootDir=${UBOOT_DIR:-"/boot"}
ubootScript=$ubootDir/${UBOOT_SCR:-"boot.scr"}
ubootKList=${UBOOT_KLIST:-"klist.txt"}
--
1.8.2.1

View File

@ -1,6 +1,6 @@
Name: grubby Name: grubby
Version: 8.26 Version: 8.26
Release: 1%{?dist} Release: 2%{?dist}
Summary: Command line tool for updating bootloader configs Summary: Command line tool for updating bootloader configs
Group: System Environment/Base Group: System Environment/Base
License: GPLv2+ License: GPLv2+
@ -9,6 +9,7 @@ URL: http://git.fedorahosted.org/git/grubby.git
# git clone git://git.fedorahosted.org/git/grubby.git # git clone git://git.fedorahosted.org/git/grubby.git
# git archive --format=tar --prefix=grubby-%{version}/ HEAD |bzip2 > grubby-%{version}.tar.bz2 # git archive --format=tar --prefix=grubby-%{version}/ HEAD |bzip2 > grubby-%{version}.tar.bz2
Source0: %{name}-%{version}.tar.bz2 Source0: %{name}-%{version}.tar.bz2
Patch0: 0001-update-extlinux.conf-on-arm-arches-if-it-exists.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pkgconfig glib2-devel popt-devel BuildRequires: pkgconfig glib2-devel popt-devel
BuildRequires: libblkid-devel git BuildRequires: libblkid-devel git
@ -71,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
%endif %endif
%changelog %changelog
* Fri Jun 07 2013 Dennis Gilmore <dennis@ausil.us> - 8.26-2
- add patch to update extlinux.conf file on arm if it exists
* Fri May 10 2013 Peter Jones <pjones@redhat.com> - 8.26-1 * Fri May 10 2013 Peter Jones <pjones@redhat.com> - 8.26-1
- Conditionally call arm-boot-config's boot.scr generator if available - Conditionally call arm-boot-config's boot.scr generator if available
Resolves: rhbz#952428 Resolves: rhbz#952428