rpms/grub2
7
0
Fork 0
Code Issues Pull Requests Releases Activity
661 Commits 16 Branches 100 Tags 16 MiB
07cf41c169
Commit Graph

488 Commits

Author SHA1 Message Date
Peter Jones
819251656a Fix regexp in power compile flags, and synchronize release number with 
other branches.

Signed-off-by: Peter Jones <pjones@redhat.com>
 2016-12-08 10:42:05 -05:00
Dan Horák
b7437aa1d1 fix typo in regex 2016-12-07 09:47:49 +01:00
Peter Jones
377f5fc2d0 Rebased to newer upstream for fedora-26 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2016-12-02 16:18:30 -05:00
Peter Jones
0773b3d5c8 remove the manual application of Laszlo's patch... 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2016-12-01 17:22:09 -05:00
Peter Jones
1f6f8c776e Update version to .36 because I already built an f25 one named 0.35 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2016-12-01 17:19:52 -05:00
Peter Jones
475000b94d Rebased to newer upstream for fedora-26 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2016-12-01 17:18:47 -05:00
Adam Williamson
ced107a476 Add patch from lersek to fix UEFI Windows dual-boot 
Resolves: rhbz#1347291

Signed-off-by: Adam Williamson <awilliam@redhat.com>
 2016-12-01 17:16:03 -05:00
Peter Jones
7c83ceb432 Fix power6 makefile bits for newer autoconf defaults. 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2016-12-01 17:14:05 -05:00
Adam Williamson
0ea125de5a Revert "Add patch from lersek to fix UEFI Windows dual-boot - #1347291" 
This reverts commit 44da1e072b.
Reverting for now as there's some unresolved questions that
make me unwilling to go through with this change - like why
ppc64 build fails on Rawhide, and whether the changes from
the f24 branch that aren't on master or f25 should be brought
forward. So reverting to the status quo until I can talk to
Peter.
 2016-11-21 19:29:03 -08:00
Adam Williamson
44da1e072b Add patch from lersek to fix UEFI Windows dual-boot - #1347291 
Signed-off-by: Adam Williamson <awilliam@redhat.com>
 2016-11-21 19:02:04 -08:00
Peter Jones
9d15b4d492 Update to be newer than f24's branch. 
- Add grub2-get-kernel-settings
  Related: rhbz#1226325

Signed-off-by: Peter Jones <pjones@redhat.com>
 2016-11-18 16:02:43 -05:00
Peter Jones
336bf36497 Revert 27e66193, which was replaced by upstream's 49426e9fd 
Resolves: rhbz#1251600

Signed-off-by: Peter Jones <pjones@redhat.com>
 2016-04-07 11:01:55 -04:00
Peter Jones
1713515a59 Rebased to newer f24 code 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2016-04-07 10:46:33 -04:00
Peter Jones
0ac23e2378 Pull TPM updates from mjg59. 
Resolves: rhbz#1318067

Signed-off-by: Peter Jones <pjones@redhat.com>
 2016-04-05 15:31:48 -04:00
Thierry Vignaud
dcaf8f6883 switch to pkgconfig() style BR 
See
https://fedoraproject.org/wiki/Packaging:Guidelines#BuildRequires_based_on_pkg-config
 2016-03-22 13:29:53 -04:00
Thierry Vignaud
bec00f199a fix summary-ended-with-dot warning from rpmlint 2016-03-22 13:29:51 -04:00
Peter Jones
2ae5c1ecf9 Rebased to newer upstream for fedora-24 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2016-03-04 15:29:53 -05:00
Peter Jones
b9efc549fa Bump for grub-2.02-beta3 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2016-03-04 14:08:54 -05:00
Peter Jones
52f24b72a1 Make a "do-rebase" script we can use when we've rebased the github repo. 
This rebuilds our patchset automatically.

Signed-off-by: Peter Jones <pjones@redhat.com>
 2016-03-04 13:28:38 -05:00
Peter Jones
bf8e18bc1d Security update for keyboard input vulnerability. 
- Fix security issue when reading username and password
  Related: CVE-2015-8370
- Do a better job of handling GRUB2_PASSWORD
  Related: rhbz#1284370

Signed-off-by: Peter Jones <pjones@redhat.com>
 2015-12-17 10:06:43 +01:00
