Commit Graph

225 Commits

Author SHA1 Message Date
Peter Jones
58a808c009 Add some more code to support Secure Boot
Add some more code to support Secure Boot, and temporarily disable
ome other bits that don't work well enough yet.

Resolves: rhbz#836695
2012-07-25 09:35:05 -04:00
Peter Jones
9bf0fc0b5e Keep on fixing gnulib. 2012-06-28 15:16:53 -04:00
Peter Jones
a37bbabf64 Rebase to grub-2.00 release. 2012-06-28 15:02:12 -04:00
Peter Jones
4ce656b370 Update to 2.00 release. 2012-06-28 14:50:33 -04:00
Mads Kiilerich
3734d8af18 update to grub 2.0 rc1
- drop backports of changes already included in 2.0rc1
- update grub-2.00-Add-fwsetup.patch
2012-06-28 14:48:08 -04:00
Peter Jones
8205bedc55 Fix double-free in grub-probe. 2012-06-18 15:52:14 -04:00
Peter Jones
c4a749da08 Build with patch19 applied. 2012-06-06 12:40:54 -04:00
Peter Jones
9a9b1f34d6 Comment out the most recent patch so we'll have a build without it. 2012-06-06 12:39:42 -04:00
Peter Jones
ad980577a2 More ppc fixes. 2012-06-06 12:23:56 -04:00
Peter Jones
fe507e9b64 Revert "Handle ppc nvram stuff in anaconda instead of here."
Since anaconda is frozen, we still have to do this here.

This reverts commit 008a5c45cb.
2012-06-06 11:23:28 -04:00
Peter Jones
fc6558ce1a Add IBM PPC fixes. 2012-06-06 11:22:51 -04:00
Peter Jones
008a5c45cb Handle ppc nvram stuff in anaconda instead of here. 2012-06-04 12:38:39 -04:00
Peter Jones
37801c12bd Don't use a macro for the beta since it screws up changelog 2012-06-04 12:11:22 -04:00
Peter Jones
460f2c58f0 Update to beta6.
- Various fixes from mads.
2012-06-04 11:49:11 -04:00
Peter Jones
f6b642dfbe Merge remote-tracking branch 'kiilerix/f17'
Conflicts:
	grub2.spec
