diff --git a/.gitignore b/.gitignore index cab0846..304373a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/grubby-8.8.tar.bz2 +/grubby-8.9.tar.bz2 diff --git a/grubby-8.8-add-armv5tel.patch b/grubby-8.8-add-armv5tel.patch deleted file mode 100644 index 43c930c..0000000 --- a/grubby-8.8-add-armv5tel.patch +++ /dev/null @@ -1,48 +0,0 @@ -Return-Path: dmarlin@redhat.com -Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO - zmta01.collab.prod.int.phx2.redhat.com) (10.5.5.31) by - zmail14.collab.prod.int.phx2.redhat.com with LMTP; Fri, 2 Mar 2012 13:20:22 - -0500 (EST) -Received: from localhost (localhost.localdomain [127.0.0.1]) - by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 472DB114015; - Fri, 2 Mar 2012 13:20:22 -0500 (EST) -Received: from zmta01.collab.prod.int.phx2.redhat.com ([127.0.0.1]) - by localhost (zmta01.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024) - with ESMTP id 6bwpcty13jPD; Fri, 2 Mar 2012 13:20:22 -0500 (EST) -Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) - by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 335C6114003; - Fri, 2 Mar 2012 13:20:22 -0500 (EST) -Received: from fedora15-1.farm.hsv.redhat.com (fedora15-1.farm.hsv.redhat.com [10.15.4.181]) - by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q22IKLKB027218; - Fri, 2 Mar 2012 13:20:21 -0500 -From: "d.marlin" -To: pjones@redhat.com -Cc: "d.marlin" -Subject: [PATCH] Add support to new-kernel-pkg to recognize ARCH == armv5tel needed for Kirkwood based systems. -Date: Fri, 2 Mar 2012 12:19:29 -0600 -Message-Id: <1330712369-15567-1-git-send-email-dmarlin@redhat.com> -X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 - -From: "d.marlin" - -Signed-off-by: David A. Marlin ---- - new-kernel-pkg | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/new-kernel-pkg b/new-kernel-pkg -index 6b94d2f..d3778d1 100755 ---- a/new-kernel-pkg -+++ b/new-kernel-pkg -@@ -78,7 +78,7 @@ elif [ $ARCH = 's390' -o $ARCH = 's390x' ]; then - lilo=/sbin/zipl - runLilo="yes" - isx86="" --elif [ $ARCH = 'armv7l' -o $ARCH = 'armv7hl' ]; then -+elif [ $ARCH = 'armv7hl' -o $ARCH = 'armv7l' -o $ARCH = 'armv5tel' ]; then - machine=$(grep "^Hardware" /proc/cpuinfo | sed 's/Hardware\s*:\s*//') - liloConfig="" - bootPrefix=/boot --- -1.7.6.5 - diff --git a/grubby.spec b/grubby.spec index 1e6b3e1..b35666a 100644 --- a/grubby.spec +++ b/grubby.spec @@ -1,6 +1,6 @@ Name: grubby -Version: 8.8 -Release: 4%{?dist} +Version: 8.9 +Release: 1%{?dist} Summary: Command line tool for updating bootloader configs Group: System Environment/Base License: GPLv2+ @@ -20,7 +20,6 @@ Requires: s390utils-base %ifarch %{arm} Requires: uboot-tools %endif -Patch0: grubby-8.8-add-armv5tel.patch %description grubby is a command line tool for updating and displaying information about @@ -31,8 +30,6 @@ environment. %prep %setup -q -%patch0 -p1 - %build make %{?_smp_mflags} @@ -64,8 +61,17 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog -* Fri Mar 02 2012 Peter Jones - 8.8-4 -- Add support for armv5tel. +* Fri Mar 02 2012 Peter Jones - 8.9-1 +- Refactor grub2 title extraction, making it a function (Cleber Rosa) +- Include prefix when printing kernel information (Cleber Rosa) +- Implement support for "default saved" for grub2 (Cleber Rosa) +- Try to display title when printing information with '--info' (Cleber Rosa) +- new-kernel-pkg fails to find U-Boot. (D. Marlin) +- Add support to new-kernel-pkg to recognize ARCH == armv5tel needed for Kir + (D.Marlin) +- Include a / when one is missing in paths (#769641) +- Fix hard coded paths so kernel's "make install" will DTRT. +- Fix endswith() to correctly test its input for validity. * Tue Feb 07 2012 Dennis Gilmore - 8.8-3 - add uboot-tools requires on arm arches diff --git a/sources b/sources index cfb14aa..d6e4a25 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a0236d98f870470b4987a91312a18996 grubby-8.8.tar.bz2 +f0f27d7e78ad1452e7d0bf0bf4ca0fc6 grubby-8.9.tar.bz2