Commit Graph

181 Commits

Author SHA1 Message Date
Matthew Garrett
939f59000f Make grub look for its config file on efi where the app was found. 2012-05-21 16:03:52 -04:00
Peter Jones
8d4efa50a4 Name grub.efi something that's arch-appropriate (kiilerix, pjones)
- use EFI/$SOMETHING_DISTRO_BASED/ not always EFI/redhat/grub2-efi/ .
- move common stuff to -tools (kiilerix)
- spec file cleanups (kiilerix)
2012-05-21 14:57:29 -04:00
Mads Kiilerich
9ef0c08463 move common files to -tools subpackage
It seems like grub2 and grub2-efi (and whatever it is called on other
platforms) really should be noarch ...
2012-05-21 17:34:06 +02:00
Mads Kiilerich
6092ed7ab1 use %{name} more - especially instead of grub2-efi
This also changes the location of the pre-generated .efi
2012-05-21 17:34:06 +02:00
Mads Kiilerich
cfda7223d2 rename grub.efi to grub32.efi on x86 so it doesn't collide with x86_64 2012-05-21 17:34:05 +02:00
Peter Jones
ed858ec792 Fix module trampoline for ppc. 2012-05-14 16:51:08 -04:00
Peter Jones
56a8b5e0c5 Fix build problem with removing /etc/default/grub 2012-05-10 21:15:27 -04:00
Peter Jones
3e73e125cd Fix merge error on /etc/default/grub ownership, and add IBM bug number. 2012-05-10 21:15:23 -04:00
Peter Jones
d9c0e662cc Fix build problem with removing /etc/default/grub 2012-05-10 20:47:40 -04:00
Peter Jones
31ad4e0c34 Fix merge error on /etc/default/grub ownership, and add IBM bug number. 2012-05-10 18:05:33 -04:00
Peter Jones
9f9108bc5c Update package to -0.27 2012-05-10 16:51:27 -04:00
Peter Jones
bf52e4d95b Move mads' sed to a patch so it doesn't clutter up the git diff. 2012-05-10 16:51:27 -04:00
Peter Jones
f7d870676e Fix license of theme (mizmo)
- Fix license of theme (mizmo)
  Resolves: rhbz#820713
- Fix some unfiled IBM problem.
2012-05-10 16:50:01 -04:00
Peter Jones
46454f31f3 Move mads' sed to a patch so it doesn't clutter up the git diff. 2012-05-10 16:46:38 -04:00
Peter Jones
2761298dbc /etc/default/grub actually comes from anaconda, remove the confusion. 2012-05-10 16:46:14 -04:00
Peter Jones
b9abb48d6f /etc/default/grub actually comes from anaconda, remove the confusion. 2012-05-10 09:49:48 -04:00
Peter Jones
4a93dbaf37 Update to beta5.
- Update how efi building works (kiilerix)
- Fix theme support to bring in fonts correctly (kiilerix, pjones)
2012-05-10 09:30:40 -04:00
Peter Jones
c86672d101 Don't delete stuff from theme in .spec, just remove it from the theme. 2012-05-10 09:29:36 -04:00
Peter Jones
44de025034 Update to beta5.
- Update how efi building works (kiilerix)
2012-05-10 09:28:07 -04:00
Mads Kiilerich
1d74d59761 remove grub2-efi transformation
All tools and support files are now the same for bios and efi - only the actual
bootloader is different. There is thus no reason to build any tools for efi,
but there is no way to avoid it. We just build and install them and overwrite
with bios files.

By using the same transformation we avoid the problems with the transformation
being included in some un-transformed files.

The old grub2-efi specific are kept as symlinks for backward compatibility.
grub2-efi is still very much work-in-progress and the grub2-efi could probably
be dropped very soon. It would also make sense to move all shared files to a
sub-package.
2012-05-10 09:27:33 -04:00
Mads Kiilerich
171aabb89d fixes for theme support - make the fonts that are used available
The starfield theme is a bad example ...
2012-05-10 09:24:08 -04:00
Mads Kiilerich
2df3e5efba Update to grub 2.0 beta 5 2012-05-10 09:23:56 -04:00
Mads Kiilerich
66e85d1e00 remove foo bar echo statements - seems to be forgotten and useless debug statements 2012-05-10 09:21:17 -04:00
Peter Jones
e5764c0076 Include theme support (mizmo)
- Include locale support (kiilerix)
- Include html docs (kiilerix)