2012-06-04 11:47:16 -04:00
Peter Jones
a7c00b4543 Update to beta6. 2012-06-04 11:09:16 -04:00
Mads Kiilerich
47b7f153f4 ExcludeArch %{arm}
- mentioned by dgilmore on irc
2012-06-04 02:29:21 +02:00
Mads Kiilerich
420dddcbf5 rename the global variable for efi archs to efiarchs
- that makes it less confusing to search for 'efi'
2012-06-02 01:55:36 +02:00
Mads Kiilerich
c95e580d52 clarify arch-specific glibc-devel buildrequires 2012-06-02 01:55:32 +02:00
Mads Kiilerich
356609bad2 add grub-2.00-no-huge-video.patch (#827003) 2012-06-02 01:54:48 +02:00
Mads Kiilerich
7f44b9b444 add grub-2.00-linux-mbr.patch - fix upstream bug #36490
backport upstream rev 4405

bug #36490: grub-probe doesn't work with fat32 file systems
2012-06-02 01:55:15 +02:00
Mads Kiilerich
7045ce64ed add grub-2.00-no-canon.patch (#737370)
backport upstream rev 4408:
Don't canonicalise /dev/root and /dev/dm-*.
2012-06-04 02:29:21 +02:00
Mads Kiilerich
5e9c41e4fe add grub-2.00-ieee1276.patch
backport upstream rev 4405
2012-06-04 02:29:21 +02:00
Mads Kiilerich
437155f5ea grub-2.00~beta6 2012-06-02 01:54:48 +02:00
Mads Kiilerich
b6c9f4d5b7 drop grub-2.00~beta4-add-support-for-PowerMac-HFS-partitions.patch
The patch do longer apply cleanly and is non-trivial to update.

Upstreams comment on Bug 815318:
Actually this whole thread results from a simple misconception as to how to
install GRUB on HFS(+) in the first place. Usual way is to mount it on
/boot/grub and use grub-install *without* disk argument
2012-06-02 01:54:48 +02:00
Mads Kiilerich
1c11a98761 drop grub-2.00-ppc-no-tree-scanning.patch fixed upstream
revno: 4334
committer: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
branch nick: grub
timestamp: Sun 2012-05-13 20:29:23 +0200
message:
        * grub-core/disk/ieee1275/ofdisk.c (scan): Don't scan device tree if
        GRUB_IEEE1275_FLAG_NO_TREE_SCANNING_FOR_DISKS is set.
        * grub-core/kern/ieee1275/cmain.c (grub_ieee1275_find_options): Set
        GRUB_IEEE1275_FLAG_NO_TREE_SCANNING_FOR_DISKS on IBM hardware.
        * include/grub/ieee1275/ieee1275.h (grub_ieee1275_flag): New enum value
        GRUB_IEEE1275_FLAG_NO_TREE_SCANNING_FOR_DISKS.
2012-06-02 01:54:07 +02:00
Mads Kiilerich
539e69ed2f drop grub-2.00-Fix-module-trampoline-for-ppc.patch fixed upstream
revno: 4348
author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
committer: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
branch nick: grub
timestamp: Mon 2012-05-21 22:40:34 +0200
message:
  	* grub-core/kern/powerpc/dl.c (trampoline_template): Use r12 instead
  	of r0.
2012-06-01 18:38:29 +02:00
Mads Kiilerich
25349df6ac drop grub2-2.0-no-png-in-texi.patch fixed upstream
revno: 4355
author: Jordan Uggla  <jordan.uggla@gmail.com>
committer: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
branch nick: grub
timestamp: Tue 2012-05-22 09:15:28 +0200
message:
        * docs/grub-dev.texi: Remove dot from .png.
2012-06-01 18:38:29 +02:00
Mads Kiilerich
2f2c551902 drop grub-1.99-Fix-tests-of-zeroed-partition.patch fixed upstream
revno: 4325
committer: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
branch nick: grub
timestamp: Fri 2012-05-11 21:07:39 +0200
message:
  	Use grub-probe and not cmp to check that disk is empty.

  	* util/grub-install.in: Use grub-probe for zero-check.
  	* util/grub-probe.c (PRINT_ZERO_CHECK): New enum value.
  	(probe): Handle PRINT_ZERO_CHECK.
  	(argp_parser): Handle -t zero_check.
2012-06-01 18:38:29 +02:00
Mads Kiilerich
7ef969cae5 drop grub2-handle-initramfs-on-xen.patch fixed upstream
revno: 4319
committer: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
branch nick: grub
timestamp: Thu 2012-05-10 02:36:23 +0200
message:
  	* util/grub.d/20_linux_xen.in: Update initrd list based on 10_linux.in
  	counterpart.
2012-06-01 18:38:29 +02:00
Mads Kiilerich
670545d725 drop grub-1.99-grub_test_assert_printf.patch fixed upstream
revno: 4377
author: Peter Jones <pjones@redhat.com>
committer: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
branch nick: grub
timestamp: Sun 2012-05-27 14:26:18 +0200
message:
        The old code gives arguments to a printf function which can't work
        correctly, and the compiler complains.

        * grub-core/tests/example_functional_test.c (example_test): Add
        missing text.
        * grub-core/tests/lib/test.c (add_failure): Rewrite.
        * include/grub/test.h (grub_test_assert_helper): New declaration.
        (grub_test_assert): Use grub_test_assert_helper.
2012-06-01 18:38:29 +02:00
Mads Kiilerich
c3c573eb67 drop grub-1.99-handle-fwrite-return.patch fixed upstream
revno: 4320
committer: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
branch nick: grub
timestamp: Thu 2012-05-10 09:39:11 +0200
message:
  	* util/grub-menulst2cfg.c (main): Check return value of fwrite.
  	* util/grub-mklayout.c (write_file): Likewise. New argument fname.
  	All users updated.
2012-06-01 18:38:29 +02:00
Peter Jones
bd43daa62d Revert builddep change for crt1.o; it breaks ppc build. 2012-05-25 17:17:48 -04:00
Peter Jones
cd7223a164 Revert "don't use arch-specific buildrequires without any good reason (#825322)"
This reverts commit 026ad9c7a7.

This patch breaks the build on ppc.
2012-05-25 17:16:56 -04:00
Peter Jones
029d1ff463 Merge branch 'master' into f17 2012-05-25 15:33:30 -04:00
Peter Jones
43a6f76e37 Add fwsetup command (pjones)
- More ppc fixes (IBM)
2012-05-25 15:29:28 -04:00
Peter Jones
85ef16307b Merge branch 'master' into f17 2012-05-25 15:10:24 -04:00
Mads Kiilerich
026ad9c7a7 don't use arch-specific buildrequires without any good reason (#825322)
The architecture of the buildhost for the srpm might be different from the
architecture where yum-builddep is run.
2012-05-25 15:10:13 -04:00
Peter Jones
b9e754517d Merge branch 'master' into f17
Conflicts:
	grub-1.99-just-say-linux.patch
	grub2.spec
	sources
2012-05-25 15:08:10 -04:00
Peter Jones
f3c723cdda Add fwsetup command (pjones)
- More ppc fixes (IBM)
2012-05-25 15:01:32 -04:00
Peter Jones
aa709fb61d Add fwsetup. 2012-05-25 14:40:57 -04:00
Peter Jones
8273501f65 Fix the /other/ grub2-tools require to include epoch. 2012-05-22 11:40:48 -04:00
Peter Jones
c10845e154 Get rid of efi_uga and efi_gop, favoring all_video instead. 2012-05-21 16:37:32 -04:00
Peter Jones
efff1af3f2 Fix grub2-tools requires to include epoch, so it'll work. 2012-05-21 16:04:08 -04:00
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