Peter Jones
d979a79ed2 Rebuild without multiboot* modules in the EFI image. 
Related: rhbz#1264103

Signed-off-by: Peter Jones <pjones@redhat.com>
 2015-11-20 18:18:48 -05:00
Josh Boyer
f66adb6a43 Bump for build to get signed 2015-09-05 17:09:18 -04:00
Kalev Lember
2926da35f1 Rebuilt for librpm soname bump 2015-09-05 16:13:26 +02:00
Peter Jones
3e24dd98fe Back out one of the debuginfo generation patches; it doesn't work right on 
aarch64 yet.
  Resolves: rhbz#1250197

Signed-off-by: Peter Jones <pjones@redhat.com>
 2015-08-05 13:19:11 -04:00
Peter Jones
ea2871d57a The previous fix was completely not right, so fix it a different way. 
Resolves: rhbz#1249668

Signed-off-by: Peter Jones <pjones@redhat.com>
 2015-08-03 15:09:01 -04:00
Robert Marshall
7b98965227 Reverse rpmvercmp return value 
RPM sort was returning kernels sorted from oldest to newest
instead of newest to oldest. Flipped the sign on the return
value to switch the order.

Related: rhbz#1124074

Signed-off-by: Peter Jones <pjones@redhat.com>
 2015-07-31 11:53:28 -04:00
Peter Jones
8facaba7e5 Fix a build failure on aarch64 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2015-07-30 11:32:31 -04:00
Peter Jones
9074bf39f4 Fix changed symbol name. 
Upstream's f8451af8 changed finalize_params to finalize_params_linux on
aarch64, and so we got a build failure because one of our patches also
referenced it.

This rectifies the two patches.

Signed-off-by: Peter Jones <pjones@redhat.com>
 2015-07-30 11:30:50 -04:00
Peter Jones
190143c8d4 Add missing rpm-devel requirement. 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2015-07-22 15:03:11 -04:00
Peter Jones
f4c76c02ae Reconcile even harder, so that it actually works. 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2015-07-22 13:12:37 -04:00
Peter Jones
8c6b1ac71e Reconcile with upstream once again. 
Also include some minor fixes for gcc 5.1.1

Signed-off-by: Peter Jones <pjones@redhat.com>
 2015-07-22 09:46:32 -04:00
Peter Jones
b02c700d6c Be less terrible with .gitignore 
We lost a man page because of this bzrignore<->gitignore junk, so solve
that slightly better.

Signed-off-by: Peter Jones <pjones@redhat.com>
 2015-07-22 09:16:02 -04:00
Peter Jones
a3296c1c92 Make %{efidir} dynamically from /etc/os-release 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2015-07-22 09:02:34 -04:00
Peter Robinson
40524773a3 Don't build hardened (fixes FTBFS) 2015-07-19 15:23:39 +01:00
Peter Jones
d1197b4f47 Make kernel titles suck less. 
Resolves: rhbz#1215839

Signed-off-by: Peter Jones <pjones@redhat.com>
 2015-04-28 16:07:35 -04:00
Peter Jones
e44ede528a Add "loopback" module. 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2015-04-21 11:37:34 -04:00
Till Maas
ac484fe622 Rebuilt for Fedora 23 Change 
https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
 2015-02-21 22:26:57 +01:00