Conflicts:

	grub2.spec
2012-05-10 09:20:31 -04:00
Peter Jones
4b7e06e90f Include theme support.
Conflicts:

	grub2.spec
2012-05-10 09:19:51 -04:00
Mads Kiilerich
cd1247369f Include html documentation - that is more accessible for the average user 2012-05-10 09:18:22 -04:00
Mads Kiilerich
60f39abf64 Include localization files - using the grub name space is forward compatible 2012-05-10 09:18:17 -04:00
Peter Jones
f45c3d8715 Include theme support (mizmo)
- Include locale support (kiilerix)
- Include html docs (kiilerix)
2012-05-09 16:58:23 -04:00
Peter Jones
83183d52e9 Include theme support. 2012-05-09 16:55:11 -04:00
Mads Kiilerich
0f31deb193 Include html documentation - that is more accessible for the average user 2012-05-09 16:53:54 -04:00
Mads Kiilerich
72b5f5972a Include localization files - using the grub name space is forward compatible 2012-05-09 16:53:20 -04:00
Peter Jones
b7a4ca3eb4 Work around #819031
Conflicts:

	grub2.spec
2012-05-07 09:57:07 -04:00
Peter Jones
afddf8782b Work around #819031
Conflicts:

	grub2.spec
2012-05-07 09:56:50 -04:00
Peter Jones
89c4ce4ad1 Update version number. 2012-04-26 16:52:08 -04:00
Mads Kiilerich
e55a9ea2cb ofpathname is not sparc specific - remove double include on sparc 2012-04-26 16:50:18 -04:00
Mads Kiilerich
3f1bde6f92 ofpathname is not sparc specific - remove double include on sparc 2012-04-26 16:49:44 -04:00
Peter Jones
e572f9f98d Require: file 2012-04-26 14:11:04 -04:00
Peter Jones
47d5e953cc Require: file 2012-04-26 14:09:45 -04:00
Peter Jones
0e6e69f9b5 Various fixes from Mads Kiilerich 2012-04-26 11:09:57 -04:00
Peter Jones
3bcbea7115 Various fixes from Mads Kiilerich 2012-04-26 11:07:14 -04:00
Mads Kiilerich
3ed69626bf remove failing patching of grub2-efi-mkconfig to reference a non-existing file 2012-04-26 11:06:22 -04:00
Mads Kiilerich
caaeb9f460 don't list grub-mkconfig_lib twice
/usr/share/grub/ was also listed an extra time if efi was disabled.

(Fix merge error on previous patch with same changelog)
2012-04-26 10:34:12 -04:00
Mads Kiilerich
0fdb59b0d1 drop 90_persistent script
It is undocumented.

It haven't been upstreamed.

Upstream has 40_custom and 41_custom for the same purpose.

It violates layering and code structure by guessing which (optional!) output
file has been specified for grub2-mkconfig ... and makes the wrong guess for
grub2-efi.
2012-04-26 10:22:58 -04:00
Mads Kiilerich
4bad6d0c58 don't list grub-mkconfig_lib twice
/usr/share/grub/ was also listed an extra time if efi was disabled.
2012-04-26 10:22:36 -04:00
Peter Jones
a5b8b6f459 Support PowerMac partitioning. 2012-04-26 10:19:48 -04:00
Peter Jones
e26f56bd1e Update to 2.00~beta4
- Make fonts work so we can do graphics reasonably
2012-04-19 16:45:59 -04:00
Peter Jones
f06903e4a1 Update to 2.00~beta4
- Make fonts work so we can do graphics reasonably
2012-04-19 16:33:09 -04:00
David W. Aquilina
2b1c010ce0 Fix ieee1275 platform define for ppc 2012-04-19 11:27:43 -04:00
Mads Kiilerich
49353e4bb9 drop 90_persistent script
It is undocumented.

It haven't been upstreamed.

Upstream has 40_custom and 41_custom for the same purpose.

