Backport several patches to resolve issues with grub-probe and grub-mkconfig. Bug 522428, thanks to Coacher.

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

1 files changed, 10 insertions, 4 deletions

diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 8a2c95577061..4c4486b82794 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,6 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 2.02_beta2/0001-Makefile.util.def-Link-grub-ofpathname-with-zfs-libs.patch 760 SHA256 49cdb65403cec54be3bcffbb4a551979bbfa8f0737eb21febfa16c7c29f47d1c SHA512 e1d6ed5a268eab45d1d052d3b8eef3a4b351eea324bb81abd8afbc6e24b81326c05c7a326b6a07e98376b01a40041c31855e6ab4f567f069b08ea8edecd0f226 WHIRLPOOL cf0a3612dbd177db00345b2fb6203b60e1bcc460ad03cc5e6c34d8316ded636693132d4537adcbcb9549e2a01cb19cae346193c230324d7c7d7d049ff6a4ac85
+AUX 2.02_beta2/0002-grub-install-support-for-partitioned-partx-loop-devi.patch 1099 SHA256 87c0aab18adbf6029b2384cd3694932c94059f77ec32e13c8af6865f919adbf6 SHA512 0828036d652fdaf6c4e3a65cad023509bb6958336c373fdb518d3599f9c3259309b71f3f2d0675945205fdcc0e31d478cf357c962954b7e298456bb1c511d1be WHIRLPOOL 8012177556f98e9e94567e88e189cb9cba39282114b7aa74185dcfed768b3b77a53a6d495bac6615791993495555fe7753e31c913481f18375621cda38a56034
+AUX 2.02_beta2/0003-Fix-grub-probe-0-option.patch 1269 SHA256 84070873cc0cf254cf6c6f54d9c13593efcec5c19d8b1025d21817fcd13c4398 SHA512 109d49804d003bbc189d3d7933d97b55fbb505514f9f6d7bf9d2ffbcf53d9ff850bcc2f2b66019c1da7d02d513e7199898f1938ed888cd653a5c79460dbeaec9 WHIRLPOOL 9643047c2565a578eee3960ba4cf55d8a223d76eabe76b31658b45ad43a831954d73d5c96524f59f0d0ea80744908204342ee6880add94301313b056d0cef1d7
+AUX 2.02_beta2/0004-Fix-partmap-cryptodisk-and-abstraction-handling-in-g.patch 10395 SHA256 03e1db8686eeb7566f625b909b78fc74975c85f5bfb99dc7179529d620f32fa1 SHA512 56dbad590c6b11ff6f937677504e1bacc4f86912511718cb75129fa18fd4e274b071a32c26e07820e2cff9306797e5d0326b5099db2384d75d271d89030f20ad WHIRLPOOL 9f7b4dd99faedc5d876d60cfd5cda0f14a75dd0fa87a6fbbec38f75d120df13162cf8457e42104cbbf92e9f83fbed40391db9c804bf1782c278b098152b75803
+AUX 2.02_beta2/0005-Fix-typo-gettext_print-instead-of-gettext_printf.patch 680 SHA256 decf480d874cee3e5cd5c93144fae1646ce56981ec3fc2279e82c87c3472e8a5 SHA512 7cfabbbe8e53dadc1fbf670515bddfe8b511d06b16eca49e077e4fab88c8ccb6091aed45756a8ce0e8f59580f58fc62c6d5a350b12cbf62e3be325855891859d WHIRLPOOL c9232691110fc524977d83e4fca8437478cf246bd3ef50f9608c526623cef58cecf48842fa63f9a78bf4d3c88bfd803337d84a7167244e4afa44aaace3ee533d
 AUX grub-2.00-freetype-2.5.1.patch 752 SHA256 95ddb348097df2bdf51a36529935118ad4bb51cb780038d149ed0ae3bf0693c9 SHA512 e9d05de956364b923e01d8f71d77f05d6c0815b7ae21ec5d34875de09770ce42b52f7d410314f7e4a273256350d7cbf311cf95a5d83e469c7a83b9b69879caff WHIRLPOOL 67751eaad605cf064106f2a304657bf1fe1ea1f4bb3f6efe436f2d7e6b84e80b56327e51cff4db63a7f34e7f21a456d3c7517d6ee6da5f8f2cbd7816f34d4016
 AUX grub-2.02_beta2-libzfs.patch 612 SHA256 f2de3680168e7a88261ac3f0fab6131ad3e22ce732ce969c0dc0efbf583aaddb SHA512 17810d390c90e39df63121af4d8dd670a87703d3f589aa26edde7c7e9f8f6e88dfb93a156040062c6cfe03615126970b3b073d688b3ec52cfb6ae401ad31754c WHIRLPOOL 0f19a0684b04bd7494068686fb6596a5f7c4a2e1dc47edb21c4841342876414b5caf367c0cb777e1b42f82e8db1d8eccb20151f89c36da7050aeb9db1616ad4f
 AUX grub.conf.gentoo 627 SHA256 914b15af252210a32776196437cd8013e10e57d5780e66877ef3fe9a2b4b9776 SHA512 5ee586c151b025a153867d2854b73e2e18a6af38e9d65069b7114a55af776803ba947b4901b0806e79fa8f36aeac90daad608b9ec2a4a8526301d1beb36e4ef3 WHIRLPOOL fcaef85cd7c2c446c882874cf4ec8a2241d1fc97720973a0a0cd1add259da599d4dae4d0b429ba2dff0307ed2d4598d5939cbc1b11127a0dedb3a54249ec9f81
