rpms/grub2
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
676 Commits 33 Branches 35 Tags 28 MiB
9c910dfa10
Commit Graph

501 Commits

Author SHA1 Message Date
Peter Jones
ce0f493268 Rebased to newer upstream for fedora-29 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2018-07-16 15:54:21 -04:00
Peter Jones
e08eb33a57 Revert broken moduledir fix *again*. 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2018-07-13 10:16:42 -04:00
Peter Jones
321567331b Fix our linuxefi/linux comand reunion 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2018-07-12 23:20:02 -04:00
Peter Jones
bfa240db6a Turn off armv7hl again until I can make the rest of the builds work 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2018-07-12 11:06:07 -04:00
Peter Jones
a52365a0df Port several fixes from the F28 tree and a WIP tree. 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2018-07-11 16:49:50 -04:00
Peter Jones
cee2256e1c Fix some places where f28 and f29 .spec diverged 
This is just to make diffing to make sure I haven't missed anything easier.

Signed-off-by: Peter Jones <pjones@redhat.com>
 2018-07-11 15:40:00 -04:00
Peter Jones
752ceb1640 Rebased to newer upstream for fedora-29 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2018-07-10 15:12:02 -04:00
Peter Jones
dd0009ec4d Enable 32-bit ARM EFI builds. 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2018-07-10 15:12:02 -04:00
Igor Gnatenko
15eb78a25c add BuildRequires: gcc 
Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot
 2018-07-09 19:06:46 +02:00
Peter Jones
63f1a982b9 Various fixups (gcc 8, xfs, UEFI https) 
Fixups to work with gcc 8
Experimental https boot support on UEFI
XFS fixes for sparse inode support
  Resolves: rhbz#1575797

Signed-off-by: Peter Jones <pjones@redhat.com>
 2018-05-16 11:15:49 -04:00
Javier Martinez Canillas
dc178ac546 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:13:07 -04:00
Peter Jones
a8d8dcf190 A couple of fixes needed by Fedora Atomic - javierm 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2018-05-11 10:13:05 -04:00
Peter Jones
578b4d713f Put the os-prober dep back in - we need to change test plans and criteria 
before it can go.
  Resolves: rhbz#1569411

Signed-off-by: Peter Jones <pjones@redhat.com>
 2018-05-11 10:13:04 -04:00
Peter Jones
fb3328442e Work around some issues with older automake found in CentOS. 
Make multiple initramfs images work in BLS.

Signed-off-by: Peter Jones <pjones@redhat.com>
 2018-04-11 14:47:38 -04:00
Peter Jones
c789522f7c Work around some issues with older automake found in CentOS. 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2018-04-11 14:43:48 -04:00
Javier Martinez Canillas
ed50db379d Make 20-grub.install to generate debug BLS when MAKEDEBUG is set 
If MAKEDEBUG=yes in /etc/sysconfig/kernel, then a debug menu entry should
be created. So for BLS, a debug configuration file has to be created that
contains debug kernel command line parameters.

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
 2018-04-11 10:11:27 -04:00
Peter Jones
4fd69fdbcd Pull in some TPM fixes I missed. 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2018-04-06 16:19:11 -04:00
Peter Jones
0bcec266a0 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:42:49 -04:00
Peter Jones
78e1a10ec4 Add grub2-switch-to-blscfg 
Fix for BLS paths on BIOS / non-UEFI (javierm)

Signed-off-by: Peter Jones <pjones@redhat.com>
 2018-04-03 13:41:24 -04:00
Benjamin Pereto
d73e0cbe7e FIX: broken rpm build introduced in 61faef, which fails with "missing directory for 20-grubby.install" 2018-04-02 07:47:39 -07:00
Javier Martinez Canillas
61faef65b2 Add kernel-install scripts 
Install a 20-grubby.install and 90-loaderentry.install kernel-install
scripts in /etc/kernel/install.d so these have higher precedence than
the ones installed in /usr/lib/kernel/install.d by the systemd pkg.

If GRUB 2 pkg isn't installed, then the systemd scripts are executed
on kernel installation and removal.

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
 2018-03-14 17:09:34 -04:00
Peter Jones
06b68a8c94 Build the blscfg module in on EFI builds. 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2018-03-06 14:47:22 -05:00
Peter Jones
ec4acbbd98 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 10:08:00 -05:00
Igor Gnatenko
38305f23ff
Remove %clean section 
None of currently supported distributions need that.
Last one was EL5 which is EOL for a while.

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
 2018-02-14 08:05:13 +01:00
Igor Gnatenko
8bbfda8a06
Escape macros in %changelog 
Reference: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/Y2ZUKK2B7T2IKXPMODNF6HB2O5T5TS6H/
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
 2018-02-09 09:04:38 +01:00