It violates layering and code structure by guessing which (optional!) output
file has been specified for grub2-mkconfig ... and makes the wrong guess for
grub2-efi.
2012-04-16 12:40:34 -04:00
Peter Jones
21e891cb12 Fix path for grub2-efi-mkconfig post-usrmove. 2012-04-16 12:40:34 -04:00
Mads Kiilerich
adb84294cf update spec to /usr move 2012-04-16 12:40:34 -04:00
Mads Kiilerich
4f57b17a98 don't list grub-mkconfig_lib twice
/usr/share/grub/ was also listed an extra time if efi was disabled.
2012-04-16 12:40:33 -04:00
David W. Aquilina
81e64b5742 Fix ieee1275 platform define for ppc 2012-03-29 13:56:38 -04:00
Peter Jones
820140e8ac Manually patch this to make it look like the changes from F17. Ugh. 2012-03-29 13:50:57 -04:00
Peter Jones
982cdee958 I'm told the exclude arch change to ppc from ppc64 was wrong. 2012-03-29 13:40:50 -04:00
Dan Horák
4d1b645b7d Add support for serial terminal consoles on PPC by Mark Hamzy 2012-03-29 13:40:49 -04:00
Dan Horák
3eacc8828d Use Fix-tests-of-zeroed-partition patch by Mark Hamzy 2012-03-29 13:40:49 -04:00
Peter Jones
d4970aa79c Fix Source0 url 2012-03-29 13:40:49 -04:00
Peter Jones
e6dc731cc2 Use --with-grubdir= on configure to make it behave like -17 did. 2012-03-29 13:40:49 -04:00
Peter Jones
58d787eb63 Rebase from 1.99 to 2.00~beta2 2012-03-29 13:40:49 -04:00
Peter Jones
c967306041 Remove ppc excludearch lines (dwa)
- Update ppc terminfo patch (hamzy)
2012-03-29 11:33:25 -04:00
Peter Jones
23e0df8c25 0.21 2012-03-29 11:32:55 -04:00
Peter Jones
a932eb5b35 Yet another change to ExcludeArch from dwa. 2012-03-29 11:31:51 -04:00
Peter Jones
6950aa55c1 Fix ppc64 vs ppc exclude according to what dwa tells me they need
- Fix version number to better match policy.
2012-03-28 14:22:35 -04:00
Dan Horák
f2a9f13400 Add support for serial terminal consoles on PPC by Mark Hamzy 2012-03-27 22:34:56 +02:00
Dan Horák
e91c7753ae Use Fix-tests-of-zeroed-partition patch by Mark Hamzy 2012-03-27 21:03:57 +02:00
Peter Jones
50b9a85a41 Fix Source0 url 2012-03-16 21:16:35 -04:00
Peter Jones
1baa278bc3 Use --with-grubdir= on configure to make it behave like -17 did. 2012-03-15 10:31:15 -04:00
Peter Jones
28678c2db6 Rebase from 1.99 to 2.00~beta2 2012-03-14 16:36:38 -04:00
Peter Jones
c7429be5d2 Handle some missed bits for newer autotools support (patch from khopp)
- Handle PReP installation on PPC.
2012-03-12 15:42:43 -04:00
Brian C. Lane
3c2ece5c5f remove check for serial.mod in 00_header 2012-03-09 13:00:39 -08:00
Peter Jones
645dc62a35 Update for newer autotools and gcc 4.7.0
Related: rhbz#782144
- Add /etc/sysconfig/grub link to /etc/default/grub
  Resolves: rhbz#800152
- ExcludeArch s390*, which is not supported by this package.
  Resolves: rhbz#758333
2012-03-07 10:43:18 -05:00
Peter Jones
06628ab459 Merge branch 'master' of ssh://pkgs.fedoraproject.org/grub2
Conflicts:
	grub2.spec
