Author: kmoore
Date: Wed Dec 3 15:31:18 2014
New Revision: 373838
URL: https://svnweb.freebsd.org/changeset/ports/373838
QAT: https://qat.redports.org/buildarchive/r373838/
Log:
- Add patch which allows GRUB to use the freebsd-boot type in addition
to the specific bios-boot type that GRUB already uses
- Bump PORTREV
Submitted by: Kevin Lo <kevlo@>
Added:
head/sysutils/grub2-efi/files/patch-grub-core_partmap_gpt.c (contents, props changed)
head/sysutils/grub2-efi/files/patch-include_grub_gpt_partition.h (contents, props changed)
head/sysutils/grub2-pcbsd/files/patch-grub-core_partmap_gpt.c (contents, props changed)
head/sysutils/grub2-pcbsd/files/patch-include_grub_gpt_partition.h (contents, props changed)
Modified:
head/sysutils/grub2-efi/Makefile
head/sysutils/grub2-pcbsd/Makefile
Modified: head/sysutils/grub2-efi/Makefile
==============================================================================
--- head/sysutils/grub2-efi/Makefile Wed Dec 3 15:30:50 2014 (r373837)
+++ head/sysutils/grub2-efi/Makefile Wed Dec 3 15:31:18 2014 (r373838)
@@ -3,7 +3,7 @@
PORTNAME= grub2-efi
PORTVERSION= 2.02
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= sysutils
MASTER_SITES= http://www.pcbsd.org/~kris/software/ \
ftp://ftp.pcbsd.org/pub/software/
Added: head/sysutils/grub2-efi/files/patch-grub-core_partmap_gpt.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/grub2-efi/files/patch-grub-core_partmap_gpt.c Wed Dec 3 15:31:18 2014 (r373838)
@@ -0,0 +1,20 @@
+--- grub-core/partmap/gpt.c.orig 2014-12-02 14:37:43.000000000 +0800
++++ grub-core/partmap/gpt.c 2014-12-02 14:37:49.000000000 +0800
+@@ -37,6 +37,7 @@
+
+ #ifdef GRUB_UTIL
+ static const grub_gpt_part_type_t grub_gpt_partition_type_bios_boot = GRUB_GPT_PARTITION_TYPE_BIOS_BOOT;
++static const grub_gpt_part_type_t grub_gpt_partition_type_freebsd_boot = GRUB_GPT_PARTITION_TYPE_FREEBSD_BOOT;
+ #endif
+
+ /* 512 << 7 = 65536 byte sectors. */
+@@ -155,7 +156,8 @@
+ disk->partition = p2;
+
+ /* If there's an embed region, it is in a dedicated partition. */
+- if (! grub_memcmp (&gptdata.type, &grub_gpt_partition_type_bios_boot, 16))
++ if (! grub_memcmp (&gptdata.type, &grub_gpt_partition_type_bios_boot, 16) ||
++ ! grub_memcmp (&gptdata.type, &grub_gpt_partition_type_freebsd_boot, 16))
+ {
+ ctx->start = p->start;
+ ctx->len = p->len;
Added: head/sysutils/grub2-efi/files/patch-include_grub_gpt_partition.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/grub2-efi/files/patch-include_grub_gpt_partition.h Wed Dec 3 15:31:18 2014 (r373838)
@@ -0,0 +1,17 @@
+--- include/grub/gpt_partition.h.orig 2014-12-02 14:32:40.000000000 +0800
++++ include/grub/gpt_partition.h 2014-12-02 14:35:03.000000000 +0800
+@@ -43,6 +43,14 @@
+ { 0x74, 0x4e, 0x65, 0x65, 0x64, 0x45, 0x46, 0x49 } \
+ }
+
++#define GRUB_GPT_PARTITION_TYPE_FREEBSD_BOOT \
++ { grub_cpu_to_le32_compile_time (0x83bd6b9d), \
++ grub_cpu_to_le16_compile_time (0x7f41), \
++ grub_cpu_to_le16_compile_time (0x11dc), \
++ { 0xbe, 0x0b, 0x00, 0x15, 0x60, 0xb8, 0x4f, 0x0f } \
++ }
++
++
+ #define GRUB_GPT_PARTITION_TYPE_LDM \
+ { grub_cpu_to_le32_compile_time (0x5808C8AAU),\
+ grub_cpu_to_le16_compile_time (0x7E8F), \
Modified: head/sysutils/grub2-pcbsd/Makefile
==============================================================================
--- head/sysutils/grub2-pcbsd/Makefile Wed Dec 3 15:30:50 2014 (r373837)
+++ head/sysutils/grub2-pcbsd/Makefile Wed Dec 3 15:31:18 2014 (r373838)
@@ -3,7 +3,7 @@
PORTNAME= grub2-pcbsd
PORTVERSION= 2.02p
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= sysutils
MASTER_SITES= http://www.pcbsd.org/~kris/software/ \
ftp://ftp.pcbsd.org/pub/software/
Added: head/sysutils/grub2-pcbsd/files/patch-grub-core_partmap_gpt.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/grub2-pcbsd/files/patch-grub-core_partmap_gpt.c Wed Dec 3 15:31:18 2014 (r373838)
@@ -0,0 +1,20 @@
+--- grub-core/partmap/gpt.c.orig 2014-12-02 14:37:43.000000000 +0800
++++ grub-core/partmap/gpt.c 2014-12-02 14:37:49.000000000 +0800
+@@ -37,6 +37,7 @@
+
+ #ifdef GRUB_UTIL
+ static const grub_gpt_part_type_t grub_gpt_partition_type_bios_boot = GRUB_GPT_PARTITION_TYPE_BIOS_BOOT;
++static const grub_gpt_part_type_t grub_gpt_partition_type_freebsd_boot = GRUB_GPT_PARTITION_TYPE_FREEBSD_BOOT;
+ #endif
+
+ /* 512 << 7 = 65536 byte sectors. */
+@@ -155,7 +156,8 @@
+ disk->partition = p2;
+
+ /* If there's an embed region, it is in a dedicated partition. */
+- if (! grub_memcmp (&gptdata.type, &grub_gpt_partition_type_bios_boot, 16))
++ if (! grub_memcmp (&gptdata.type, &grub_gpt_partition_type_bios_boot, 16) ||
++ ! grub_memcmp (&gptdata.type, &grub_gpt_partition_type_freebsd_boot, 16))
+ {
+ ctx->start = p->start;
+ ctx->len = p->len;
Added: head/sysutils/grub2-pcbsd/files/patch-include_grub_gpt_partition.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/grub2-pcbsd/files/patch-include_grub_gpt_partition.h Wed Dec 3 15:31:18 2014 (r373838)
@@ -0,0 +1,17 @@
+--- include/grub/gpt_partition.h.orig 2014-12-02 14:32:40.000000000 +0800
++++ include/grub/gpt_partition.h 2014-12-02 14:35:03.000000000 +0800
+@@ -43,6 +43,14 @@
+ { 0x74, 0x4e, 0x65, 0x65, 0x64, 0x45, 0x46, 0x49 } \
+ }
+
++#define GRUB_GPT_PARTITION_TYPE_FREEBSD_BOOT \
++ { grub_cpu_to_le32_compile_time (0x83bd6b9d), \
++ grub_cpu_to_le16_compile_time (0x7f41), \
++ grub_cpu_to_le16_compile_time (0x11dc), \
++ { 0xbe, 0x0b, 0x00, 0x15, 0x60, 0xb8, 0x4f, 0x0f } \
++ }
++
++
+ #define GRUB_GPT_PARTITION_TYPE_LDM \
+ { grub_cpu_to_le32_compile_time (0x5808C8AAU),\
+ grub_cpu_to_le16_compile_time (0x7E8F), \