Commit Graph

541 Commits

Author SHA1 Message Date
Peter Jones
b8119d9104 Fix a mismerge that makes arm not boot.
Signed-off-by: Peter Jones <pjones@redhat.com>
2017-08-16 11:35:26 -04:00
Peter Jones
461d6dbacc Fix a merge error that dropped the grub.macros and grub.patches sources
Signed-off-by: Peter Jones <pjones@redhat.com>
2017-08-16 11:27:51 -04:00
Peter Jones
ecef1ed7b5 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 11:22:59 -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
4aae85d216 do-rebase: move the upstream source 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
Peter Jones
5c99bbbbf1 update do-rebase for newer git
Signed-off-by: Peter Jones <pjones@redhat.com>
2016-12-01 17:17:38 -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
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
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