2012-03-07 09:12:41 -05:00
Peter Jones
62a7c9b4ec Add /etc/sysconfig/grub link to /etc/default/grub
Resolves: rhbz#800152
2012-03-07 09:11:56 -05:00
Orion Poplawski
1a635d813d Build with -Os (bug 782144) 2012-02-17 09:57:50 -07:00
Dennis Gilmore
fd5ed7048b - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild 2012-01-12 22:22:19 -06:00
Matthew Garrett
8a7df50949 fix up various grub2-efi issues 2011-12-14 15:07:51 -05:00
Adam Williamson
8a04b0c277 add an upstream reference for the grub-probe call patch 2011-12-08 12:05:28 -08:00
Peter Jones
c07e9a4da9 ExcludeArch s390*, which is not supported by this package.
Resolves: rhbz#758333
2011-12-08 14:36:18 -05:00
Adam Williamson
64c72fe7f7 bump the rev 2011-12-08 10:00:13 -08:00
Adam Williamson
6c1e129663 fix the hardwired call to grub-probe in 30_os-prober (RH #737203) 2011-12-08 09:59:29 -08:00
Peter Jones
212d822ae8 Lots of .spec fixes from Mads Kiilerich:
Remove comment about update-grub - it isn't run in any scriptlets
patch info pages so they can be installed and removed correctly when renamed
fix references to grub/grub2 renames in info pages (#743964)
update README.Fedora (#734090)
fix comments for the hack for upgrading from grub2 < 1.99-4
fix sed syntax error preventing use of $RPM_OPT_FLAGS (#704820)
make /etc/grub2*.cfg %config(noreplace)
make grub.cfg %ghost - an empty file is of no use anyway
create /etc/default/grub more like anaconda would create it (#678453)
don't create rescue entries by default - grubby will not maintain them anyway
set GRUB_SAVEDEFAULT=true so saved defaults works (rbhz#732058)
grub2-efi should have its own bash completion
don't set gfxpayload in efi mode - backport upstream r3402
Handle dmraid better. Resolves: rhbz#742226
2011-11-07 11:44:55 -05:00
Mads Kiilerich
b4e6bbb0ec don't set gfxpayload in efi mode - backport upstream r3402 2011-11-07 11:42:04 -05:00
Peter Jones
dfcf823ef8 Handle dmraid better.
Resolves: rhbz#742226
2011-11-07 11:41:53 -05:00
Mads Kiilerich
e61d26e2a3 grub2-efi should have its own bash completion 2011-11-07 11:39:37 -05:00
Mads Kiilerich
bf4e2d266e make grub.cfg %ghost - an empty file is of no use anyway 2011-11-07 11:38:48 -05:00
Mads Kiilerich
21f0c0b86e /etc/grub2*.cfg symlinks can be customized to point somewhere else - make them %config(noreplace) 2011-11-07 11:38:38 -05:00
Mads Kiilerich
d5f74283a0 fix sed syntax error preventing use of $RPM_OPT_FLAGS (#704820) 2011-11-07 11:38:24 -05:00
Mads Kiilerich
e3760090e5 move comments for the hack for upgrading from grub2 < 1.99-4 so they appear in the right place 2011-11-07 11:38:11 -05:00
Mads Kiilerich
51c2ea75cb fix references to grub/grub2 renames in info pages (#743964) 2011-11-07 11:37:33 -05:00
Mads Kiilerich
ee18b8d4c1 patch info pages so they can be installed and removed correctly when renamed 2011-11-07 11:37:17 -05:00
Mads Kiilerich
1068837011 Remove comment about update-grub - it isn't run in any scriptlets 2011-11-07 11:36:57 -05:00
Dennis Gilmore
7cabf5f6f8 - Rebuilt for glibc bug#747377 2011-10-26 18:59:55 -05:00
Adam Williamson
7c419b815b mark /etc/default/grub as config(noreplace) 2011-10-19 13:41:11 -07:00
Peter Jones
328405c9f5 grub has an epoch, so we need that expressed in the obsolete as well.
Today isn't my day.
2011-10-11 16:53:55 -04:00
Peter Jones
ba6990d52a Fix my bad obsoletes syntax. 2011-10-11 15:00:17 -04:00
Peter Jones
091a3cda9d Fix extra patch added that shouldn't have gone in yet. 2011-10-06 17:07:18 -04:00
Peter Jones
5606a4e17d Obsolete grub-0.97 . 2011-10-06 16:58:34 -04:00
Peter Jones
1156d47d8e Use mv not cp to try to avoid moving disk blocks around for -5 fix
Related: rhbz#735259
handle initramfs on xen better (patch from Marko Ristola)
Resolves: rhbz#728775
2011-09-14 16:09:24 -04:00
Kalev Lember
eb5089f407 Fix upgrades from grub2 < 1.99-4 (#735259)
grub2 versions older than 1.99-4 had the following in %preun:
  # XXX Ugly
  rm -f /boot/%{name}/*.mod
  rm -f /boot/%{name}/*.img
  rm -f /boot/%{name}/*.lst
  rm -f /boot/%{name}/device.map

This change tries to work around the damage caused on upgrades, by first
backuping the files and later restoring them after the old packages's
%preun has been run.

Complements the change in 5c9195d.

https://bugzilla.redhat.com/show_bug.cgi?id=735259
2011-09-03 22:06:18 +03:00