[grubby/f19] add patch to update extlinux.conf file on arm if it exists
Dennis Gilmore
ausil at fedoraproject.org
Fri Jun 7 19:57:39 UTC 2013
commit f1569c96246011c6f75616d53a99815276217576
Author: Dennis Gilmore <dennis at ausil.us>
Date: Fri Jun 7 14:54:11 2013 -0500
add patch to update extlinux.conf file on arm if it exists
...-extlinux.conf-on-arm-arches-if-it-exists.patch | 24 ++++++++++++++++++++
grubby.spec | 6 ++++-
2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/0001-update-extlinux.conf-on-arm-arches-if-it-exists.patch b/0001-update-extlinux.conf-on-arm-arches-if-it-exists.patch
new file mode 100644
index 0000000..f090457
--- /dev/null
+++ b/0001-update-extlinux.conf-on-arm-arches-if-it-exists.patch
@@ -0,0 +1,24 @@
+From 661b4c80512dc41353b0f3639c512d719cbf9d86 Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis at 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
+
diff --git a/grubby.spec b/grubby.spec
index 8cfd50c..56ee76b 100644
--- a/grubby.spec
+++ b/grubby.spec
@@ -1,6 +1,6 @@
Name: grubby
Version: 8.26
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Command line tool for updating bootloader configs
Group: System Environment/Base
License: GPLv2+
@@ -9,6 +9,7 @@ URL: http://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
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)
BuildRequires: pkgconfig glib2-devel popt-devel
BuildRequires: libblkid-devel git
@@ -71,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Fri Jun 07 2013 Dennis Gilmore <dennis at ausil.us> - 8.26-2
+- add patch to update extlinux.conf file on arm if it exists
+
* Fri May 10 2013 Peter Jones <pjones at redhat.com> - 8.26-1
- Conditionally call arm-boot-config's boot.scr generator if available
Resolves: rhbz#952428
More information about the scm-commits
mailing list