Skip to content

Commit

Permalink
x86: grub_build.sh: fix compilation failures on Fedora 29
Browse files Browse the repository at this point in the history
Fedora 29 (and possibly other disctributions) are nowadays coming with
very recent versions of gcc (8.x) and binutils. These will cause some
compilation error when running the 'grub_build.sh' script to create a
GRUB2 boot loader image.

Fortunately, both issues have been fixed and merged in the upstream
project. This patch modifies the build script to cherry-pick those to
the local cloned version of grub before building it.

Signed-off-by: Geoffroy Van Cutsem <geoffroy.vancutsem@intel.com>
  • Loading branch information
Geoffroy Van Cutsem authored and nashif committed Mar 12, 2019
1 parent c78c5e6 commit 0590fd5
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion boards/x86/common/scripts/build_grub.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@ prepare() {

pushd src
git checkout grub-2.02
git cherry-pick c36c2a86404f373100775305f532c09d46f3c6ce
cat << EOF | awk ' { print $1 }' | git cherry-pick -x --stdin
grub-2.02-69-gc36c2a864 yylex: Explicilty cast fprintf to void.
grub-2.02-136-g563b1da6e Fix packed-not-aligned error on GCC 8
grub-2.02-100-g842c39046 x86-64: Treat R_X86_64_PLT32 as R_X86_64_PC32
EOF
git clean -fdx
popd
}
Expand Down

0 comments on commit 0590fd5

Please sign in to comment.