Update to 8.40-1

Resolves: rhbz#1214950 Signed-off-by: Peter Jones <pjones@redhat.com>
Disable "make check" on arm builds; right now the test suite is broken
2015-06-10 11:25:55 -04:00 · 2014-11-13 12:46:33 -05:00 · 2014-10-27 18:12:48 -04:00 · 2014-10-16 14:28:09 -04:00 · 2014-10-15 17:03:50 -04:00 · 2014-09-26 13:41:04 -04:00
2 changed files with 42 additions and 5 deletions
--- a/grubby.spec
+++ b/grubby.spec
@ -1,6 +1,6 @@
 Name: grubby
-Version: 8.35
-Release: 2%{?dist}
+Version: 8.40
+Release: 1%{?dist}
 Summary: Command line tool for updating bootloader configs
 Group: System Environment/Base
 License: GPLv2+
@ -41,12 +41,16 @@ git config user.name "no one"
 git add .
 git commit -a -q -m "%{version} baseline"
 git am %{patches} </dev/null
+git config --unset user.email
+git config --unset user.name

 %build
 make %{?_smp_mflags}

+%ifnarch aarch64 %{arm}
 %check
 make test
+%endif

 %install
 rm -rf $RPM_BUILD_ROOT
@ -61,10 +65,10 @@ echo " " >> $RPM_BUILD_ROOT/boot/boot.scr
 %clean
 rm -rf $RPM_BUILD_ROOT

-
 %files
 %defattr(-,root,root,-)
-%doc COPYING
+%{!?_licensedir:%global license %%doc}
+%license COPYING
 /sbin/installkernel
 /sbin/new-kernel-pkg
 /sbin/grubby
@ -75,6 +79,39 @@ rm -rf $RPM_BUILD_ROOT
 %endif

 %changelog
+* Wed Jun 10 2015 Peter Jones <pjones@redhat.com> - 8.40-1
+- Update to 8.40-1
+  Resolves: rhbz#1214950
+
+* Thu Nov 13 2014 Peter Jones <pjones@redhat.com> - 8.35-9
+- Disable "make check" on arm builds; right now the test suite is broken
+  there and raises false positives constantly.
+
+* Mon Oct 27 2014 Peter Jones <pjones@redhat.com> - 8.35-8
+- Treat kernel and kernel-core as identical in terms of --make-default
+  Resolves: rhbz#1141414
+
+* Thu Oct 16 2014 Peter Jones <pjones@redhat.com> - 8.35-7
+- Revert "debug" image creation for now
+  Resolves: rhbz#1153410
+- Fix minor quoting errors in dtbdir code
+  Resolves: rhbz#1088933
+
+* Wed Oct 15 2014 Peter Jones <pjones@redhat.com> - 8.35-6
+- Update grubby to support device tree options for arm.  Again.
+  Resolves: rhbz#1088933
+
+* Fri Sep 26 2014 Peter Jones <pjones@redhat.com> - 8.35-5
+- See if what people are seeing in 1141414 is actually 957681
+  Related: rhbz#957681
+  Related: rhbz#1141414
+
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.35-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jul 12 2014 Tom Callaway <spot@fedoraproject.org> - 8.35-3
+- fix license handling
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.35-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

--- a/2
+++ b/2
@ -1 +1 @@
-daf05585c3e1f3da2601cd1b0242fc60  grubby-8.35.tar.bz2
+bcad3c0dc804c4f526374616c1154469  grubby-8.40.tar.bz2
Author	SHA1	Message	Date
Peter Jones	529e352161	Update to 8.40-1 Resolves: rhbz#1214950 Signed-off-by: Peter Jones <pjones@redhat.com>	2015-06-10 11:25:55 -04:00
Peter Jones	16069362e2	Disable "make check" on arm builds; right now the test suite is broken there and raises false positives constantly. Signed-off-by: Peter Jones <pjones@redhat.com>	2014-11-13 12:46:33 -05:00
Peter Jones	78ef26571f	Treat kernel and kernel-core as identical in terms of --make-default Resolves: rhbz#1141414 Signed-off-by: Peter Jones <pjones@redhat.com>	2014-10-27 18:12:48 -04:00
Peter Jones	d9f658b39f	Don't create "debug" entries yet. This apparently interacts poorly with grub2-mkconfig's title generation and causes weird errors, so it's not ready yet. This commit also fixes some quoting errors in the dtbdir n-k-p code. Resolves: rhbz#1153410 Resolves: rhbz#1088933 Signed-off-by: Peter Jones <pjones@redhat.com>	2014-10-16 14:28:09 -04:00
Peter Jones	daa3b4ea08	Update grubby to support device tree options for arm. Again. Resolves: rhbz#1088933 Signed-off-by: Peter Jones <pjones@redhat.com>	2014-10-15 17:03:50 -04:00
Peter Jones	396cebeb2a	Fix a typo.	2014-09-26 13:41:04 -04:00
Peter Jones	996c1764be	See if what people are seeing in 1141414 is actually 957681 Related: rhbz#957681 Related: rhbz#1141414	2014-09-26 13:30:13 -04:00
Peter Robinson	b6f0034ff3	- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild	2014-08-16 19:09:28 +00:00
Tom Callaway	1cbb0edcd8	fix license handling	2014-07-12 11:39:48 -04:00