Commit graph

36 commits

Author SHA1 Message Date
Peter Jones
c3049d21d8 Kill .note.gnu.property with fire.
Related: rhbz#1612339

Signed-off-by: Peter Jones <pjones@redhat.com>
2018-08-03 15:13:04 -04:00
Peter Jones
5a73eab265 Backport a pile of fixes from the f29 tree.
Related: rhbz#1609431

Signed-off-by: Peter Jones <pjones@redhat.com>
2018-08-02 16:21:44 -04:00
Peter Jones
ad5801043f Update to newer patchset from github with more BLS fixes.
Signed-off-by: Peter Jones <pjones@redhat.com>
2018-07-31 14:14:48 -04:00
Peter Jones
5725bcd5ca Rebased to newer upstream for fedora-28
Signed-off-by: Peter Jones <pjones@redhat.com>
2018-07-09 13:34:03 -04:00
Javier Martinez Canillas
afb0baacd6
Use BLS fragment filename as menu entry id and for sort criterion
The BLS config filenames are guaranteed to be unique, so they can be
used as GRUB2 entry id and can also be used to sort the menu entries.

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
2018-07-02 17:33:09 +02:00
Javier Martinez Canillas
359c2df03d
Use /boot/loader/entries as BLS dir also on EFI systems
For EFI systems, the BLS fragments were stored in the EFI System Partition
(ESP) while in non-EFI systems it was stored in /boot.

For consistency, it's better to always store the BLS fragments in the same
path regardless of the firmware interface used.

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
2018-06-26 11:58:10 +02:00
Peter Jones
448fa56b6a Various bugfixes
- Make the release be 37 since 36 is the last one we actually built
- Squash down the changelog for that as well
- Fix some TPM errors on 32-bit (hdegoede)
- More fixups to avoid compiler changes (pjones)
- Put lsmmap into the EFI builds (pjones)
  Related: rhbz#1572126

Signed-off-by: Peter Jones <pjones@redhat.com>
2018-06-19 10:39:51 -04:00
Javier Martinez Canillas
db7cf3a089
More fixes for BLS
Add some fixes for BLS parsing logic and also make 20-grub.install script
to query the relative path of the kernel and initramfs images, so BLS can
also work when /boot is not a mount point or is a btrfs subvolume.

Also pull some build fixes.

Resolves: rhbz#1588184

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
2018-06-07 19:02:21 +02:00
Javier Martinez Canillas
67f30b6a74 Two more fixes for BLS support
- Use version field to sort BLS entries if id field isn't defined
 - Add version field to BLS fragments generated by 20-grub.install

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
2018-05-11 10:03:46 -04:00
Peter Jones
5034b2b164 A couple of fixes needed by Fedora Atomic - javierm
Signed-off-by: Peter Jones <pjones@redhat.com>
2018-04-24 10:42:11 -04:00
Peter Jones
3c4dd19ca5 Work around some issues with older automake found in CentOS.
Signed-off-by: Peter Jones <pjones@redhat.com>
2018-04-11 14:42:18 -04:00
Peter Jones
146faa5a93 Pull in some TPM fixes I missed.
Signed-off-by: Peter Jones <pjones@redhat.com>
2018-04-06 16:18:21 -04:00
Peter Jones
da1991e3f0 Enable TPM measurements
Set the default boot entry to the first entry when we're using BLS.

Signed-off-by: Peter Jones <pjones@redhat.com>
2018-04-06 15:41:46 -04:00
Peter Jones
e8e6235eab Fix for BLS paths on BIOS / non-UEFI (javierm)
Signed-off-by: Peter Jones <pjones@redhat.com>
2018-04-03 13:37:54 -04:00
Peter Jones
a77a66863f I am getting very tired of this
Signed-off-by: Peter Jones <pjones@redhat.com>
2018-03-16 16:42:01 -04:00
Peter Jones
b65b645183 Rebased to newer upstream for fedora-28
Signed-off-by: Peter Jones <pjones@redhat.com>
2018-03-16 16:41:23 -04:00
Peter Jones
dd1f245e52 I am getting tired of this
Signed-off-by: Peter Jones <pjones@redhat.com>
2018-03-16 16:08:30 -04:00
Peter Jones
d4f21da2e0 Some more minor build issues.
Signed-off-by: Peter Jones <pjones@redhat.com>
2018-03-16 15:58:52 -04:00
Peter Jones
2e4660d8c6 blscfg scripts
Install kernel-install scripts. (javierm)
Add grub2-switch-to-blscfg

Signed-off-by: Peter Jones <pjones@redhat.com>
2018-03-16 14:45:30 -04:00
Peter Jones
81987f4958 Update grub2 for f28
- Try to fix things for new compiler madness.
  I really don't know why gcc decided __attribute__((packed)) on a "typedef
  struct" should imply __attribute__((align (1))) and that it should have a
  warning that it does so.  The obvious behavior would be to keep the alignment
  of the first element unless it's used in another object or type that /also/
  hask the packed attribute.  Why should it change the default alignment at
  all?
- Merge in the BLS patches Javier and I wrote.
- Attempt to fix pmtimer initialization failures to not be super duper slow.

Signed-off-by: Peter Jones <pjones@redhat.com>
2018-02-28 09:40:44 -05:00
Peter Jones
6f1e3d5698 Dump a bunch of work-in-progress patches for now.
Signed-off-by: Peter Jones <pjones@redhat.com>
2018-01-17 17:04:51 -05:00
Peter Jones
da63b36ca7 Rebase to newer upstream and fix pmtimer.
- Rebase to current master
- Fix pmtimer calibration to not take forever to fail on kvm.

Signed-off-by: Peter Jones <pjones@redhat.com>
2018-01-17 15:41:44 -05:00
Peter Jones
307d019554 Handle xen module loading (somewhat) better
You'll still need to actually install grub2-${efiarch}-modules and then
use grub2-install to install the xen modules in /boot/grub2/,
but this should handle actually loading them from the grub config file.

Resolves: rhbz#1486002

Signed-off-by: Peter Jones <pjones@redhat.com>
2017-10-24 12:53:12 -04:00
Peter Jones
32e67a5dba Various fixups
- Put grub2-mkimage in -tools, not -tools-extra.
- Fix i686 building
- Fix ppc HFS+ usage due to /boot/efi's presence.

Signed-off-by: Peter Jones <pjones@redhat.com>
2017-08-24 14:13:44 -04:00
Peter Jones
bbc6a8998a Rebased to newer upstream for fedora-27
Signed-off-by: Peter Jones <pjones@redhat.com>
2017-08-16 11:14:30 -04:00
Peter Jones
dd84573118 Rebuild so it gets SB signed correctly.
Related: rhbz#1335533
Enable lsefi

Signed-off-by: Peter Jones <pjones@redhat.com>
2017-08-03 13:35:21 -04:00
Peter Jones
bc092b9bcd Rebased to grub 2.02 for fedora-27
Signed-off-by: Peter Jones <pjones@redhat.com>
2017-07-11 07:38:34 -04: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
475000b94d Rebased to newer upstream for fedora-26
Signed-off-by: Peter Jones <pjones@redhat.com>
2016-12-01 17:18:47 -05: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
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
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
d9747d852b Reorder some patches to prep things for pushing upstream better.
Signed-off-by: Peter Jones <pjones@redhat.com>
2016-03-04 14:25:32 -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