Peter Jones
eb2c2e626a Bump release to rebuild with Ralf Corsépius's fixes. 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2015-01-05 10:17:14 -05:00
Ralf Corsépius
767f985a92 Move grub2.info/grub2-dev.info install-info scriptlets into *-tools package. 
- Use sub-shell in %__debug_install_post (RHBZ#1168732).
- Cleanup grub2-starfield-theme packaging.
 2015-01-04 06:55:24 +01:00
Peter Jones
87ae4b9628 Update minilzo to 2.08 for CVE-2014-4607 
Resolves: rhbz#1131793

Signed-off-by: Peter Jones <pjones@redhat.com>
 2014-12-05 09:23:50 -05:00
Peter Jones
497ed2ee41 Make sure gcdaa64.efi is packaged. 
- Make backtrace and usb conditional on !arm
- Make sure gcdaa64.efi is packaged.
  Resolves: rhbz#1163481

Signed-off-by: Peter Jones <pjones@redhat.com>
 2014-11-20 10:50:52 -05:00
Peter Jones
dea2713c92 fix a copy-paste error in patch 0154. 
Resolves: rhbz#964828

Signed-off-by: Peter Jones <pjones@redhat.com>
 2014-11-07 15:26:44 -05:00
Peter Jones
9d85b1d3af Handle os-prober and tftp path generation better. 
- Try to emit linux16/initrd16 and linuxefi/initrdefi when appropriate
  in 30_os-prober.
  Resolves: rhbz#1108296
- If $fw_path doesn't work to find the config file, try $prefix as well
  Resolves: rhbz#1148652

Signed-off-by: Peter Jones <pjones@redhat.com>
 2014-10-27 09:30:59 -04:00
Peter Jones
58fe9aa736 Various updates that came from rhel 7.1 work. 
- Clean up the build a bit to make it faster
- Make grubenv work right on UEFI machines
  Related: rhbz#1119943
- Sort debug and rescue kernels later than normal ones
  Related: rhbz#1065360
- Allow "fallback" to include entries by title as well as number.
  Related: rhbz#1026084
- Fix a segfault on aarch64.
- Load arm with SB enabled if available.
- Add some serial port options to GRUB_MODULES.

Signed-off-by: Peter Jones <pjones@redhat.com>
 2014-09-29 11:52:02 -04:00
Peter Jones
ab37733fec Don't specify -Wp,-D_FORTIFY_SOURCE; it makes no sense with other flags. 
This option just generates a lot of I/O on stdout during the build...

Signed-off-by: Peter Jones <pjones@redhat.com>
 2014-09-10 15:00:22 -04:00
Peter Jones
ee7733c5eb Don't process a ton of grub modules with find-debuginfo.sh 
It just rejects them anyway, and it slows down the build.

Signed-off-by: Peter Jones <pjones@redhat.com>
 2014-09-03 16:36:13 -04:00
Peter Jones
9ccddf4254 Make grubenv work correctly on UEFI machines. 
Related: rhbz#1119943

Signed-off-by: Peter Jones <pjones@redhat.com>
 2014-09-03 15:46:21 -04:00
Peter Jones
84fdd02b27 Remove some duplicates from GRUB_MODULES 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2014-08-25 14:48:35 -04:00
Peter Jones
4dcaf21223 Add ppc64le support. 
Resolves: rhbz#1125540
 2014-08-19 11:05:16 -04:00
Peter Jones
bcda470952 Enabled syslinuxcfg module. 2014-07-24 13:55:16 -04:00
Peter Jones
34a92f2f0d Add syslinuxcfg module. 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2014-07-22 14:55:50 -04:00
Peter Jones
37b39b7a40 Re-merge RHEL 7 changes and ARM works in progress. 2014-07-02 11:57:04 -04:00
Peter Jones
f178927fdb Avoid munging raw spaces when we're escaping command line arguments. 
Resolves: rhbz#923374
 2014-06-30 14:20:28 -04:00
Peter Jones
011fe811ba Update to newest upstream. 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2014-06-24 11:18:06 -04:00
Peter Jones
3f2879cb30 Rebase to upstream. 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2014-05-09 16:33:04 -04:00
Peter Jones
78a3d7dfd9 Merge in RHEL 7 changes and ARM works in progress. 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2014-03-13 14:52:25 -04:00
Peter Jones
864f3652f5 Fix FORTIFY_SOURCE for util/ 
Related: rhbz#1049047

Signed-off-by: Peter Jones <pjones@redhat.com>
 2014-03-13 13:48:55 -04:00
Peter Jones
8c7f7590b2 Some more cleanup of the 2.02~beta2 rebase, and make Aarch64 work. 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2014-01-14 13:47:16 -05:00
Peter Jones
5dc55b7bd8 Some more cleanup of our giant patch series. 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2014-01-07 10:02:18 -05:00
Peter Jones
95e3ce411f Pull in some lost changes from RHEL 7.0 branch to merge more easily. 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2014-01-06 15:49:50 -05:00
Peter Jones
481bf3bbf7 Update to grub-2.02~beta2 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2014-01-06 11:46:25 -05:00
Peter Jones
7d5b63aefa On UEFI, put modules in a subpackage. 
Since they don't normally get used, there's no reason to normally
install them.

Signed-off-by: Peter Jones <pjones@redhat.com>
 2013-10-02 16:47:55 -04:00
Peter Jones
39307a818d Last build failed because of a hardware error on the builder. 2013-08-10 11:36:39 -04:00
Peter Jones
31fa3b5d35 Fix compiler flags to deal with -fstack-protector-strong 2013-08-05 11:49:40 -04:00
Peter Jones
739a29165e Fix compiler flags to deal with -fstack-protector-strong 2013-08-05 10:19:48 -04:00
Dennis Gilmore
54c6370f47 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild 2013-08-03 11:40:42 -05:00
Dennis Gilmore
54192aaaf3 pull in the extra fix done in f19 
Merge branch 'f19'

Conflicts:
	grub2.spec
 2013-07-02 13:29:51 -05:00
Dennis Gilmore
d0b05a7eb9 add epoch to obsoletes 2013-07-02 13:20:08 -05:00
Dennis Gilmore
4a42f9b3e3 add epoch to obsoletes 2013-07-02 13:16:14 -05:00
Dennis Gilmore
8fc7297927 add epoch to the Obsoletes lines in the spec 2013-07-02 13:13:49 -05:00
Peter Jones
9546739573 Fix linewrapping in edit menu. 
Resolves: rhbz #976643
 2013-06-21 14:47:42 -04:00
Peter Jones
38f72d25e9 Fix linewrapping in edit menu. 
Resolves: rhbz #976643
 2013-06-21 14:46:49 -04:00
Peter Jones
9c5e36d017 Fix obsoletes to pull in -starfield-theme subpackage when it should. 2013-06-20 13:30:09 -04:00
Peter Jones
ab71b4de23 Put the theme entirely ento the subpackage where it belongs (#974667) 2013-06-14 15:30:46 -04:00
Peter Jones
5206323eb0 Rebase to upstream snapshot. 
- Fix PPC build error (#967862)
- Fix crash on net_bootp command (#960624)
- Reset colors on ppc when appropriate (#908519)
- Left align "Loading..." messages (#908492)
- Fix probing of SAS disks on PPC (#953954)
- Add support for UEFI OSes returned by os-prober
- Disable "video" mode on PPC for now (#973205)
- Make grub fit better into the boot sequence, visually (#966719)
 2013-06-13 10:06:04 -04:00
Peter Jones
f74b50e380 Rebase to upstream, fix a pile of bugs. The usual. 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2013-06-12 15:37:08 -04:00
William Jon McCann
6c7b1edb29 Work around missing en.mo.gz issue. 2013-06-10 15:41:42 -04:00
Peter Jones
31004e676e Rebase to upstream snapshot. 2013-06-07 14:03:56 -04:00
William Jon McCann
2961fa6052 Don't print GNU GRUB header 
No one cares.
 2013-06-03 11:16:59 -04:00
William Jon McCann
3a1a6259bc Add a patch to make the boot a bit quieter 2013-06-03 11:15:28 -04:00
William Jon McCann
909ac684df Add missing builddeps 2013-06-03 11:07:01 -04:00
Peter Jones
ed8842afb0 Fix release to -18 as that's the build we're doing... 
This build:
- Moves starfield to a subpackage
- Doesn't allow SSE or MMX on UEFI builds (#949761)

Signed-off-by: Peter Jones <pjones@redhat.com>
 2013-05-16 16:45:06 -04:00
Matthias Clasen
3c1bb2b181 Fix a typo: dir should be %dir in the file list 2013-05-15 15:34:31 -04:00
Matthias Clasen
fa0bb1c570 Add a starfield-theme subpackage 
starfield takes up >3M on disk without being used, and we're oversize for
the live image. It also contains some copies of dejavu fonts...

Signed-off-by: Peter Jones <pjones@redhat.com>
 2013-05-13 14:42:38 -04:00
Peter Jones
a5bd9f682f Rebase to newer upstream (git snapshot) 2013-05-02 16:54:52 -04:00
Peter Jones
c766879b05 Trim some changelogs from last decade. 
One of these includes an invalid date, which rpm now complains about,
because hey, what's life without some additional meaningless and purposeless
suffering?

Signed-off-by: Peter Jones <pjones@redhat.com>
 2013-04-04 11:17:19 -04:00
Peter Jones
50b8f8e890 Add lvm support for /boot 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2013-04-04 11:15:30 -04:00
Peter Jones
3987410b84 pj0 shouldn't be in the committed release number. Woops. 2013-04-04 11:14:36 -04:00
Peter Jones
3801bfdc74 Move bash completions to their new location. 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2013-04-03 16:10:32 -04:00
Peter Jones
3ad78fdcc9 Fix booting from drives with 4k sectors on UEFI. 2013-04-03 14:14:27 -04:00
Peter Jones
56aa737e59 Allow the user to disable submenu generation 
- (partially) support BLS-style configuration stanzas.
 2013-02-14 14:03:59 -05:00
Peter Jones
2ea29c3086 Don't use a separate module list for CDs. 2013-02-14 14:02:42 -05:00
Dennis Gilmore
d86e0a2344 bump nvr 2012-12-20 11:04:30 -06:00
Karsten Hopp
83401c6de5 add bootpath device to the device list (pfsmorigo, #886685) 2012-12-17 17:32:53 +01:00
Peter Jones
5e0db243b0 Various updates required for PPC. 2012-11-27 15:08:53 -05:00
Peter Jones
4788033714 Don't load modules when grub transitions to "normal" mode on UEFI. 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2012-10-23 10:49:45 -04:00
Peter Jones
5598b7f41e Bump release as well... 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2012-10-22 14:44:52 -04:00
Peter Jones
66cba4fda2 Rebuild with newer pesign so we'll get signed with the final signing keys. 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2012-10-22 14:39:46 -04:00
Peter Jones
09ea065fc4 Revert "Rebuild with newer pesign so we'll get signed with the final signing keys." 
This reverts commit 1a0dbd0641.
 2012-10-22 14:39:02 -04:00
Peter Jones
1a0dbd0641 Rebuild with newer pesign so we'll get signed with the final signing keys. 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2012-10-22 14:06:28 -04:00
Peter Jones
f2e5630d7d Various ppc updates. 2012-10-18 13:47:39 -04:00
Peter Jones
c8494619a4 Work around bug with using "\x20" in linux command line. 
Related: rhbz#855849

Signed-off-by: Peter Jones <pjones@redhat.com>
 2012-10-01 13:40:41 -04:00
Peter Jones
4ae6c6e738 sneak in sleep added to the module list 2012-09-25 16:24:24 -04:00
Peter Jones
aec4448a0d Use grub2-owner@ instead of pjones@ to apply patches. 
Ninjas all the way down.

Signed-off-by: Peter Jones <pjones@fedoraproject.org>
 2012-09-20 16:08:41 -04:00
Peter Jones
9d784831ea Don't error on insmod on UEFI/SB, but also don't do any insmodding. 
- Increase device path size for ieee1275
  Resolves: rhbz#857936
- Make network booting work on ieee1275 machines.
  Resolves: rhbz#857936
 2012-09-20 16:07:02 -04:00
Matthew Garrett
62fd5b9b37 Add Apple partition map support for EFI 2012-09-05 17:58:48 -04:00
David Cantrell
d38088ed67 Only require pesign on EFI architectures (#851215) 2012-08-23 11:12:09 -04:00
Peter Jones
c1a25d07e6 Work around AHCI firmware bug in efidisk driver. 
- Move to newer pesign macros
- Don't allow insmod if we're in secure-boot mode.
 2012-08-15 14:40:02 -04:00
Peter Jones
f742f42fc2 Move to newer pesign macros 
- Don't allow insmod if we're in secure-boot mode.
 2012-08-14 15:53:38 -04:00
Peter Jones
945dd8118c Include fix efi memory map fix from upstream (#839363) 2012-08-08 14:27:31 -04:00
Peter Jones
5d4d4776f9 Split module lists for UEFI boot vs UEFI cd images. 
- Add raid modules for UEFI image (related: #750794)
- Include a prelink whitelist for binaries that need execstack (#839813)
 2012-08-08 14:27:31 -04:00
Peter Jones
711f8a06f9 Correct grub-mkimage invocation to use efidir RPM macro (jwb) 
- Sign with test keys on UEFI systems.
- PPC - Handle device paths with commas correctly.
  Related: rhbz#828740
 2012-08-08 11:56:14 -04:00
Josh Boyer
2047240414 Correct grub-mkimage invocation to use efidir RPM macro 2012-08-07 09:57:51 -04:00
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
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