diff --git a/grub2-btrfs-fix-get_root-key-comparison-failures-due-to-en.patch b/grub2-btrfs-fix-get_root-key-comparison-failures-due-to-en.patch new file mode 100644 index 0000000..c2352ed --- /dev/null +++ b/grub2-btrfs-fix-get_root-key-comparison-failures-due-to-en.patch @@ -0,0 +1,28 @@ +From 4afd0107efa6a2d9cbe6fc71c529264dc2b9fb8a Mon Sep 17 00:00:00 2001 +From: Thomas Falcon +Date: Mon, 31 Mar 2014 15:32:30 +0100 +Subject: [PATCH] btrfs: fix get_root key comparison failures due to endianness + +* grub-core/fs/btrfs.c (get_root): Convert +GRUB_BTRFS_ROOT_VOL_OBJECTID to little-endian. +--- + ChangeLog | 7 +++++++ + grub-core/fs/btrfs.c | 2 +- + 2 files changed, 8 insertions(+), 1 deletion(-) + +diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c +index 89666b6..f7b6c15 100644 +--- a/grub-core/fs/btrfs.c ++++ b/grub-core/fs/btrfs.c +@@ -1201,7 +1201,7 @@ get_root (struct grub_btrfs_data *data, struct grub_btrfs_key *key, + struct grub_btrfs_key key_out, key_in; + struct grub_btrfs_root_item ri; + +- key_in.object_id = GRUB_BTRFS_ROOT_VOL_OBJECTID; ++ key_in.object_id = grub_cpu_to_le64_compile_time (GRUB_BTRFS_ROOT_VOL_OBJECTID); + key_in.offset = 0; + key_in.type = GRUB_BTRFS_ITEM_TYPE_ROOT_ITEM; + err = lower_bound (data, &key_in, &key_out, +-- +1.8.4.5 + diff --git a/grub2.changes b/grub2.changes index c7d6c53..325c668 100644 --- a/grub2.changes +++ b/grub2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Sep 28 06:16:35 UTC 2014 - arvidjaar@gmail.com + +- fix btrfs on big endian systems (ppc/ppc64) + * add grub2-btrfs-fix-get_root-key-comparison-failures-due-to-en.patch + ------------------------------------------------------------------- Sun Sep 21 06:47:12 UTC 2014 - arvidjaar@gmail.com diff --git a/grub2.spec b/grub2.spec index 12f3c59..f4ff610 100644 --- a/grub2.spec +++ b/grub2.spec @@ -156,6 +156,7 @@ Patch44: grub2-glibc-2.20.patch Patch45: grub2-efinet-reopen-SNP-protocol-for-exclusive-use-by-grub.patch Patch46: grub2-xen-legacy-config-device-name.patch Patch47: grub2-Initialized-initrd_ctx-so-we-don-t-free-a-random-poi.patch +Patch48: grub2-btrfs-fix-get_root-key-comparison-failures-due-to-en.patch # Btrfs snapshot booting related patches Patch101: grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch Patch102: grub2-btrfs-02-export-subvolume-envvars.patch @@ -361,6 +362,7 @@ mv po/grub.pot po/%{name}.pot %patch45 -p1 %patch46 -p1 %patch47 -p1 +%patch48 -p1 %patch101 -p1 %patch102 -p1 %patch103 -p1