Commit Graph

329 Commits

Author SHA1 Message Date
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