diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-29 11:22:34 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-29 11:22:34 +0000 |
| commit | bd7908c6630f38067350d396ac5d18c3cc2434a0 (patch) | |
| tree | 3559b3e11424f5529527f2474d8a977a91ee3389 /sys-boot/grub | |
| parent | 8b2628ad8526c806375e7b157889e4274b70248b (diff) | |
gentoo resync : 29.10.2017
Diffstat (limited to 'sys-boot/grub')
| -rw-r--r-- | sys-boot/grub/Manifest | 2 | ||||
| -rw-r--r-- | sys-boot/grub/grub-0.97-r17.ebuild | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest index eadd66f1d43a..3ded0a767938 100644 --- a/sys-boot/grub/Manifest +++ b/sys-boot/grub/Manifest @@ -11,7 +11,7 @@ DIST grub-2.02.tar.xz 6113260 SHA256 810b3798d316394f94096ec2797909dbf23c858e48f DIST splash.xpm.gz 33856 SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf SHA512 5ae1f786f7d46a95a7061068d5b2b3ad64607c7b190d6f28379508c5dce67e26308325bfd637542a84855dfcf1ea3d143947326fdb189a6a8972208d3ead23da WHIRLPOOL d95b7b588ea8ac7c2c8c53eb8057aef21c825da6411afe3b7e864c606aeffaaebce8ae41ce3e979f277bd6b48a9e82a1f2ea8afc836213b56523d8a854227d7b DIST unifont-9.0.06.pcf.gz 1360354 SHA256 6d23e82ea3fd3d79849d675c0c30129b62a3973a83b4cdc05f9994efef773b86 SHA512 dd0a1afa72f5204c62055d83f22750c74af38ffafdb8eda8e1f1cf7292e572a14969b8a9a6a2cb336d5bed4ab633f6b5a962c59117a590e4238788959cb82774 WHIRLPOOL 3153fe2a254cffa5aac6c5915468262bf60f993ce5a2aa47885ccef2a6714e205724b01fd9d26d499b9efbc5213e3cea0037c91f17fb2ae780ee289cab0de69b EBUILD grub-0.97-r16.ebuild 9699 SHA256 03223c6cec66ca01d0ee08db83a96ef3021bca3fa2414fd862727a9ae9cade07 SHA512 0edce20bd616493dc8e83276fd89fc2b762794cc25572c4ad3cc055c1c8c209ca2d6dc6a1a90a54deb17a245f7218468f7054099d20688ebd0debf227624c057 WHIRLPOOL e58455c072c3616fc317359e6d9a6bbf69399be84e30af641530c2892b0e05dec2cd799e2f49e244700982e62666cff33ddcc4a1ec6bb1112d7fff0f3f284b2c -EBUILD grub-0.97-r17.ebuild 9281 SHA256 66a9f548b0b7e4def066a72a06b96ef3292c15c6adf9d90bade0f1552b960916 SHA512 659b416c659c023cbbbec587f1b6f2e7995016a41194905b647ebff5d0efb670bba83d468ed3b6dd01abd96f1df0c2b013f91c301e437a01e55febde7f223727 WHIRLPOOL a296fd473102bdfadb3ffd4fa8466dace236e183c815a68c9a1d8beb780ea5e20f7e1d39280f689636a6517a6f7b2c5a5997212c29e530f1dba416bbd5eac9d3 +EBUILD grub-0.97-r17.ebuild 9504 SHA256 7f0b3a6205e6ead2c6ce94eaa471e71a31d9a456071d92b2abe06426fe91e809 SHA512 baca5041b77495ba37d0d43e0f8bddc52a61dd176185c1e88d7f2592795a6efb3183661d2433d9fafdf50ee5cf4e5537fbb1a22431f4fe1195f61a3773bfb133 WHIRLPOOL bd0f098de5a91e50c661258d948f55c29b581a6a11abb05ab558b8fcea9eb6bc1e748ecd1b9a994c9e0a3b0a767517dc60cde974b8b29255d34d54a4108e2787 EBUILD grub-2.02.ebuild 7597 SHA256 ada3921a987f213615b625b6d97491c1d33448f700410413d411a1d95a04660e SHA512 d3aa7a602989d0eee9c48ddd527253099cfb81887171c69add1f83fea36bac295147fc11cd9cdd2c06410670c435cf1c3f20303660675aa936668b04178cb8ba WHIRLPOOL f7032a2a33a7a571f15b99d02ba59bd30582e531a7330932d1d860485f83569fef9ef8bb5f16759691744fdfb28c6fb12bd24f64c82481281739289ae0da170d EBUILD grub-9999.ebuild 7599 SHA256 dda50136976d84a46106a3e6b6ffb657c2094a44d44e520b31c1654cc54b32a6 SHA512 cfb7ffc4a2d94d0ceaaf6fa63d6c587b8c35488c3f00cc667073926a00c90044c58e94f69e53d765b13ea792f7e79e49b59529ad2788460367259ad2524bd410 WHIRLPOOL fc8b0d52d2d7659fc1594f2ed07661bcc2edf52db8c9b3fa3d20dcd756e65002812cffac281149728d2e6e58f621fe0fb8cda082ba6946024a3a909d7ff4a002 MISC ChangeLog 14166 SHA256 fd94eac2c96265c94e4fd203e094dd6f8985ab3146103f313b647aab5ea76814 SHA512 eeea31f9e358370b12e81075308271fe2ae64d6e84b2828261d1c74577fafdd33b412f0d0faa784a0fbd502481ae3619d2320542b49e06a3b6bd0c11c90a1d6d WHIRLPOOL 2732342665c419b0b6f5d8c75b888437cf73600857c30d06f2c39342f64055db79a2de7e4015827bca82ad6d3f0b16532bf6adab6f1e89a3c12e0e2f06556141 diff --git a/sys-boot/grub/grub-0.97-r17.ebuild b/sys-boot/grub/grub-0.97-r17.ebuild index 038a541f8795..b34191f7346d 100644 --- a/sys-boot/grub/grub-0.97-r17.ebuild +++ b/sys-boot/grub/grub-0.97-r17.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # XXX: we need to review menu.lst vs grub.conf handling. We've been converting @@ -67,6 +67,13 @@ src_prepare() { "${S}"/grub/asmstub.c \ || die + # gcc-6 and above doesnt have a '-nopie' option patched in, use upstream's -no-pie + if (( $(gcc-major-version) > 5 )); then + sed -i 's/-nopie/-no-pie/' \ + "${WORKDIR}"/patch/860_all_grub-0.97-pie.patch \ + || die + fi + EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch # bug 564890, 566638 epatch "${FILESDIR}"/grub-0.97-Add-esp-to-list-of-clobbered-registers.patch |