@@ -17,14 +22,15 @@ DIST unifont-7.0.01.pcf.gz 1358916 SHA256 7618a96ad50703213848af8ecae816828f528b
 EBUILD grub-0.97-r12.ebuild 9233 SHA256 d5486666e1f8339a8308489607c9108cd34e8ebc696a956e2ff8dafad1c71815 SHA512 332a89395331ef04654345f960f2939340ce9b47ae6ac755e54f4ecc85f6243060890e7553b515468aaffd8346bbb5a0b7fbd26d23911b847f12c557854e96f1 WHIRLPOOL 1a20c9df999954ce431ca50eaaa5651721c939229b3a55d820445620218ffa64d43ba6251e88b1df6f54163f6914265596698db513a47d3c415ccaa01b51e61d
 EBUILD grub-0.97-r13.ebuild 9384 SHA256 c694ab37f477548da2b98c9beb2c5432ddd799e40fcbf82273cd2da3fdb072e1 SHA512 615e4d11ba91c7bc2fcb926bfc791d1aa3151a06dd336f9597ccc5b22a4b6a1bbffde5f7622ec6cc4c04216c63d99becfc9cf38bcf8fed476773bd3b7930fad2 WHIRLPOOL 91d94e1f90393bb5137b791bfa2d73b418938091d81ec44b783d749ea08ee3a615a5ca4d07a841c66429f6ff7d480ae2ad4f0626576ddaab459f111106160761
 EBUILD grub-2.00_p5107-r2.ebuild 8180 SHA256 1db3f6266e63332ef89d9c32895189fee3307a5ca2f687620df43c5a9d52547a SHA512 f95264d8eff99a1dd8420d64539aef4b7eb464edc8119076af7c175fac418d0e554ee7bb0ae4edb57c3a1a5b82f32da51db6b7ffc4a9a62dc7541d3694b65faa WHIRLPOOL d1dd247120f6de17aaea2899760fd7daf3eb242a3945f6ae2c03eae71c33e3c6bb780639a030d9ba46f4b9b8f23d383fc6559306e40a82be293466ce6d6270a5
