Merge branch '3.4' into 3.5

This commit is contained in:
Matt Housh 2019-03-02 11:19:06 -06:00
commit 9cf8e75a6a
2 changed files with 3 additions and 3 deletions

View File

@ -1,6 +1,6 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/YzXwo8P2M6zq1UnOOrsYSAmaBpa+f3i2uRzSFI/knDDnc6zbRVoPMVlgoSa0ZRPRXA5YN7nFosvvHZwCy6lEQM=
SHA256 (Pkgfile) = 98038cdf6bf637a2834c3ec721b6717ef80ec324c83f1ed0a50cd219cdd6bca4
RWSE3ohX2g5d/X2tq0cWpU3rEWUldMlmlZTkyZr9yupYWrizjN/kOBzGIca/SY7moPRN7rX7CF/gPkNNUMIqTJYdbw7bLK3L0ws=
SHA256 (Pkgfile) = 7900779b7facbacfe58057c389f21d08f760ce0724bb065ff3dfad9e591f4814
SHA256 (.footprint) = be3c0c176335de61fb03e01702968798c101216091640b618b61b467dcfd92d8
SHA256 (grub-2.02.tar.xz) = 810b3798d316394f94096ec2797909dbf23c858e48f7b3830826b8daa06b7b0f
SHA256 (grub2-relocation.patch) = 51562fa1016c54567dbf42a86c0cfc902372ab579bbee17879a81aff09b76b99

View File

@ -13,7 +13,7 @@ build() {
export CFLAGS="${CFLAGS} -Wno-error"
patch -d grub-$version -p1 -i $SRC/grub2-relocation.patch
patch -d grub-$version -p1 -i $SRC/grub2-xfs.patch
patch -d grub-$version -p1 -i $SRC/grub2-xfs.patch
# fix for glibc 'gets' removal
sed -i -e '/gets is a/d' grub-$version/grub-core/gnulib/stdio.in.h