Permalink
Browse files

Remove grub-9999, apply patches from Debian/Ubuntu to grub-1.99

  • Loading branch information...
1 parent d4485f8 commit 475f16ab2706da1be09d23d8bc4050c930c932b1 @pendor committed Feb 1, 2012
View
@@ -0,0 +1 @@
+.DS_Store
View
@@ -1,11 +1,9 @@
-AUX defaults 1020 RMD160 48ce6914d693bef9db7f41afecb92c18715ffb7f SHA1 af556abd7deb0d0939f4766df265aa6882707cbe SHA256 302a0cfa6e1f6acf52f5d558cd03f3631313a4b95de038f10f740439ea0a921f
-AUX grub-1.99-noman.patch 389 RMD160 1811a47d32a0db18a7e3793907184a9261fec905 SHA1 cb4568b5f3c90de2b6a649e6350995dc53792be3 SHA256 75c971604320eb4cd416fea70f4aed2dde9ed3570097e83a121b88654386df2b
-AUX grub-1.99-zfs.patch 5638 RMD160 7f0b6352cc4f6e45dbbef47f9b7153f4837f0bf6 SHA1 067f1cc883090ffa8101393e4d58c37fa3eee2cd SHA256 bbce9f68c89aecae301a6490c51b660ce062fbe7d30c8d5fc0c68441f9884918
-AUX grub-9999-ashift-uber-dva.patch 21393 RMD160 54ef90ca8f73e163fe1975f886ddd62f6f6adf5b SHA1 f02d46248c66af9429952a61d50c973e758f00e4 SHA256 f4e077ba1c6761fa011061c492be60fc2c93dbadba55f70b253fa110fc92c84e
-AUX grub-9999-fzap.patch 1258 RMD160 13c5c99be264ba29ee0bbdfbce5a64206fb3fff5 SHA1 f828fa8fc4f9c136c98885763ad758fa7a1a8cf8 SHA256 b0f04b6d15e89cf38edcc2e591bac27e65845cc351cf9cfbe34ddc52a900e90d
-AUX grub-9999-zfs.patch 5257 RMD160 c4190fbbbfea5167634111a7bc32979ee3cb5f27 SHA1 5754f6289325b2dec3f43f3c8f3f42d35448abde SHA256 af9e97a4e1a87ab91747de7efeed88bfbf25b2bbe47e93e75576561f31035865
+AUX defaults 1084 RMD160 eff18488d6c5f81cad26409f86559894231dc95f SHA1 da8c5b4bf13aa3bb6be6aa726047eda447de7302 SHA256 b5aaf02de3f0755206aba1159adf3799b6a6a8e31b40bd22c0d31fd6f0b578fa
+AUX grub-1.99-010-zfs_packed_la_array.patch 461 RMD160 1007f4d2679903a7bdf8c53f6fe2fc240678e16e SHA1 97fce6bc412d2603f0e3d90eb7315cf6c06f2976 SHA256 69896f57ffcfd1c839f6ce97f3829e400de985fcc98e07fe35311d65759cdb75
+AUX grub-1.99-020-zfs_update.patch 67773 RMD160 9c7bf77797f0bc6212970793f460e18e84371019 SHA1 1db0ec4bcef7c5f90507500c03fb0814260ad060 SHA256 0d31453b3e84126d5c321d1eb9616415f996d208f64b82cf67b147b619b45146
+AUX grub-1.99-029-noman.patch 389 RMD160 1811a47d32a0db18a7e3793907184a9261fec905 SHA1 cb4568b5f3c90de2b6a649e6350995dc53792be3 SHA256 75c971604320eb4cd416fea70f4aed2dde9ed3570097e83a121b88654386df2b
+AUX grub-1.99-030-zfs_gentoo_build.patch 5734 RMD160 c1c5cdc18c64ac4158473069a95fd77278b32a26 SHA1 1cb032bab6114c79b7d39ffeb24aad6126e24d41 SHA256 a872f63d4cb5a8a38651396cbc0350a07a0d807d7f8fd831c4942141ca24135c
DIST grub-1.99.tar.gz 4652619 RMD160 63293381ac2ed2479ac65896d4744b866e6d216c SHA1 6d0536da38224e7caf94cf2531a5f921ac057b9b SHA256 b91f420f2c51f6155e088e34ff99bea09cc1fb89585cf7c0179644e57abd28ff
-EBUILD grub-1.99_rc99.ebuild 3577 RMD160 5d2ad3b10039c8b313e96cffeda3e6ecd14240ea SHA1 5d25f4430e09342d04890eefc24655828e5c8e4f SHA256 ae6d855cb26a352767c276b585ecaccd275e78a7c89220c5aa86a0d4a3f88ab8
-EBUILD grub-9999.ebuild 3377 RMD160 07e4c8b83fd0bbe2b41da65d521776847fa00783 SHA1 6a6ecb348918c7df1c3e64805453a83b6aa6599d SHA256 c43e465f57fa661699232b4cde744b31af01bd416e750bee5cde4fa0423ac048
+EBUILD grub-1.99_rc99.ebuild 3716 RMD160 005aa8362840abab78b382e456fbff897f832427 SHA1 f5db082e0c053a8499b8685181aa0042283b826c SHA256 895dee3c8c4297dbf1889a2d31065a97207f3535195d5a4cbc34d8608a1c0a75
MISC ChangeLog 32184 RMD160 cb5f9988222ca5c0863aeb8980c7af8bfc7a21e2 SHA1 fa7d47a4d285901741f6ce161834f54121ad69d0 SHA256 d4b46649f4090ede0d27e9d4f3a7d937f9da648c75182f3b4d1e82f37bf96313
-MISC metadata.xml 349 RMD160 8e5ecd3c757f94fbccafc8120f4c8a04567135b4 SHA1 3ff0251dbb2863c4fbf0913b901bc27ed73a1acd SHA256 fcb983296ee1568339772668bcf236db0a24aabba6c328343d7bdb790978cbb9
+MISC metadata.xml 419 RMD160 76f326a6b390ad00e5f7c4a484e0ee4a4d7507ce SHA1 c7459038a43cb3387411af36fcbf1cb6c4124eaa SHA256 91815fc021b6bb0708cc9f19fe4e70184c504dd80f92b527182a321133821cfa
@@ -22,6 +22,9 @@ GRUB_CMDLINE_LINUX=""
# note that you can use only modes which your graphic card supports via VBE
# you can see them in real GRUB with the command `vbeinfo'
#GRUB_GFXMODE=640x480
+#GRUB_GFXPAYLOAD_LINUX=1024x768x16
+
+#GRUB_DISABLE_RECOVERY=true
# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to Linux
#GRUB_DISABLE_LINUX_UUID=true
@@ -0,0 +1,17 @@
+2011-08-03 Robert Millan <rmh@gnu.org>
+
+ * include/grub/zfs/zap_leaf.h (typedef union zap_leaf_chunk): Mark
+ la_array as packed.
+ Reported by: Zachary Bedell
+
+--- a/include/grub/zfs/zap_leaf.h
++++ b/include/grub/zfs/zap_leaf.h
+@@ -90,7 +90,7 @@
+ {
+ grub_uint8_t la_array[ZAP_LEAF_ARRAY_BYTES];
+ grub_uint64_t la_array64;
+- };
++ } __attribute__ ((packed));
+ grub_uint16_t la_next; /* next blk or CHAIN_END */
+ } l_array;
+ struct zap_leaf_free {
Oops, something went wrong.

0 comments on commit 475f16a

Please sign in to comment.