From fc762f03b3054d402091fd64deb5547892f0d380 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Wed, 25 Apr 2018 12:10:19 +0100 Subject: [PATCH] version 1.3 * Fix F2FS packing bug and other potential issues linked to packing --- 0000-GRUB-fixes-for-MSVC.patch | 166 +++++++++++++++++++++++++++------ ChangeLog.txt | 6 ++ EfiFsPkg.dec | 4 +- EfiFsPkg.dsc | 4 +- EfiFsPkg/Affs.inf | 2 +- EfiFsPkg/Afs.inf | 2 +- EfiFsPkg/Bfs.inf | 2 +- EfiFsPkg/Btrfs.inf | 2 +- EfiFsPkg/Cbfs.inf | 2 +- EfiFsPkg/Cpio.inf | 2 +- EfiFsPkg/CpioBe.inf | 2 +- EfiFsPkg/ExFat.inf | 2 +- EfiFsPkg/Ext2.inf | 2 +- EfiFsPkg/F2fs.inf | 2 +- EfiFsPkg/Fat.inf | 2 +- EfiFsPkg/Hfs.inf | 2 +- EfiFsPkg/HfsPlus.inf | 2 +- EfiFsPkg/Iso9660.inf | 2 +- EfiFsPkg/Jfs.inf | 2 +- EfiFsPkg/Minix.inf | 2 +- EfiFsPkg/Minix2.inf | 2 +- EfiFsPkg/Minix2Be.inf | 2 +- EfiFsPkg/Minix3.inf | 2 +- EfiFsPkg/Minix3Be.inf | 2 +- EfiFsPkg/MinixBe.inf | 2 +- EfiFsPkg/NewC.inf | 2 +- EfiFsPkg/NilFs2.inf | 2 +- EfiFsPkg/Ntfs.inf | 2 +- EfiFsPkg/Odc.inf | 2 +- EfiFsPkg/ProcFs.inf | 2 +- EfiFsPkg/ReiserFs.inf | 2 +- EfiFsPkg/RomFs.inf | 2 +- EfiFsPkg/Sfs.inf | 2 +- EfiFsPkg/SquashFs.inf | 2 +- EfiFsPkg/Tar.inf | 2 +- EfiFsPkg/Udf.inf | 2 +- EfiFsPkg/Ufs.inf | 2 +- EfiFsPkg/Ufs2.inf | 2 +- EfiFsPkg/UfsBe.inf | 2 +- EfiFsPkg/Xfs.inf | 2 +- EfiFsPkg/Zfs.inf | 2 +- debug.vbs | 1 + edk2_build_all_drivers.cmd | 2 +- grub | 2 +- src/driver.h | 4 +- 45 files changed, 190 insertions(+), 73 deletions(-) diff --git a/0000-GRUB-fixes-for-MSVC.patch b/0000-GRUB-fixes-for-MSVC.patch index 5e86cd8..1e43d17 100644 --- a/0000-GRUB-fixes-for-MSVC.patch +++ b/0000-GRUB-fixes-for-MSVC.patch @@ -1,40 +1,45 @@ -From 4be36971af43b4ce24d73338deecb6b8508745d0 Mon Sep 17 00:00:00 2001 +From aa95de270929a8932884cff75d54f9347bdd76bd Mon Sep 17 00:00:00 2001 From: Pete Batard -Date: Wed, 11 Apr 2018 11:22:40 +1000 +Date: Tue, 24 Apr 2018 00:55:25 +0100 Subject: [PATCH] GRUB fixes for MSVC --- grub-core/fs/affs.c | 2 ++ grub-core/fs/bfs.c | 2 ++ - grub-core/fs/btrfs.c | 16 ++++++++++----- - grub-core/fs/fat.c | 8 ++++++-- + grub-core/fs/btrfs.c | 16 +++++++++----- + grub-core/fs/f2fs.c | 2 ++ + grub-core/fs/fat.c | 8 +++++-- grub-core/fs/hfs.c | 6 ++++++ grub-core/fs/hfsplus.c | 2 ++ grub-core/fs/hfspluscomp.c | 5 +++++ - grub-core/fs/iso9660.c | 36 ++++++++++++++++++++++----------- + grub-core/fs/iso9660.c | 36 ++++++++++++++++++++----------- grub-core/fs/jfs.c | 2 ++ grub-core/fs/nilfs2.c | 4 +++- grub-core/fs/ntfs.c | 2 ++ - grub-core/fs/reiserfs.c | 16 ++++++++++++++- + grub-core/fs/reiserfs.c | 16 +++++++++++++- grub-core/fs/sfs.c | 4 +++- grub-core/fs/udf.c | 2 ++ grub-core/fs/ufs.c | 2 ++ - grub-core/fs/xfs.c | 3 +++ + grub-core/fs/xfs.c | 2 ++ grub-core/fs/zfs/zfs.c | 4 ++-- + grub-core/fs/zfs/zfs_lz4.c | 2 ++ grub-core/kern/misc.c | 6 +++--- grub-core/lib/minilzo/lzodefs.h | 3 +++ include/grub/arm64/types.h | 4 ++++ include/grub/btrfs.h | 3 +++ + include/grub/exfat.h | 2 ++ + include/grub/fat.h | 2 ++ include/grub/hfs.h | 2 ++ include/grub/hfsplus.h | 6 ++++++ include/grub/misc.h | 10 +++++++++ include/grub/ntfs.h | 2 ++ include/grub/term.h | 4 ++-- - include/grub/types.h | 36 +++++++++++++++++++++++---------- + include/grub/types.h | 38 +++++++++++++++++++++++---------- + include/grub/unicode.h | 2 ++ include/grub/x86_64/types.h | 2 +- - include/grub/zfs/zap_leaf.h | 17 +++++++++++++--- + include/grub/zfs/zap_leaf.h | 17 ++++++++++++--- include/grub/zfs/zio.h | 2 ++ - 30 files changed, 169 insertions(+), 44 deletions(-) + 35 files changed, 180 insertions(+), 44 deletions(-) diff --git a/grub-core/fs/affs.c b/grub-core/fs/affs.c index f673897e0..84247ca9f 100644 @@ -77,7 +82,7 @@ index d2b490bce..8d78fd6c2 100644 struct grub_bfs_data { diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c -index be195448d..ba8c3c77d 100644 +index be195448d..65ceda7da 100644 --- a/grub-core/fs/btrfs.c +++ b/grub-core/fs/btrfs.c @@ -48,6 +48,7 @@ GRUB_MOD_LICENSE ("GPLv3+"); @@ -112,14 +117,14 @@ index be195448d..ba8c3c77d 100644 struct grub_btrfs_leaf_descriptor { -@@ -177,6 +181,7 @@ struct grub_btrfs_time - grub_uint32_t nanosec; - } GRUB_PACKED; +@@ -171,6 +175,7 @@ struct grub_btrfs_leaf_descriptor + } *data; + }; +PRAGMA_BEGIN_PACKED - struct grub_btrfs_inode + struct grub_btrfs_time { - grub_uint8_t dummy1[0x10]; + grub_int64_t sec; @@ -205,6 +210,7 @@ struct grub_btrfs_extent_data }; }; @@ -164,6 +169,26 @@ index be195448d..ba8c3c77d 100644 &stripen); stripen *= nsubstripes; redundancy = nsubstripes; +diff --git a/grub-core/fs/f2fs.c b/grub-core/fs/f2fs.c +index 1cad2615f..35c822ce0 100644 +--- a/grub-core/fs/f2fs.c ++++ b/grub-core/fs/f2fs.c +@@ -131,6 +131,7 @@ enum FILE_TYPE + F2FS_FT_SYMLINK = 7 + }; + ++PRAGMA_BEGIN_PACKED + struct grub_f2fs_superblock + { + grub_uint32_t magic; +@@ -281,6 +282,7 @@ struct grub_f2fs_node + }; + grub_uint8_t dummy[40]; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + struct grub_fshelp_node + { diff --git a/grub-core/fs/fat.c b/grub-core/fs/fat.c index 8d8dc35ce..f3b571760 100644 --- a/grub-core/fs/fat.c @@ -623,18 +648,10 @@ index 293f027aa..3babbce5f 100644 /* Information about a "mounted" ufs filesystem. */ struct grub_ufs_data diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c -index c6031bd3f..98bd44d07 100644 +index c6031bd3f..373deb146 100644 --- a/grub-core/fs/xfs.c +++ b/grub-core/fs/xfs.c -@@ -59,6 +59,7 @@ GRUB_MOD_LICENSE ("GPLv3+"); - XFS_SB_VERSION_DIRV2BIT | \ - XFS_SB_VERSION_MOREBITSBIT) - -+PRAGMA_BEGIN_PACKED - /* Recognized xfs format versions */ - #define XFS_SB_VERSION_4 4 /* Good old XFS filesystem */ - #define XFS_SB_VERSION_5 5 /* CRC enabled filesystem */ -@@ -84,6 +85,7 @@ GRUB_MOD_LICENSE ("GPLv3+"); +@@ -84,6 +84,7 @@ GRUB_MOD_LICENSE ("GPLv3+"); (XFS_SB_FEAT_INCOMPAT_FTYPE | \ XFS_SB_FEAT_INCOMPAT_META_UUID) @@ -642,7 +659,7 @@ index c6031bd3f..98bd44d07 100644 struct grub_xfs_sblock { grub_uint8_t magic[4]; -@@ -200,6 +202,7 @@ struct grub_xfs_dirblock_tail +@@ -200,6 +201,7 @@ struct grub_xfs_dirblock_tail grub_uint32_t leaf_count; grub_uint32_t leaf_stale; } GRUB_PACKED; @@ -672,6 +689,26 @@ index 6e1fff9e9..b1589a031 100644 chunk != CHAIN_END; chunk = grub_zfs_to_cpu16 (le->le_next, endian)) { +diff --git a/grub-core/fs/zfs/zfs_lz4.c b/grub-core/fs/zfs/zfs_lz4.c +index 5453822d0..873445803 100644 +--- a/grub-core/fs/zfs/zfs_lz4.c ++++ b/grub-core/fs/zfs/zfs_lz4.c +@@ -74,6 +74,7 @@ static int LZ4_uncompress_unknownOutputSize(const char *source, char *dest, + #define S32 grub_int32_t + #define U64 grub_uint64_t + ++PRAGMA_BEGIN_PACKED + typedef struct _U16_S { + U16 v; + } GRUB_PACKED U16_S; +@@ -83,6 +84,7 @@ typedef struct _U32_S { + typedef struct _U64_S { + U64 v; + } GRUB_PACKED U64_S; ++PRAGMA_END_PACKED + + #define A64(x) (((U64_S *)(x))->v) + #define A32(x) (((U32_S *)(x))->v) diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c index 3b633d51f..1eed48883 100644 --- a/grub-core/kern/misc.c @@ -760,6 +797,46 @@ index 9d93fb6c1..f62312c04 100644 struct grub_btrfs_root_backref +diff --git a/include/grub/exfat.h b/include/grub/exfat.h +index 2b8009cee..b7654d0aa 100644 +--- a/include/grub/exfat.h ++++ b/include/grub/exfat.h +@@ -21,6 +21,7 @@ + + #include + ++PRAGMA_BEGIN_PACKED + struct grub_exfat_bpb + { + grub_uint8_t jmp_boot[3]; +@@ -42,6 +43,7 @@ struct grub_exfat_bpb + grub_uint8_t num_ph_drive; + grub_uint8_t reserved[8]; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + #ifdef GRUB_UTIL + #include +diff --git a/include/grub/fat.h b/include/grub/fat.h +index 8d7e4a1e5..bf4441479 100644 +--- a/include/grub/fat.h ++++ b/include/grub/fat.h +@@ -21,6 +21,7 @@ + + #include + ++PRAGMA_BEGIN_PACKED + struct grub_fat_bpb + { + grub_uint8_t jmp_boot[3]; +@@ -66,6 +67,7 @@ struct grub_fat_bpb + } GRUB_PACKED fat32; + } GRUB_PACKED version_specific; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + #ifdef GRUB_UTIL + #include diff --git a/include/grub/hfs.h b/include/grub/hfs.h index d935f5005..beeca5df5 100644 --- a/include/grub/hfs.h @@ -898,7 +975,7 @@ index 8117e2a24..f87c0d022 100644 static inline struct grub_term_coordinate diff --git a/include/grub/types.h b/include/grub/types.h -index b93e48201..395a3bf0d 100644 +index b93e48201..63ba96426 100644 --- a/include/grub/types.h +++ b/include/grub/types.h @@ -26,10 +26,20 @@ @@ -974,6 +1051,39 @@ index b93e48201..395a3bf0d 100644 typedef struct grub_unaligned_uint16 grub_unaligned_uint16_t; typedef struct grub_unaligned_uint32 grub_unaligned_uint32_t; +@@ -306,10 +320,12 @@ static inline grub_uint64_t grub_get_unaligned64 (const void *ptr) + + static inline void grub_set_unaligned64 (void *ptr, grub_uint64_t val) + { ++ PRAGMA_BEGIN_PACKED + struct grub_unaligned_uint64_t + { + grub_uint64_t d; + } GRUB_PACKED; ++ PRAGMA_END_PACKED + struct grub_unaligned_uint64_t *dd = (struct grub_unaligned_uint64_t *) ptr; + dd->d = val; + } +diff --git a/include/grub/unicode.h b/include/grub/unicode.h +index a0403e91f..5984982fe 100644 +--- a/include/grub/unicode.h ++++ b/include/grub/unicode.h +@@ -29,6 +29,7 @@ struct grub_unicode_bidi_pair + grub_uint32_t replace; + }; + ++PRAGMA_BEGIN_PACKED + struct grub_unicode_compact_range + { + unsigned start:21; +@@ -38,6 +39,7 @@ struct grub_unicode_compact_range + unsigned bidi_mirror:1; + unsigned join_type:3; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + /* Old-style Arabic shaping. Used for "visual UTF-8" and + in grub-mkfont to find variant glyphs in absence of GPOS tables. */ diff --git a/include/grub/x86_64/types.h b/include/grub/x86_64/types.h index 0bbdc6d01..eefa80847 100644 --- a/include/grub/x86_64/types.h diff --git a/ChangeLog.txt b/ChangeLog.txt index a179a7c..acaa530 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,6 +1,12 @@ For detailed information about the changes below, please see the git log or visit: https://github.com/pbatard/efifs +v1.3 (2018.04.25) +* Fix F2FS driver bug (MSVC only) that was introduced in v1.2 +* Remove custom EDK2 patches for VS2017 and ARM/ARM64 support (now integrated upstream) +* Remove custom GRUB patches for F2FS support (now integrated upstream) +* Update GRUB and gnu-efi to latest + v1.2 (2017.11.14) * Add EDK2 compilation support * Add Visual Studio 2017 ARM64 compilation support diff --git a/EfiFsPkg.dec b/EfiFsPkg.dec index 6c1e18e..e44b187 100644 --- a/EfiFsPkg.dec +++ b/EfiFsPkg.dec @@ -1,7 +1,7 @@ ## @file # EfiFs Package # -# Copyright (c) 2017, Pete Batard +# Copyright (c) 2017-2018, Pete Batard # ## @@ -10,7 +10,7 @@ PACKAGE_NAME = EfiFsPkg PACKAGE_UNI_FILE = EfiFsPkg.uni PACKAGE_GUID = D65E40B8-BC4B-4625-9E5C-17C5726C39C3 - PACKAGE_VERSION = 1.2 + PACKAGE_VERSION = 1.3 [UserExtensions.TianoCore."ExtraFiles"] EfiFsPkgExtra.uni diff --git a/EfiFsPkg.dsc b/EfiFsPkg.dsc index 18b747f..163a897 100644 --- a/EfiFsPkg.dsc +++ b/EfiFsPkg.dsc @@ -1,14 +1,14 @@ ## @file # EfiFs Driver Modules # -# Copyright (c) 2017, Pete Batard +# Copyright (c) 2017-2018, Pete Batard # ## [Defines] PLATFORM_NAME = EfiFs PLATFORM_GUID = 700d6096-1578-409e-a6c7-9acdf9f565b3 - PLATFORM_VERSION = 1.2 + PLATFORM_VERSION = 1.3 DSC_SPECIFICATION = 0x00010005 SUPPORTED_ARCHITECTURES = IA32|X64|EBC|ARM|AARCH64 OUTPUT_DIRECTORY = Build/EfiFs diff --git a/EfiFsPkg/Affs.inf b/EfiFsPkg/Affs.inf index 553e154..a26ebba 100644 --- a/EfiFsPkg/Affs.inf +++ b/EfiFsPkg/Affs.inf @@ -8,7 +8,7 @@ BASE_NAME = affs FILE_GUID = BD873114-A318-48C4-AEF9-6C9E43A50FFA MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.2 + VERSION_STRING = 1.3 EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 ENTRY_POINT = FSDriverInstall diff --git a/EfiFsPkg/Afs.inf b/EfiFsPkg/Afs.inf index 7c89e4b..1c09287 100644 --- a/EfiFsPkg/Afs.inf +++ b/EfiFsPkg/Afs.inf @@ -8,7 +8,7 @@ BASE_NAME = afs FILE_GUID = DEFE2F9E-38C4-4278-AB7D-3BCC7B3C9292 MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.2 + VERSION_STRING = 1.3 EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 ENTRY_POINT = FSDriverInstall diff --git a/EfiFsPkg/Bfs.inf b/EfiFsPkg/Bfs.inf index 461643a..cb2221a 100644 --- a/EfiFsPkg/Bfs.inf +++ b/EfiFsPkg/Bfs.inf @@ -8,7 +8,7 @@ BASE_NAME = bfs FILE_GUID = 7686EACB-461E-417F-BB6B-0C5DBA8B4087 MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.2 + VERSION_STRING = 1.3 EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 ENTRY_POINT = FSDriverInstall diff --git a/EfiFsPkg/Btrfs.inf b/EfiFsPkg/Btrfs.inf index ff07370..e1215b3 100644 --- a/EfiFsPkg/Btrfs.inf +++ b/EfiFsPkg/Btrfs.inf @@ -8,7 +8,7 @@ BASE_NAME = btrfs FILE_GUID = E4FD4F23-5515-434C-9F19-59CA8B122825 MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.2 + VERSION_STRING = 1.3 EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 ENTRY_POINT = FSDriverInstall diff --git a/EfiFsPkg/Cbfs.inf b/EfiFsPkg/Cbfs.inf index 64b48aa..cbcbbda 100644 --- a/EfiFsPkg/Cbfs.inf +++ b/EfiFsPkg/Cbfs.inf @@ -8,7 +8,7 @@ BASE_NAME = cbfs FILE_GUID = DEEC0FF0-64AE-4B2D-A9D1-87057258854C MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.2 + VERSION_STRING = 1.3 EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 ENTRY_POINT = FSDriverInstall diff --git a/EfiFsPkg/Cpio.inf b/EfiFsPkg/Cpio.inf index 1195f64..718923c 100644 --- a/EfiFsPkg/Cpio.inf +++ b/EfiFsPkg/Cpio.inf @@ -8,7 +8,7 @@ BASE_NAME = cpio FILE_GUID = FE902772-06CD-40E4-B35B-0E760C5E9C1A MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.2 + VERSION_STRING = 1.3 EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 ENTRY_POINT = FSDriverInstall diff --git a/EfiFsPkg/CpioBe.inf b/EfiFsPkg/CpioBe.inf index f5a82ea..70204ff 100644 --- a/EfiFsPkg/CpioBe.inf +++ b/EfiFsPkg/CpioBe.inf @@ -8,7 +8,7 @@ BASE_NAME = cpio_be FILE_GUID = A3853AE0-E77D-405E-8A75-16333DE1632C MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.2 + VERSION_STRING = 1.3 EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 ENTRY_POINT = FSDriverInstall diff --git a/EfiFsPkg/ExFat.inf b/EfiFsPkg/ExFat.inf index 5b0a2e1..e52dc59 100644 --- a/EfiFsPkg/ExFat.inf +++ b/EfiFsPkg/ExFat.inf @@ -8,7 +8,7 @@ BASE_NAME = exfat FILE_GUID = 2920E524-AD21-499E-9F4A-466BFDC3BFFB MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.2 + VERSION_STRING = 1.3 EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 ENTRY_POINT = FSDriverInstall diff --git a/EfiFsPkg/Ext2.inf b/EfiFsPkg/Ext2.inf index 28eeb9f..1b618a8 100644 --- a/EfiFsPkg/Ext2.inf +++ b/EfiFsPkg/Ext2.inf @@ -8,7 +8,7 @@ BASE_NAME = ext2 FILE_GUID = 7DDA7772-B8F5-4859-9DBA-0D6F2DBA4AF1 MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.2 + VERSION_STRING = 1.3 EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 ENTRY_POINT = FSDriverInstall diff --git a/EfiFsPkg/F2fs.inf b/EfiFsPkg/F2fs.inf index 5b84b69..22106c9 100644 --- a/EfiFsPkg/F2fs.inf +++ b/EfiFsPkg/F2fs.inf @@ -8,7 +8,7 @@ BASE_NAME = f2fs FILE_GUID = 3D1F4906-3509-4DD4-8850-70033DE336E4 MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.2 + VERSION_STRING = 1.3 EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 ENTRY_POINT = FSDriverInstall diff --git a/EfiFsPkg/Fat.inf b/EfiFsPkg/Fat.inf index b996493..f13b8f3 100644 --- a/EfiFsPkg/Fat.inf +++ b/EfiFsPkg/Fat.inf @@ -8,7 +8,7 @@ BASE_NAME = fat FILE_GUID = B9E0C839-BF75-4889-82FF-214BED41BA47 MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.2 + VERSION_STRING = 1.3 EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 ENTRY_POINT = FSDriverInstall diff --git a/EfiFsPkg/Hfs.inf b/EfiFsPkg/Hfs.inf index 944fbc3..e0febee 100644 --- a/EfiFsPkg/Hfs.inf +++ b/EfiFsPkg/Hfs.inf @@ -8,7 +8,7 @@ BASE_NAME = hfs FILE_GUID = BB57B5D8-F6DE-481C-9B08-C779B0F33E25 MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.2 + VERSION_STRING = 1.3 EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 ENTRY_POINT = FSDriverInstall diff --git a/EfiFsPkg/HfsPlus.inf b/EfiFsPkg/HfsPlus.inf index ce68451..1ea0c7e 100644 --- a/EfiFsPkg/HfsPlus.inf +++ b/EfiFsPkg/HfsPlus.inf @@ -8,7 +8,7 @@ BASE_NAME = hfsplus FILE_GUID = EE593365-0635-44FC-AF28-DB98B63FDBC6 MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.2 + VERSION_STRING = 1.3 EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 ENTRY_POINT = FSDriverInstall diff --git a/EfiFsPkg/Iso9660.inf b/EfiFsPkg/Iso9660.inf index ecc3edc..3997048 100644 --- a/EfiFsPkg/Iso9660.inf +++ b/EfiFsPkg/Iso9660.inf @@ -8,7 +8,7 @@ BASE_NAME = iso9660 FILE_GUID = EFBE987A-A33B-4EE4-B2B5-35DEDC28A5E9 MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.2 + VERSION_STRING = 1.3 EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 ENTRY_POINT = FSDriverInstall diff --git a/EfiFsPkg/Jfs.inf b/EfiFsPkg/Jfs.inf index b2fbcec..7f12028 100644 --- a/EfiFsPkg/Jfs.inf +++ b/EfiFsPkg/Jfs.inf @@ -8,7 +8,7 @@ BASE_NAME = jfs FILE_GUID = E87CF4E3-318E-4B5F-98B9-A6B47414506D MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.2 + VERSION_STRING = 1.3 EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 ENTRY_POINT = FSDriverInstall diff --git a/EfiFsPkg/Minix.inf b/EfiFsPkg/Minix.inf index af28272..2b34981 100644 --- a/EfiFsPkg/Minix.inf +++ b/EfiFsPkg/Minix.inf @@ -8,7 +8,7 @@ BASE_NAME = minix FILE_GUID = 16CE8469-1586-4CE0-B90C-88D049A2967B MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.2 + VERSION_STRING = 1.3 EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 ENTRY_POINT = FSDriverInstall diff --git a/EfiFsPkg/Minix2.inf b/EfiFsPkg/Minix2.inf index 042f5f3..b5b8fac 100644 --- a/EfiFsPkg/Minix2.inf +++ b/EfiFsPkg/Minix2.inf @@ -8,7 +8,7 @@ BASE_NAME = minix2 FILE_GUID = 0AF860D2-4089-496A-AB51-2F28730E5CF6 MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.2 + VERSION_STRING = 1.3 EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 ENTRY_POINT = FSDriverInstall diff --git a/EfiFsPkg/Minix2Be.inf b/EfiFsPkg/Minix2Be.inf index 5885d86..93376d3 100644 --- a/EfiFsPkg/Minix2Be.inf +++ b/EfiFsPkg/Minix2Be.inf @@ -8,7 +8,7 @@ BASE_NAME = minix2_be FILE_GUID = 0974F29A-42B5-4B32-A9E6-7BB42BE57B84 MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.2 + VERSION_STRING = 1.3 EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 ENTRY_POINT = FSDriverInstall diff --git a/EfiFsPkg/Minix3.inf b/EfiFsPkg/Minix3.inf index 85317b3..ecd1509 100644 --- a/EfiFsPkg/Minix3.inf +++ b/EfiFsPkg/Minix3.inf @@ -8,7 +8,7 @@ BASE_NAME = minix3 FILE_GUID = 8DE9E73E-B120-49AA-960B-FC18FCEAAB3A MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.2 + VERSION_STRING = 1.3 EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 ENTRY_POINT = FSDriverInstall diff --git a/EfiFsPkg/Minix3Be.inf b/EfiFsPkg/Minix3Be.inf index db4b2b7..95b0ffd 100644 --- a/EfiFsPkg/Minix3Be.inf +++ b/EfiFsPkg/Minix3Be.inf @@ -8,7 +8,7 @@ BASE_NAME = minix3_be FILE_GUID = 9C3DB9FC-7B1A-4534-B5B9-C21E56EE7BA6 MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.2 + VERSION_STRING = 1.3 EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 ENTRY_POINT = FSDriverInstall diff --git a/EfiFsPkg/MinixBe.inf b/EfiFsPkg/MinixBe.inf index 7e39382..3a4e73a 100644 --- a/EfiFsPkg/MinixBe.inf +++ b/EfiFsPkg/MinixBe.inf @@ -8,7 +8,7 @@ BASE_NAME = minix_be FILE_GUID = 5B677870-CF38-4892-AF77-AA5C9695DFBB MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.2 + VERSION_STRING = 1.3 EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 ENTRY_POINT = FSDriverInstall diff --git a/EfiFsPkg/NewC.inf b/EfiFsPkg/NewC.inf index 1fc5f0c..8acaec3 100644 --- a/EfiFsPkg/NewC.inf +++ b/EfiFsPkg/NewC.inf @@ -8,7 +8,7 @@ BASE_NAME = newc FILE_GUID = 5C0F70A7-DC33-4A82-9056-924E83E33F01 MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.2 + VERSION_STRING = 1.3 EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 ENTRY_POINT = FSDriverInstall diff --git a/EfiFsPkg/NilFs2.inf b/EfiFsPkg/NilFs2.inf index c74f22c..7d81dcc 100644 --- a/EfiFsPkg/NilFs2.inf +++ b/EfiFsPkg/NilFs2.inf @@ -8,7 +8,7 @@ BASE_NAME = nilfs2 FILE_GUID = E6BCED0B-96E0-4BD7-AF96-65467ABAAC6E MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.2 + VERSION_STRING = 1.3 EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 ENTRY_POINT = FSDriverInstall diff --git a/EfiFsPkg/Ntfs.inf b/EfiFsPkg/Ntfs.inf index fbefe22..2e52f18 100644 --- a/EfiFsPkg/Ntfs.inf +++ b/EfiFsPkg/Ntfs.inf @@ -8,7 +8,7 @@ BASE_NAME = ntfs FILE_GUID = 80FB68D4-7C52-4AFE-A91E-D3DDADB5C54F MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.2 + VERSION_STRING = 1.3 EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 ENTRY_POINT = FSDriverInstall diff --git a/EfiFsPkg/Odc.inf b/EfiFsPkg/Odc.inf index 9a02624..a6bb8f3 100644 --- a/EfiFsPkg/Odc.inf +++ b/EfiFsPkg/Odc.inf @@ -8,7 +8,7 @@ BASE_NAME = odc FILE_GUID = FC117DCB-B369-46B7-A84E-E34EF821756C MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.2 + VERSION_STRING = 1.3 EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 ENTRY_POINT = FSDriverInstall diff --git a/EfiFsPkg/ProcFs.inf b/EfiFsPkg/ProcFs.inf index 29c8608..299a633 100644 --- a/EfiFsPkg/ProcFs.inf +++ b/EfiFsPkg/ProcFs.inf @@ -8,7 +8,7 @@ BASE_NAME = procfs FILE_GUID = 4F59B6B8-8FED-41B4-A970-CCBAF0F684DF MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.2 + VERSION_STRING = 1.3 EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 ENTRY_POINT = FSDriverInstall diff --git a/EfiFsPkg/ReiserFs.inf b/EfiFsPkg/ReiserFs.inf index 75292d2..6161990 100644 --- a/EfiFsPkg/ReiserFs.inf +++ b/EfiFsPkg/ReiserFs.inf @@ -8,7 +8,7 @@ BASE_NAME = reiserfs FILE_GUID = 8B20B75F-5AAB-4839-A5F2-2843653BDEFF MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.2 + VERSION_STRING = 1.3 EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 ENTRY_POINT = FSDriverInstall diff --git a/EfiFsPkg/RomFs.inf b/EfiFsPkg/RomFs.inf index 001daad..a4d8aac 100644 --- a/EfiFsPkg/RomFs.inf +++ b/EfiFsPkg/RomFs.inf @@ -8,7 +8,7 @@ BASE_NAME = romfs FILE_GUID = A57C00D8-2766-4DDF-AC8D-BAC89472F255 MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.2 + VERSION_STRING = 1.3 EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 ENTRY_POINT = FSDriverInstall diff --git a/EfiFsPkg/Sfs.inf b/EfiFsPkg/Sfs.inf index 0f131f3..7ad962a 100644 --- a/EfiFsPkg/Sfs.inf +++ b/EfiFsPkg/Sfs.inf @@ -8,7 +8,7 @@ BASE_NAME = sfs FILE_GUID = 0093FDD4-86D8-457C-82C9-2832321BB8B5 MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.2 + VERSION_STRING = 1.3 EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 ENTRY_POINT = FSDriverInstall diff --git a/EfiFsPkg/SquashFs.inf b/EfiFsPkg/SquashFs.inf index 751b91b..4c9764f 100644 --- a/EfiFsPkg/SquashFs.inf +++ b/EfiFsPkg/SquashFs.inf @@ -8,7 +8,7 @@ BASE_NAME = squash4 FILE_GUID = F85516B3-FEAD-4D5B-9E4A-9A476ABA65CA MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.2 + VERSION_STRING = 1.3 EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 ENTRY_POINT = FSDriverInstall diff --git a/EfiFsPkg/Tar.inf b/EfiFsPkg/Tar.inf index 564458e..11e1c7b 100644 --- a/EfiFsPkg/Tar.inf +++ b/EfiFsPkg/Tar.inf @@ -8,7 +8,7 @@ BASE_NAME = tar FILE_GUID = 5FA5BB28-C228-48BC-BEED-4137E56B5C32 MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.2 + VERSION_STRING = 1.3 EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 ENTRY_POINT = FSDriverInstall diff --git a/EfiFsPkg/Udf.inf b/EfiFsPkg/Udf.inf index fb817e2..1865700 100644 --- a/EfiFsPkg/Udf.inf +++ b/EfiFsPkg/Udf.inf @@ -8,7 +8,7 @@ BASE_NAME = udf FILE_GUID = 3E1C5997-2AED-4A6C-A8BF-07882633D1FB MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.2 + VERSION_STRING = 1.3 EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 ENTRY_POINT = FSDriverInstall diff --git a/EfiFsPkg/Ufs.inf b/EfiFsPkg/Ufs.inf index 11afad4..78af2f9 100644 --- a/EfiFsPkg/Ufs.inf +++ b/EfiFsPkg/Ufs.inf @@ -8,7 +8,7 @@ BASE_NAME = ufs1 FILE_GUID = CFC9DAEA-DBB4-4A5A-8034-D0ABF2849DF3 MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.2 + VERSION_STRING = 1.3 EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 ENTRY_POINT = FSDriverInstall diff --git a/EfiFsPkg/Ufs2.inf b/EfiFsPkg/Ufs2.inf index 9745e7a..9b180e7 100644 --- a/EfiFsPkg/Ufs2.inf +++ b/EfiFsPkg/Ufs2.inf @@ -8,7 +8,7 @@ BASE_NAME = ufs2 FILE_GUID = 15ED2F4C-1EB8-4B4F-826B-73D83EDAA449 MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.2 + VERSION_STRING = 1.3 EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 ENTRY_POINT = FSDriverInstall diff --git a/EfiFsPkg/UfsBe.inf b/EfiFsPkg/UfsBe.inf index 859e57b..c75abc9 100644 --- a/EfiFsPkg/UfsBe.inf +++ b/EfiFsPkg/UfsBe.inf @@ -8,7 +8,7 @@ BASE_NAME = ufs1_be FILE_GUID = F3B03ADF-0595-483C-BF15-0C39A444345C MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.2 + VERSION_STRING = 1.3 EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 ENTRY_POINT = FSDriverInstall diff --git a/EfiFsPkg/Xfs.inf b/EfiFsPkg/Xfs.inf index 6345ffa..2c0e132 100644 --- a/EfiFsPkg/Xfs.inf +++ b/EfiFsPkg/Xfs.inf @@ -8,7 +8,7 @@ BASE_NAME = xfs FILE_GUID = 8F56A526-1566-442F-9D7F-3E704772B75A MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.2 + VERSION_STRING = 1.3 EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 ENTRY_POINT = FSDriverInstall diff --git a/EfiFsPkg/Zfs.inf b/EfiFsPkg/Zfs.inf index a376a84..d666313 100644 --- a/EfiFsPkg/Zfs.inf +++ b/EfiFsPkg/Zfs.inf @@ -8,7 +8,7 @@ BASE_NAME = zfs FILE_GUID = 0F6A96E7-0F76-4947-90DB-D4FD7A7E6147 MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.2 + VERSION_STRING = 1.3 EDK_RELEASE_VERSION = 0x00020000 EFI_SPECIFICATION_VERSION = 0x00020000 ENTRY_POINT = FSDriverInstall diff --git a/debug.vbs b/debug.vbs index d6bcb1a..5ab5a38 100644 --- a/debug.vbs +++ b/debug.vbs @@ -9,6 +9,7 @@ ' Modify these variables as needed QEMU_PATH = "C:\Program Files\qemu\" ' You can add something like "-S -gdb tcp:127.0.0.1:1234" if you plan to use gdb to debug +' You can also use '-serial file:serial.log' instead of '-serial vc' to send output to a file QEMU_OPTS = "-nodefaults -vga std -serial vc" ' Set to True if you need to download a file that might be cached locally NO_CACHE = False diff --git a/edk2_build_all_drivers.cmd b/edk2_build_all_drivers.cmd index c66c254..09642d6 100644 --- a/edk2_build_all_drivers.cmd +++ b/edk2_build_all_drivers.cmd @@ -2,7 +2,7 @@ @echo off setlocal enabledelayedexpansion -set EDK2_PATH=C:\edk2 +set EDK2_PATH=D:\edk2 set EFIFS_PATH=%~dp0 rem cd /d "%~dp0" diff --git a/grub b/grub index 71f9e4a..51be337 160000 --- a/grub +++ b/grub @@ -1 +1 @@ -Subproject commit 71f9e4ac44142af52c3fc1860436cf9e432bf764 +Subproject commit 51be3372ec8ba07ef68a409956ea0eefa89fe7c5 diff --git a/src/driver.h b/src/driver.h index 01fcc97..c446a6b 100644 --- a/src/driver.h +++ b/src/driver.h @@ -1,6 +1,6 @@ /* fs_driver.h - Wrapper for standalone EFI filesystem drivers */ /* - * Copyright © 2014-2017 Pete Batard + * Copyright © 2014-2018 Pete Batard * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -100,7 +100,7 @@ /* Driver version */ #define FS_DRIVER_VERSION_MAJOR 1 -#define FS_DRIVER_VERSION_MINOR 2 +#define FS_DRIVER_VERSION_MINOR 3 #ifndef ARRAYSIZE #define ARRAYSIZE(A) (sizeof(A)/sizeof((A)[0]))