Index: trunk/i386/boot2/boot.h =================================================================== --- trunk/i386/boot2/boot.h (revision 2831) +++ trunk/i386/boot2/boot.h (revision 2832) @@ -30,6 +30,7 @@ #include "libsaio.h" // OS X Versions +#define SIERRA checkOSVersion("10.12") // Sierra #define ELCAPITAN checkOSVersion("10.11") // El Capitan #define YOSEMITE checkOSVersion("10.10") // Yosemite #define MAVERICKS checkOSVersion("10.9") // Mavericks Index: trunk/i386/boot2/gui.c =================================================================== --- trunk/i386/boot2/gui.c (revision 2831) +++ trunk/i386/boot2/gui.c (revision 2832) @@ -54,7 +54,8 @@ iDeviceGeneric_o, iDeviceHFS, iDeviceHFS_o, - + iDeviceHFS_sie, + iDeviceHFS_sie_o, iDeviceHFS_cap, iDeviceHFS_cap_o, iDeviceHFS_yos, @@ -74,6 +75,8 @@ iDeviceHFSRAID, iDeviceHFSRAID_o, + iDeviceHFSRAID_sie, + iDeviceHFSRAID_sie_o, iDeviceHFSRAID_cap, iDeviceHFSRAID_cap_o, iDeviceHFSRAID_yos, @@ -94,6 +97,19 @@ iDeviceHFSRECOVERY, iDeviceHFSRECOVERY_o, + iDeviceHFSFUSION, + iDeviceHFSFUSION_o, + iDeviceHFSFUSION_sie, + iDeviceHFSFUSION_sie_o, + iDeviceHFSFUSION_cap, + iDeviceHFSFUSION_cap_o, + iDeviceHFSFUSION_yos, + iDeviceHFSFUSION_yos_o, + iDeviceHFSFUSION_mav, + iDeviceHFSFUSION_mav_o, + iDeviceHFSFUSION_ML, + iDeviceHFSFUSION_ML_o, + iDeviceEXT3, iDeviceEXT3_o, iDeviceFreeBSD, /* FreeBSD/OpenBSD detection,nawcom's code by valv, Icon credits to blackosx */ @@ -149,7 +165,8 @@ {.name = "device_generic_o", .image = NULL}, {.name = "device_hfsplus", .image = NULL}, {.name = "device_hfsplus_o", .image = NULL}, - + {.name = "device_hfsplus_sie", .image = NULL}, + {.name = "device_hfsplus_sie_o", .image = NULL}, {.name = "device_hfsplus_cap", .image = NULL}, {.name = "device_hfsplus_cap_o", .image = NULL}, {.name = "device_hfsplus_yos", .image = NULL}, @@ -169,6 +186,8 @@ {.name = "device_hfsraid", .image = NULL}, {.name = "device_hfsraid_o", .image = NULL}, + {.name = "device_hfsraid_sie", .image = NULL}, + {.name = "device_hfsraid_sie_o", .image = NULL}, {.name = "device_hfsraid_cap", .image = NULL}, {.name = "device_hfsraid_cap_o", .image = NULL}, {.name = "device_hfsraid_yos", .image = NULL}, @@ -189,6 +208,19 @@ {.name = "device_hfsplus_recovery", .image = NULL}, {.name = "device_hfsplus_recovery_o", .image = NULL}, + {.name = "device_hfsfusion", .image = NULL}, + {.name = "device_hfsfusion_o", .image = NULL}, + {.name = "device_hfsfusion_sie", .image = NULL}, + {.name = "device_hfsfusion_sie_o", .image = NULL}, + {.name = "device_hfsfusion_cap", .image = NULL}, + {.name = "device_hfsfusion_cap_o", .image = NULL}, + {.name = "device_hfsfusion_yos", .image = NULL}, + {.name = "device_hfsfusion_yos_o", .image = NULL}, + {.name = "device_hfsfusion_mav", .image = NULL}, + {.name = "device_hfsfusion_mav_o", .image = NULL}, + {.name = "device_hfsfusion_ml", .image = NULL}, + {.name = "device_hfsfusion_ml_o", .image = NULL}, + {.name = "device_ext3", .image = NULL}, {.name = "device_ext3_o", .image = NULL}, {.name = "device_freebsd", .image = NULL}, /* FreeBSD/OpenBSD detection,nawcom's code by valv, Icon credits to blackosx */ @@ -397,6 +429,8 @@ LOADPNG(device_hfsplus, iDeviceGeneric); LOADPNG(device_hfsplus_o, iDeviceHFS); + LOADPNG(device_hfsplus_sie, iDeviceHFS); + LOADPNG(device_hfsplus_sie_o, iDeviceHFS_sie); LOADPNG(device_hfsplus_cap, iDeviceHFS); LOADPNG(device_hfsplus_cap_o, iDeviceHFS_cap); LOADPNG(device_hfsplus_yos, iDeviceHFS); @@ -416,6 +450,8 @@ LOADPNG(device_hfsraid, iDeviceHFS); LOADPNG(device_hfsraid_o, iDeviceHFSRAID); + LOADPNG(device_hfsraid_sie, iDeviceHFSRAID); + LOADPNG(device_hfsraid_sie_o, iDeviceHFSRAID_sie); LOADPNG(device_hfsraid_cap, iDeviceHFSRAID); LOADPNG(device_hfsraid_cap_o, iDeviceHFSRAID_cap); LOADPNG(device_hfsraid_yos, iDeviceHFSRAID); @@ -1088,6 +1124,10 @@ devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID_cap : iDeviceHFS_cap); // El Capitan break; } + if (device->OSVersion[4] == '2') { // 10.12 + devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID_sie : iDeviceHFS_sie); // Sierra + break; + } default: devicetype = (device->flags & kBVFlagBooter ? iDeviceHFSRAID : iDeviceHFS); break; Index: trunk/i386/util/boot1-install/Makefile =================================================================== --- trunk/i386/util/boot1-install/Makefile (revision 2831) +++ trunk/i386/util/boot1-install/Makefile (revision 2832) @@ -18,7 +18,8 @@ -Wl,-no_function_starts \ -Wl,-no_data_in_code_info \ -Wl,-no_version_load_command \ --Wl,-no_uuid +-Wl,-no_uuid \ +-Wl,-no_dependent_dr_info CFLAGS := $(CFLAGS) -mmacosx-version-min=10.5 @@ -57,4 +58,4 @@ clean-local: @for o in $(OBJS); do if [ -f "$${o}" ];then echo " [RM] $${o}"; fi; done @for p in $(SYMPROG); do if [ -f "$${p}" ];then echo " [RM] $${p}"; fi; done - @rm -f $(SYMPROG) $(OBJS) \ No newline at end of file + @rm -f $(SYMPROG) $(OBJS)