+EBUILD grub-2.02_beta2-r1.ebuild 8254 SHA256 31cb7ffb3f0b1dfeec383a51fdeb6f338cd2bebf77ee553b2f5b3ec7e9b8aa3d SHA512 d6abaaf104dc01b54d3dd1566a0892f0b2bfece90d6cd489edb80d4b056055f5443ba4c73ba0577e70ff238897ef9aedd083869e6c3e0fafb0f7a08fe9a9d35b WHIRLPOOL bb4a4307450e39192a7f44caea4082260c0c577b660f5db9527e891424f86895b75dc5aa0d8163e6f9ce76798b2b0a25ccb7eb1046c2514ada9601c9b108d409
 EBUILD grub-2.02_beta2.ebuild 8186 SHA256 b897e016bc9f2f688c502a9769c59139e310d374ba3ba25ae3826292b9d34ac8 SHA512 37884943b62a58d4bab43914392d06d04610741ac76f36228b206d394c58facc0054e0050282bb74cc83a9e5e169309fce7cc8a96998771b94999c7453c2e3f2 WHIRLPOOL 1b1fe4e0ab6605f9685e4e02fee605d0283fcae833b1558c067f7baa8e35acc39aeeefbe924bb742057664da8a14bc12c025feecdc86ba4ec874af5a545056d7
 EBUILD grub-9999-r1.ebuild 8185 SHA256 708107511c09a6ba441a4c9c2809f3ab3e838e617142d696f8e7c931febfbff7 SHA512 c7e0c34c908e3740cbe74a0f52220eef261fad2724524d0435b1eecf81ca4c606db2a0712a6174d38cd848583578f759ebbeadb33c200e3503a9d0c699d72099 WHIRLPOOL e72e1b245a493b44dfd22210e44af3e32cd0ed1797f3887130d711348381c1244568d7bca4895196e493cf4dd0664d492001aa5c0e9bd8b5e9b44e89b5e7adb1
-MISC ChangeLog 59490 SHA256 f39239ed0563e9a447f21e360a61e7e39ddd863698355e69464269fccb1ba82c SHA512 f4e123b18fc3169529cb417494a416c38a569c06cc1583ec74ff50506e4f868eefe0a6c67fdac08182f5301301cb9b6ffeed381e0be64338ac0950b321a3c9b5 WHIRLPOOL 8e1828f4e72243dfd777a41914b029aedd2f3fcd2c917f0fea0b60ad8c692b72c7d80a91ca717bc72f057e565fc7d6431278a583a448e4712e587eec1eb7cad7
+MISC ChangeLog 60113 SHA256 b0051f14e9a8a02673430ea765b763726865f6cf1501cd875c4606cd910ff5fc SHA512 59c89a0a6a2e33d5e818469590e50299f87e2d4b77616b986df6015108c87c5f8df620367b8a65debbc8fbed2e9128b21b02b94afee3d72d94dac8337e61dd2d WHIRLPOOL 7d9c624acd760b6cdb2154cae8dfff60c08278fb1a063095082e7a1d7cde99b700fd3124afcb459e89de4d123fae1eb8b9168625c77b9f51de1538231039bfa0
 MISC metadata.xml 838 SHA256 01beea9f20f03e00fdc21576a1311d3c21874980cdd57a9f2ed08a9d7cda1c46 SHA512 f6266f2f77db089d2f9289be079ef5a3637726b0906c5e96a7d8b7e29a8105cb7c48b9739f5607c0fdac2545db0e87f35132769f82b12db11a6f0018cc3c92f2 WHIRLPOOL 528d4f57ca38b0f0d4c34cd6bd60c7aeefc0fabd1e1e7be8efe0fcba04824d047a6e04288f1fbbd8e865c7435b53e84caffe7d4196809b157ee76e0d2be6f8df
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlQPWyEACgkQC77qH+pIQ6R+jwD/ahPL7al1Hx1dJPKcAs6Zo0qT
-axRwuudWQT0Kcks1UngBAIq0Y59j9ap3UyQImSfeWnJ+n9oOiCZki4rufXBMVt9x
-=mRLK
+iF4EAREIAAYFAlQPeE4ACgkQC77qH+pIQ6QflgD9FAmbZUj2OQU6wHlUDhtquAYo
+L17tGyjYLq41oxkg3G4A/ROAftbYwjjUKOPujaLMmHCWxMpu3pvMBI54Y9UBuKth
+=LpKM
 -----END PGP SIGNATURE-----