Peter Jones
8b3d200862 Fix a merge error from 2.02-21 that affected kernel loading on Aarch64. 
Fix a merge error from 2.02-21 that affected kernel loading on Aarch64.
Related: rhbz#1519311
Related: rhbz#1506704
Related: rhbz#1502312

Signed-off-by: Peter Jones <pjones@redhat.com>
 2018-01-23 16:35:31 -05:00
Peter Jones
d51395ea7f Update our gcc nerfing. 
- Only nerf annobin, not -fstack-crash-protection.
- Fix a conflict on /boot/efi directory permissions between -cdboot and the
  normal bootloader.

Signed-off-by: Peter Jones <pjones@redhat.com>
 2018-01-19 13:17:09 -05:00
Peter Jones
28076bb004 Nerf some new gcc 'features' 
For now, completely nerf annobin and -fstack-clash-protection; at least
one of those things makes grubx64.efi crash on start.

Signed-off-by: Peter Jones <pjones@redhat.com>
 2018-01-18 18:23:41 -05:00
Peter Jones
a91fed7f66 Fix some efi modules bugs 
- Fix grub2-efi-modules provides/obsoletes generation
  Resolves: rhbz#1506704
- *Also* build grub-efi-ia32{,-*,!-modules} packages for i686 builds
  Resolves: rhbz#1502312

Signed-off-by: Peter Jones <pjones@redhat.com>
 2018-01-18 14:14:19 -05:00
Peter Jones
8cceee7ebe Make everything under /boot/efi be mode 0700, since that's what FAT will 
show anyway.

Signed-off-by: Peter Jones <pjones@redhat.com>
 2018-01-18 14:12:52 -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
e1f4c0ec1e Make grub2-efi-aa64 provide grub2 
I'm not sure this is 100% the right place to do this - maybe it should
go in anaconda - but it seems most expedient :/

Resolves: rhbz#1491045

Signed-off-by: Peter Jones <pjones@redhat.com>
 2017-09-20 15:28:42 -04:00
Dennis Gilmore
8887fc70b1 bump for Obsoletes again 
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
 2017-09-11 12:39:02 -05:00
Peter Jones
b52a729921 Fix Obsoletes on grub2-pc 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2017-09-06 18:26:03 -04:00
Petr Šabata
50a9c3a2b3 Limit the pattern matching in do_alt_efi_install to files 
This unbreaks module builds that contain the ".module" string in their
dist tags.

Signed-off-by: Petr Šabata <contyk@redhat.com>
 2017-08-30 11:03:41 -04:00
Peter Jones
7849a868f2 Revert the /usr/lib/.build-id/ change 
Revert the /usr/lib/.build-id/ change:
  https://fedoraproject.org/wiki/Changes/ParallelInstallableDebuginfo
  says (without any particularly convincing reasoning):
    The main build-id file should not be in the debuginfo file, but in the
    main package (this was always a problem since the package and debuginfo
    package installed might not match). If we want to make usr/lib/debug/ a
    network resource then we will need to move the symlink to another
    location (maybe /usr/lib/.build-id).
  So do it that way.  Of course it doesn't matter, because exclude gets
  ignored due to implementation details.

Signed-off-by: Peter Jones <pjones@redhat.com>
 2017-08-25 16:40:58 -04:00
Peter Jones
152cdcd6f5 Minor updates to provides and excludes 
Add some unconditional Provides:
  grub2-efi on grub2-efi-${arch}
  grub2-efi-cdboot on grub2-efi-${arch}-cdboot
  grub2 on all grub2-${arch} pacakges
Something is somehow adding /usr/lib/.build-id/... to all the -tools
  subpackages, so exclude all that.

Signed-off-by: Peter Jones <pjones@redhat.com>
 2017-08-25 13:31:34 -04:00
Peter Jones
1300d7b633 Fix arm kernel command line allocation 
Resolves: rhbz#1484609
Get rid of the temporary extra efi packages hack.

Signed-off-by: Peter Jones <pjones@redhat.com>
 2017-08-24 14:10:08 -04:00
Peter Jones
53a4172ac4 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-23 17:05:03 -04:00
Peter Jones
71e0fb4ea6 Put grub2-mkimage in -tools, not -tools-extra. 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2017-08-22 11:14:37 -04:00
Peter Jones
31ea67e0aa Add the .img files into grub2-pc-modules (and all legacy variants) 
autoqa is seeing a failure that looks like:

13:50:17,909 INF program: grub2-install: error: cannot open `/usr/lib/grub/i386-pc/lzma_decompress.img': No such file or directory.

And it's because the .img files are currently excluded.  So put them
back.

Signed-off-by: Peter Jones <pjones@redhat.com>
 2017-08-18 17:36:01 -04:00
Peter Jones
3619a3f545 Simplify some of the macros a bit. 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2017-08-17 13:28:53 -04:00
Peter Jones
41c1671979 Actually fix the configure usage and the gcc -E weirdness. 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2017-08-17 13:28:53 -04:00
Peter Jones
dcee992d1c Fix some build failures. 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2017-08-16 17:04:58 -04:00
Peter Jones
35d1684777 Make a temporary grub2-efi package on 64-bit efi arches. 
This makes it so we can build grub2 with the changes before anaconda and
lorax are fixed.

Signed-off-by: Peter Jones <pjones@redhat.com>
 2017-08-16 15:05:31 -04:00
Peter Jones
345233e0e5 fix grubenv once more... 2017-08-16 15:05:26 -04:00
Peter Jones
9d2fddcf46 Fix a merge error that dropped the grub.macros and grub.patches sources 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2017-08-16 15:05:12 -04:00
Peter Jones
b50565e33e Make ia32 work as well. 
- make it work with rpm-4.13.90
- split up the packages for various arch targets so ia32 can work

Signed-off-by: Peter Jones <pjones@redhat.com>
 2017-08-16 15:05:12 -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
47f2daf5df Rebuild again with new fixed rpm. (bug #1480407) 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2017-08-15 15:08:31 -04:00
Kevin Fenzi
21962f5359 Rebuild again with new fixed rpm. (bug #1480407) 2017-08-11 08:59:07 -07:00
Kevin Fenzi
e3cdc195c4 Rebuild for rpm soname bump again 2017-08-10 14:47:43 -07:00
Igor Gnatenko
5e05dbf1e6 Rebuilt for RPM soname bump 
Signed-off-by: Igor Gnatenko <ignatenko@redhat.com>
 2017-08-10 20:24:55 +02:00
Peter Jones
73823ebf7d Undo those last two - something is going wrong with fedpkg locally. 
Somehow the wrong version is getting built, and I'm quite confused as to
why:

trillian:~/devel/fedora/grub2/master$ fedpkg build
/usr/lib/python2.7/site-packages/fedora/client/bodhi.py:48: DeprecationWarning: fedora.client.bodhi has been deprecated. Please use bodhi.client.bindings instead.
  DeprecationWarning)
Building grub2-2.02-3.fc27 for rawhide

         ^^^^^^^^^^^^^^^^^ looks correct

Created task: 21022413
Task info: https://koji.fedoraproject.org/koji/taskinfo?taskID=21022413
Watching tasks (this may be safely interrupted)...
21022413 build (rawhide, /rpms/grub2:bf8e18bc1df80b77e218e3e673f9e3f8f2116542): free
21022413 build (rawhide, /rpms/grub2:bf8e18bc1df80b77e218e3e673f9e3f8f2116542): free -> open (buildvm-aarch64-01.arm.fedoraproject.org)
  21022414 buildSRPMFromSCM (/rpms/grub2:bf8e18bc1df80b77e218e3e673f9e3f8f2116542): free
  21022414 buildSRPMFromSCM (/rpms/grub2:bf8e18bc1df80b77e218e3e673f9e3f8f2116542): free -> open (buildvm-aarch64-01.arm.fedoraproject.org)
  21022414 buildSRPMFromSCM (/rpms/grub2:bf8e18bc1df80b77e218e3e673f9e3f8f2116542): open (buildvm-aarch64-01.arm.fedoraproject.org) -> closed
  0 free  1 open  1 done  0 failed
  21022475 buildArch (grub2-2.02-0.25.fc27.src.rpm, i686): free

                      ^^^^^^^^^^^^^^^^^^^^ does not look correct

So I'm trying from a fresh checkout instead.

Signed-off-by: Peter Jones <pjones@redhat.com>
 2017-08-03 15:06:42 -04:00
Peter Jones
1f054ac587 Try even harder to make it look like the scratch build that worked... 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2017-08-03 14:50:49 -04:00
Peter Jones
9322a748fe For some reason build-ids are breaking aarch64 (again.) 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2017-08-03 14:30:15 -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
Michael Cronenworth
7495404bba Fix symlink to work on both EFI and BIOS machines, Resolves: rhbz#1335533 
Signed-off-by: Michael Cronenworth <mike@cchtml.com>
 2017-07-24 09:13:47 -05: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
39d46ea780 Fix deps that should have moved to -tools but didn't. 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2017-07-11 07:38:34 -04:00
Peter Jones
6d8e18dbc8 Fix some old deps that should have moved to -tools 
Signed-off-by: Peter Jones <pjones@redhat.com>
 2017-07-11 07:38:34 -04:00
Stephen Gallagher
eea0c02ae7
Add missing %%license macro 2017-02-01 20:12:10 -05:00
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