diff --git a/.github/workflows/windows_msvc_edk2.yml b/.github/workflows/windows_msvc_edk2.yml index 0687411..f1c5ba9 100644 --- a/.github/workflows/windows_msvc_edk2.yml +++ b/.github/workflows/windows_msvc_edk2.yml @@ -26,8 +26,8 @@ on: env: BUILD_TYPE: RELEASE - COMPILER: VS2019 - NASM_URL: https://www.nasm.us/pub/nasm/releasebuilds/2.16/win64/nasm-2.16-win64.zip + COMPILER: VS2022 + NASM_URL: https://www.nasm.us/pub/nasm/releasebuilds/2.16.03/win64/nasm-2.16.03-win64.zip jobs: build: diff --git a/.vs/zfs.vcxproj b/.vs/zfs.vcxproj index 5f76d76..ca53459 100644 --- a/.vs/zfs.vcxproj +++ b/.vs/zfs.vcxproj @@ -162,7 +162,7 @@ - $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir)\grub\grub-core\lib\libgcrypt\src;$(SolutionDir) + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir)\grub\grub-core\lib\zstd;$(SolutionDir)\grub\grub-core\lib\libgcrypt\src;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir) _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ZFS";EXTRAMODULE=gzio;%(PreprocessorDefinitions) false CompileAsC @@ -190,7 +190,7 @@ - $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\ia32;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir)\grub\grub-core\lib\libgcrypt\src;$(SolutionDir) + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir)\grub\grub-core\lib\zstd;$(SolutionDir)\grub\grub-core\lib\libgcrypt\src;$(SolutionDir)\gnu-efi\inc\ia32;$(SolutionDir) _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ZFS";EXTRAMODULE=gzio;%(PreprocessorDefinitions) false CompileAsC @@ -219,7 +219,7 @@ - $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\arm;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir)\grub\grub-core\lib\libgcrypt\src;$(SolutionDir) + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir)\grub\grub-core\lib\zstd;$(SolutionDir)\grub\grub-core\lib\libgcrypt\src;$(SolutionDir)\gnu-efi\inc\arm;$(SolutionDir) _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ZFS";EXTRAMODULE=gzio;%(PreprocessorDefinitions) false CompileAsC @@ -247,7 +247,7 @@ - $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir)\grub\grub-core\lib\libgcrypt\src;$(SolutionDir) + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir)\grub\grub-core\lib\zstd;$(SolutionDir)\grub\grub-core\lib\libgcrypt\src;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir) _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ZFS";EXTRAMODULE=gzio;%(PreprocessorDefinitions) false CompileAsC @@ -275,7 +275,7 @@ - $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir)\grub\grub-core\lib\libgcrypt\src;$(SolutionDir) + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir)\grub\grub-core\lib\zstd;$(SolutionDir)\grub\grub-core\lib\libgcrypt\src;$(SolutionDir)\gnu-efi\inc\x86_64;$(SolutionDir) _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ZFS";EXTRAMODULE=gzio;%(PreprocessorDefinitions) false CompileAsC @@ -304,7 +304,7 @@ - $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\ia32;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir)\grub\grub-core\lib\libgcrypt\src;$(SolutionDir) + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir)\grub\grub-core\lib\zstd;$(SolutionDir)\grub\grub-core\lib\libgcrypt\src;$(SolutionDir)\gnu-efi\inc\ia32;$(SolutionDir) _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ZFS";EXTRAMODULE=gzio;%(PreprocessorDefinitions) false CompileAsC @@ -333,7 +333,7 @@ - $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\arm;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir)\grub\grub-core\lib\libgcrypt\src;$(SolutionDir) + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir)\grub\grub-core\lib\zstd;$(SolutionDir)\grub\grub-core\lib\libgcrypt\src;$(SolutionDir)\gnu-efi\inc\arm;$(SolutionDir) _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ZFS";EXTRAMODULE=gzio;%(PreprocessorDefinitions) false CompileAsC @@ -362,7 +362,7 @@ - $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir)\grub\grub-core\lib\libgcrypt\src;$(SolutionDir) + $(SolutionDir)\gnu-efi\inc;$(SolutionDir)\grub\include;$(SolutionDir)\grub\grub-core\lib\minilzo;$(SolutionDir)\grub\grub-core\lib\zstd;$(SolutionDir)\grub\grub-core\lib\libgcrypt\src;$(SolutionDir)\gnu-efi\inc\aarch64;$(SolutionDir) _UNICODE;UNICODE;__MAKEWITH_GNUEFI;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;GRUB_FILE=__FILE__;DRIVERNAME=$(ProjectName);DRIVERNAME_STR="ZFS";EXTRAMODULE=gzio;%(PreprocessorDefinitions) false CompileAsC diff --git a/0001-GRUB-fixes.patch b/0001-GRUB-fixes.patch index 022ab18..7c6330c 100644 --- a/0001-GRUB-fixes.patch +++ b/0001-GRUB-fixes.patch @@ -1,6 +1,6 @@ -From c1eb6b7996d16ab05af43726539b22853abeefd9 Mon Sep 17 00:00:00 2001 +From 3cee4004cc6d36f2a5587327ea42aa13991db0e8 Mon Sep 17 00:00:00 2001 From: Pete Batard -Date: Tue, 4 Jun 2024 16:50:10 +0100 +Date: Fri, 29 Nov 2024 16:46:25 +0000 Subject: [PATCH] GRUB fixes --- @@ -16,12 +16,12 @@ Subject: [PATCH] GRUB fixes grub-core/fs/hfsplus.c | 2 ++ grub-core/fs/hfspluscomp.c | 4 +++ grub-core/fs/iso9660.c | 38 +++++++++++++------- - grub-core/fs/jfs.c | 5 +-- + grub-core/fs/jfs.c | 6 ++-- grub-core/fs/nilfs2.c | 4 ++- grub-core/fs/ntfs.c | 2 ++ grub-core/fs/proc.c | 2 +- grub-core/fs/reiserfs.c | 16 ++++++++- - grub-core/fs/sfs.c | 3 +- + grub-core/fs/sfs.c | 4 ++- grub-core/fs/squash4.c | 10 ++++-- grub-core/fs/tar.c | 2 +- grub-core/fs/udf.c | 2 ++ @@ -56,7 +56,7 @@ Subject: [PATCH] GRUB fixes include/grub/x86_64/types.h | 2 +- include/grub/zfs/zap_leaf.h | 2 ++ include/grub/zfs/zio.h | 2 ++ - 52 files changed, 275 insertions(+), 87 deletions(-) + 52 files changed, 277 insertions(+), 87 deletions(-) diff --git a/grub-core/fs/affs.c b/grub-core/fs/affs.c index ed606b3f1..3f298a696 100644 @@ -79,7 +79,7 @@ index ed606b3f1..3f298a696 100644 /* The location of `struct grub_affs_file' relative to the end of a file header block. */ diff --git a/grub-core/fs/bfs.c b/grub-core/fs/bfs.c -index 07cb3e3ac..5d6ef2664 100644 +index 9bc478ce8..2b415387a 100644 --- a/grub-core/fs/bfs.c +++ b/grub-core/fs/bfs.c @@ -69,6 +69,7 @@ GRUB_MOD_LICENSE ("GPLv3+"); @@ -305,7 +305,7 @@ index 5d41b6fdb..042870715 100644 struct head hd; grub_size_t namesize; diff --git a/grub-core/fs/erofs.c b/grub-core/fs/erofs.c -index 46cfc2e5c..dde762d02 100644 +index f2a82e988..c56918e71 100644 --- a/grub-core/fs/erofs.c +++ b/grub-core/fs/erofs.c @@ -37,6 +37,7 @@ GRUB_MOD_LICENSE ("GPLv3+"); @@ -652,7 +652,7 @@ index 8c348b59a..0425ea2bf 100644 /* Check if `grub_realloc' failed. */ diff --git a/grub-core/fs/jfs.c b/grub-core/fs/jfs.c -index 62e20ef6f..5b8909c58 100644 +index 62e20ef6f..e1a3b8b1a 100644 --- a/grub-core/fs/jfs.c +++ b/grub-core/fs/jfs.c @@ -61,6 +61,7 @@ struct grub_jfs_sblock @@ -663,7 +663,7 @@ index 62e20ef6f..5b8909c58 100644 struct grub_jfs_extent { /* The length of the extent in filesystem blocks. */ -@@ -252,10 +253,10 @@ struct grub_jfs_diropen +@@ -252,10 +253,11 @@ struct grub_jfs_diropen char name[256 * GRUB_MAX_UTF8_PER_UTF16 + 1]; grub_uint32_t ino; } GRUB_PACKED; @@ -672,6 +672,7 @@ index 62e20ef6f..5b8909c58 100644 static grub_dl_t my_mod; - ++ + static grub_err_t grub_jfs_lookup_symlink (struct grub_jfs_data *data, grub_uint32_t ino); @@ -788,7 +789,7 @@ index 36b26ac98..3c001897e 100644 struct grub_fshelp_node { diff --git a/grub-core/fs/sfs.c b/grub-core/fs/sfs.c -index 983e88008..a09c0a2b2 100644 +index 983e88008..337700914 100644 --- a/grub-core/fs/sfs.c +++ b/grub-core/fs/sfs.c @@ -31,6 +31,7 @@ @@ -799,11 +800,12 @@ index 983e88008..a09c0a2b2 100644 struct grub_sfs_bheader { grub_uint8_t magic[4]; -@@ -122,8 +123,8 @@ struct grub_sfs_btree +@@ -122,8 +123,9 @@ struct grub_sfs_btree supported. */ struct grub_sfs_btree_node node[1]; } GRUB_PACKED; +PRAGMA_END_PACKED ++ - @@ -942,10 +944,10 @@ index 8e02ab4a3..48c6c8613 100644 struct grub_fshelp_node { diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c -index b5453e006..9dcdc9f70 100644 +index 3fdf9bda8..753703f54 100644 --- a/grub-core/fs/zfs/zfs.c +++ b/grub-core/fs/zfs/zfs.c -@@ -252,8 +252,8 @@ struct grub_zfs_data +@@ -254,8 +254,8 @@ struct grub_zfs_data struct subvolume subvol; struct grub_zfs_device_desc *devices_attached; @@ -956,7 +958,7 @@ index b5453e006..9dcdc9f70 100644 struct grub_zfs_device_desc *device_original; uberblock_t current_uberblock; -@@ -2727,7 +2727,9 @@ dnode_get (dnode_end_t * mdn, grub_uint64_t objnum, grub_uint8_t type, +@@ -2767,7 +2767,9 @@ dnode_get (dnode_end_t * mdn, grub_uint64_t objnum, grub_uint8_t type, return GRUB_ERR_NONE; } @@ -1045,7 +1047,7 @@ index 7cee5d75c..30ff90432 100644 while (len < format2 && p[len]) diff --git a/grub-core/lib/posix_wrap/limits.h b/grub-core/lib/posix_wrap/limits.h -index 26918c8a0..55384b326 100644 +index 4be7b4080..9f89a0f9d 100644 --- a/grub-core/lib/posix_wrap/limits.h +++ b/grub-core/lib/posix_wrap/limits.h @@ -23,8 +23,12 @@ @@ -1079,7 +1081,7 @@ index 26918c8a0..55384b326 100644 +#endif #define CHAR_BIT 8 - + #define WORD_BIT 32 diff --git a/grub-core/lib/xzembed/xz_dec_lzma2.c b/grub-core/lib/xzembed/xz_dec_lzma2.c index af7b77079..d39f8afc0 100644 --- a/grub-core/lib/xzembed/xz_dec_lzma2.c @@ -1430,7 +1432,7 @@ index 2d8336aff..8627dc47e 100644 /* Return the offset of the record with the index INDEX, in the node NODE which is part of the B+ tree BTREE. */ diff --git a/include/grub/misc.h b/include/grub/misc.h -index 1b35a167f..8ef1e4d6c 100644 +index 1578f36c3..e2705282e 100644 --- a/include/grub/misc.h +++ b/include/grub/misc.h @@ -32,7 +32,9 @@ @@ -1528,7 +1530,7 @@ index 7f1a14c84..6daa584a1 100644 static inline struct grub_term_coordinate diff --git a/include/grub/types.h b/include/grub/types.h -index 064066e2e..4c518ea73 100644 +index 45079bf65..5f661f999 100644 --- a/include/grub/types.h +++ b/include/grub/types.h @@ -27,10 +27,20 @@ @@ -1553,8 +1555,8 @@ index 064066e2e..4c518ea73 100644 # define GRUB_CPU_SIZEOF_VOID_P BUILD_SIZEOF_VOID_P # define GRUB_CPU_SIZEOF_LONG BUILD_SIZEOF_LONG @@ -199,19 +209,17 @@ static inline grub_uint16_t grub_swap_bytes16(grub_uint16_t _x) - #define grub_swap_bytes16_compile_time(x) ((((x) & 0xff) << 8) | (((x) & 0xff00) >> 8)) - #define grub_swap_bytes32_compile_time(x) ((((x) & 0xff) << 24) | (((x) & 0xff00) << 8) | (((x) & 0xff0000) >> 8) | (((x) & 0xff000000UL) >> 24)) + #define grub_swap_bytes16_compile_time(x) ((grub_uint16_t)((((x) & 0xff) << 8) | (((x) & 0xff00) >> 8))) + #define grub_swap_bytes32_compile_time(x) ((grub_uint32_t)((((x) & 0xff) << 24) | (((x) & 0xff00) << 8) | (((x) & 0xff0000) >> 8) | (((x) & 0xff000000UL) >> 24))) #define grub_swap_bytes64_compile_time(x) \ -({ \ - grub_uint64_t _x = (x); \ @@ -1673,7 +1675,7 @@ index 11447c166..0479d383f 100644 } l_array; struct zap_leaf_free { diff --git a/include/grub/zfs/zio.h b/include/grub/zfs/zio.h -index 19ce136bb..11ee51b61 100644 +index 997b0c4d4..88dcce269 100644 --- a/include/grub/zfs/zio.h +++ b/include/grub/zfs/zio.h @@ -27,10 +27,12 @@ diff --git a/EfiFsPkg.dec b/EfiFsPkg.dec index e44b187..5bc520e 100644 --- a/EfiFsPkg.dec +++ b/EfiFsPkg.dec @@ -1,7 +1,7 @@ ## @file # EfiFs Package # -# Copyright (c) 2017-2018, Pete Batard +# Copyright (c) 2017-2024, Pete Batard # ## @@ -19,3 +19,5 @@ grub/include grub grub/grub-core/lib/minilzo + grub/grub-core/lib/zstd + diff --git a/EfiFsPkg.dsc b/EfiFsPkg.dsc index c538424..eed472c 100644 --- a/EfiFsPkg.dsc +++ b/EfiFsPkg.dsc @@ -21,6 +21,7 @@ MSFT:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG RVCT:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG *_*_*_CC_FLAGS = -DDISABLE_NEW_DEPRECATED_INTERFACES + MSFT:*_*_ARM_CC_FLAGS = /GS- MSFT:*_*_AARCH64_CC_FLAGS = /GS- !include MdePkg/MdeLibs.dsc.inc @@ -45,11 +46,11 @@ DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf -[LibraryClasses.ARM, LibraryClasses.AARCH64, LibraryClasses.RISCV64, LibraryClasses.LOONGARCH64,] +[LibraryClasses.ARM, LibraryClasses.AARCH64, LibraryClasses.RISCV64, LibraryClasses.LOONGARCH64] NULL|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf [LibraryClasses.IA32, LibraryClasses.X64] -!if $(TOOLCHAIN) == "VS2019" +!if $(TOOLCHAIN) == "VS2022" NULL|EfiFsPkg/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf !endif diff --git a/EfiFsPkg/Affs.inf b/EfiFsPkg/Affs.inf index 8f3864b..2ad58d2 100644 --- a/EfiFsPkg/Affs.inf +++ b/EfiFsPkg/Affs.inf @@ -67,6 +67,6 @@ [BuildOptions] *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 - *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"Amiga FFS\"" + *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"Amiga FFS\"" MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 GCC:*_*_*_CC_FLAGS = -Wno-overflow diff --git a/EfiFsPkg/Afs.inf b/EfiFsPkg/Afs.inf index c17c93b..4d5104c 100644 --- a/EfiFsPkg/Afs.inf +++ b/EfiFsPkg/Afs.inf @@ -67,5 +67,5 @@ [BuildOptions] *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 - *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"AFS\" + *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"AFS\" MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Bfs.inf b/EfiFsPkg/Bfs.inf index c021a2c..016ec94 100644 --- a/EfiFsPkg/Bfs.inf +++ b/EfiFsPkg/Bfs.inf @@ -67,5 +67,5 @@ [BuildOptions] *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 - *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"BFS\" + *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"BFS\" MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Btrfs.inf b/EfiFsPkg/Btrfs.inf index 87e75be..6da030e 100644 --- a/EfiFsPkg/Btrfs.inf +++ b/EfiFsPkg/Btrfs.inf @@ -23,25 +23,23 @@ ../src/this.c ../src/path.c ../src/utf8.c + ../grub/grub-core/fs/btrfs.c + ../grub/grub-core/fs/fshelp.c + ../grub/grub-core/io/gzio.c + ../grub/grub-core/io/lzopio.c + ../grub/grub-core/kern/err.c + ../grub/grub-core/kern/list.c + ../grub/grub-core/kern/misc.c ../grub/grub-core/lib/crc.c ../grub/grub-core/lib/crypto.c ../grub/grub-core/lib/minilzo/minilzo.c ../grub/grub-core/lib/zstd/entropy_common.c ../grub/grub-core/lib/zstd/error_private.c ../grub/grub-core/lib/zstd/fse_decompress.c - ../grub/grub-core/lib/zstd/huf.h ../grub/grub-core/lib/zstd/huf_decompress.c ../grub/grub-core/lib/zstd/xxhash.c ../grub/grub-core/lib/zstd/zstd_common.c ../grub/grub-core/lib/zstd/zstd_decompress.c - ../grub/grub-core/lib/zstd/zstd.h - ../grub/grub-core/io/lzopio.c - ../grub/grub-core/io/gzio.c - ../grub/grub-core/kern/err.c - ../grub/grub-core/kern/list.c - ../grub/grub-core/kern/misc.c - ../grub/grub-core/fs/fshelp.c - ../grub/grub-core/fs/btrfs.c [Packages] EfiFsPkg/EfiFsPkg.dec @@ -81,7 +79,7 @@ [BuildOptions] *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 - *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"Btrfs\" - *_*_*_CC_FLAGS = -DEXTRAMODULE=gzio -DZSTD_NO_TRACE -DGRUB -DNO_RAID6_RECOVERY + *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"Btrfs\" + *_*_*_CC_FLAGS = -DEXTRAMODULE=gzio -DZSTD_NO_TRACE -DNO_RAID6_RECOVERY GCC:*_*_*_CC_FLAGS = -Wno-unused-function - MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4211 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Cbfs.inf b/EfiFsPkg/Cbfs.inf index 9c228ac..e35e693 100644 --- a/EfiFsPkg/Cbfs.inf +++ b/EfiFsPkg/Cbfs.inf @@ -69,5 +69,5 @@ [BuildOptions] *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 - *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"CBFS\" + *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"CBFS\" MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Cpio.inf b/EfiFsPkg/Cpio.inf index 3c76275..96e3fa7 100644 --- a/EfiFsPkg/Cpio.inf +++ b/EfiFsPkg/Cpio.inf @@ -68,5 +68,5 @@ [BuildOptions] *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 - *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"cpio (LE)\"" + *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"cpio (LE)\"" MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/CpioBe.inf b/EfiFsPkg/CpioBe.inf index 65f319e..37939d7 100644 --- a/EfiFsPkg/CpioBe.inf +++ b/EfiFsPkg/CpioBe.inf @@ -68,5 +68,5 @@ [BuildOptions] *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 - *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"cpio (BE)\"" + *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"cpio (BE)\"" MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/EroFs.inf b/EfiFsPkg/EroFs.inf index 4dd851e..5628c5c 100644 --- a/EfiFsPkg/EroFs.inf +++ b/EfiFsPkg/EroFs.inf @@ -67,5 +67,5 @@ [BuildOptions] *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 - *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"ext2/3/4\" + *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"ext2/3/4\" MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/ExFat.inf b/EfiFsPkg/ExFat.inf index 596ce1e..66874a2 100644 --- a/EfiFsPkg/ExFat.inf +++ b/EfiFsPkg/ExFat.inf @@ -67,5 +67,5 @@ [BuildOptions] *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 - *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"ExFAT\" + *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"ExFAT\" MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Ext2.inf b/EfiFsPkg/Ext2.inf index 283d8ad..1378ef4 100644 --- a/EfiFsPkg/Ext2.inf +++ b/EfiFsPkg/Ext2.inf @@ -67,5 +67,5 @@ [BuildOptions] *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 - *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"ext2/3/4\" + *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"ext2/3/4\" MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/F2fs.inf b/EfiFsPkg/F2fs.inf index 3bbea7d..4861d0d 100644 --- a/EfiFsPkg/F2fs.inf +++ b/EfiFsPkg/F2fs.inf @@ -67,5 +67,5 @@ [BuildOptions] *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 - *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"F2FS\" + *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"F2FS\" MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Fat.inf b/EfiFsPkg/Fat.inf index b3c16e9..73ac273 100644 --- a/EfiFsPkg/Fat.inf +++ b/EfiFsPkg/Fat.inf @@ -67,5 +67,5 @@ [BuildOptions] *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 - *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"ExFAT\" + *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"ExFAT\" MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Hfs.inf b/EfiFsPkg/Hfs.inf index cba4f1d..a424cac 100644 --- a/EfiFsPkg/Hfs.inf +++ b/EfiFsPkg/Hfs.inf @@ -67,5 +67,5 @@ [BuildOptions] *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 - *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"HFS\" + *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"HFS\" MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/HfsPlus.inf b/EfiFsPkg/HfsPlus.inf index 3f16647..16743ce 100644 --- a/EfiFsPkg/HfsPlus.inf +++ b/EfiFsPkg/HfsPlus.inf @@ -69,7 +69,7 @@ [BuildOptions] *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 - *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"HFS+\" + *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"HFS+\" # HFS+ has a compressed driver *_*_*_CC_FLAGS = -DCOMPRESSED_DRIVERNAME=$(BASE_NAME)comp -DEXTRAMODULE=gzio MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Iso9660.inf b/EfiFsPkg/Iso9660.inf index 6baaf35..3b8c0ce 100644 --- a/EfiFsPkg/Iso9660.inf +++ b/EfiFsPkg/Iso9660.inf @@ -67,5 +67,5 @@ [BuildOptions] *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 - *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"ISO9660\" + *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"ISO9660\" MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Jfs.inf b/EfiFsPkg/Jfs.inf index c8bffac..c77b060 100644 --- a/EfiFsPkg/Jfs.inf +++ b/EfiFsPkg/Jfs.inf @@ -67,5 +67,5 @@ [BuildOptions] *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 - *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"JFS\" + *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"JFS\" MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Minix.inf b/EfiFsPkg/Minix.inf index 6265f1b..6599500 100644 --- a/EfiFsPkg/Minix.inf +++ b/EfiFsPkg/Minix.inf @@ -68,5 +68,5 @@ [BuildOptions] *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 - *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"Minix (LE)\"" + *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"Minix (LE)\"" MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Minix2.inf b/EfiFsPkg/Minix2.inf index 8413582..2900fd1 100644 --- a/EfiFsPkg/Minix2.inf +++ b/EfiFsPkg/Minix2.inf @@ -68,5 +68,5 @@ [BuildOptions] *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 - *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"Minix2 (LE)\"" + *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"Minix2 (LE)\"" MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Minix2Be.inf b/EfiFsPkg/Minix2Be.inf index 036caaf..748389c 100644 --- a/EfiFsPkg/Minix2Be.inf +++ b/EfiFsPkg/Minix2Be.inf @@ -68,5 +68,5 @@ [BuildOptions] *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 - *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"Minix2 (BE)\"" + *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"Minix2 (BE)\"" MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Minix3.inf b/EfiFsPkg/Minix3.inf index 57dfd5b..bab1609 100644 --- a/EfiFsPkg/Minix3.inf +++ b/EfiFsPkg/Minix3.inf @@ -68,5 +68,5 @@ [BuildOptions] *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 - *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"Minix3 (LE)\"" + *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"Minix3 (LE)\"" MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Minix3Be.inf b/EfiFsPkg/Minix3Be.inf index b84562b..2729aab 100644 --- a/EfiFsPkg/Minix3Be.inf +++ b/EfiFsPkg/Minix3Be.inf @@ -68,5 +68,5 @@ [BuildOptions] *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 - *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"Minix3 (BE)\"" + *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"Minix3 (BE)\"" MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/MinixBe.inf b/EfiFsPkg/MinixBe.inf index 2ee45dc..d85c7a4 100644 --- a/EfiFsPkg/MinixBe.inf +++ b/EfiFsPkg/MinixBe.inf @@ -68,5 +68,5 @@ [BuildOptions] *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 - *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"Minix (BE)\"" + *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"Minix (BE)\"" MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/NewC.inf b/EfiFsPkg/NewC.inf index b2c0b0a..fcfcb14 100644 --- a/EfiFsPkg/NewC.inf +++ b/EfiFsPkg/NewC.inf @@ -68,5 +68,5 @@ [BuildOptions] *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 - *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"cpio (newc)\"" + *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"cpio (newc)\"" MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/NilFs2.inf b/EfiFsPkg/NilFs2.inf index 80f79b2..6c59a8b 100644 --- a/EfiFsPkg/NilFs2.inf +++ b/EfiFsPkg/NilFs2.inf @@ -67,5 +67,5 @@ [BuildOptions] *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 - *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"NILFS2\" + *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"NILFS2\" MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Ntfs.inf b/EfiFsPkg/Ntfs.inf index 2dac339..e644914 100644 --- a/EfiFsPkg/Ntfs.inf +++ b/EfiFsPkg/Ntfs.inf @@ -68,7 +68,7 @@ [BuildOptions] *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 - *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"NTFS\" + *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"NTFS\" # NTFS has a compressed driver *_*_*_CC_FLAGS = -DCOMPRESSED_DRIVERNAME=$(BASE_NAME)comp MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Odc.inf b/EfiFsPkg/Odc.inf index 34d7426..fa100f6 100644 --- a/EfiFsPkg/Odc.inf +++ b/EfiFsPkg/Odc.inf @@ -68,5 +68,5 @@ [BuildOptions] *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 - *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"cpio (odc)\"" + *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"cpio (odc)\"" MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/ProcFs.inf b/EfiFsPkg/ProcFs.inf index b854b29..50dd940 100644 --- a/EfiFsPkg/ProcFs.inf +++ b/EfiFsPkg/ProcFs.inf @@ -68,5 +68,5 @@ [BuildOptions] *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 - *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"procfs\" + *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"procfs\" MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/ReiserFs.inf b/EfiFsPkg/ReiserFs.inf index 27fd870..eaaa435 100644 --- a/EfiFsPkg/ReiserFs.inf +++ b/EfiFsPkg/ReiserFs.inf @@ -67,5 +67,5 @@ [BuildOptions] *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 - *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"ReiserFS\" + *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"ReiserFS\" MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/RomFs.inf b/EfiFsPkg/RomFs.inf index 7b1502e..4982383 100644 --- a/EfiFsPkg/RomFs.inf +++ b/EfiFsPkg/RomFs.inf @@ -67,5 +67,5 @@ [BuildOptions] *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 - *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"romfs\" + *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"romfs\" MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Sfs.inf b/EfiFsPkg/Sfs.inf index 63bd283..a8c892b 100644 --- a/EfiFsPkg/Sfs.inf +++ b/EfiFsPkg/Sfs.inf @@ -67,5 +67,5 @@ [BuildOptions] *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 - *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"Amiga SFS\"" + *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"Amiga SFS\"" MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/SquashFs.inf b/EfiFsPkg/SquashFs.inf index ccee17c..d695dcb 100644 --- a/EfiFsPkg/SquashFs.inf +++ b/EfiFsPkg/SquashFs.inf @@ -77,7 +77,6 @@ [BuildOptions] *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 - *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"SquashFS\" - # SquashFS uses additional modules + *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"SquashFS\" *_*_*_CC_FLAGS = -DEXTRAMODULE=gzio -DEXTRAMODULE2=lzopio -DEXTRAMODULE3=xzio - MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4211 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Tar.inf b/EfiFsPkg/Tar.inf index e357652..9d868dd 100644 --- a/EfiFsPkg/Tar.inf +++ b/EfiFsPkg/Tar.inf @@ -68,5 +68,5 @@ [BuildOptions] *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 - *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"tar\" + *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"tar\" MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Udf.inf b/EfiFsPkg/Udf.inf index 209c437..8eff2c9 100644 --- a/EfiFsPkg/Udf.inf +++ b/EfiFsPkg/Udf.inf @@ -68,5 +68,5 @@ [BuildOptions] *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 - *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"UDF\" + *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"UDF\" MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Ufs.inf b/EfiFsPkg/Ufs.inf index 64a5d0c..94af7c2 100644 --- a/EfiFsPkg/Ufs.inf +++ b/EfiFsPkg/Ufs.inf @@ -68,5 +68,5 @@ [BuildOptions] *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 - *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"UFS (LE)\"" + *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"UFS (LE)\"" MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Ufs2.inf b/EfiFsPkg/Ufs2.inf index 059d465..85531dc 100644 --- a/EfiFsPkg/Ufs2.inf +++ b/EfiFsPkg/Ufs2.inf @@ -68,5 +68,5 @@ [BuildOptions] *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 - *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"UFS2\" + *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"UFS2\" MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/UfsBe.inf b/EfiFsPkg/UfsBe.inf index f7e62e2..f42837c 100644 --- a/EfiFsPkg/UfsBe.inf +++ b/EfiFsPkg/UfsBe.inf @@ -68,5 +68,5 @@ [BuildOptions] *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 - *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"UFS (BE)\"" + *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"UFS (BE)\"" MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Xfs.inf b/EfiFsPkg/Xfs.inf index 36a70b8..dbcb8b1 100644 --- a/EfiFsPkg/Xfs.inf +++ b/EfiFsPkg/Xfs.inf @@ -68,5 +68,5 @@ [BuildOptions] *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 - *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"XFS\" + *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"XFS\" MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/EfiFsPkg/Zfs.inf b/EfiFsPkg/Zfs.inf index 5c5ca20..c0b61f3 100644 --- a/EfiFsPkg/Zfs.inf +++ b/EfiFsPkg/Zfs.inf @@ -23,16 +23,25 @@ ../src/this.c ../src/path.c ../src/utf8.c - ../grub/grub-core/io/gzio.c - ../grub/grub-core/kern/err.c - ../grub/grub-core/kern/misc.c - ../grub/grub-core/kern/list.c ../grub/grub-core/fs/fshelp.c ../grub/grub-core/fs/zfs/zfs.c ../grub/grub-core/fs/zfs/zfs_fletcher.c ../grub/grub-core/fs/zfs/zfs_lz4.c ../grub/grub-core/fs/zfs/zfs_lzjb.c ../grub/grub-core/fs/zfs/zfs_sha256.c + ../grub/grub-core/io/gzio.c + ../grub/grub-core/kern/err.c + ../grub/grub-core/kern/list.c + ../grub/grub-core/kern/misc.c + ../grub/grub-core/lib/crc.c + ../grub/grub-core/lib/zstd/entropy_common.c + ../grub/grub-core/lib/zstd/error_private.c + ../grub/grub-core/lib/zstd/fse_decompress.c + ../grub/grub-core/lib/zstd/huf_decompress.c + ../grub/grub-core/lib/zstd/xxhash.c + ../grub/grub-core/lib/zstd/zstd_common.c + ../grub/grub-core/lib/zstd/zstd_decompress.c + [Packages] EfiFsPkg/EfiFsPkg.dec @@ -72,7 +81,6 @@ [BuildOptions] *_*_IA32_CC_FLAGS = -DFORMAT=efi-app-ia32 *_*_X64_CC_FLAGS = -DFORMAT=efi-app-x64 - *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"ZFS\" - # ZFS has an extra module - *_*_*_CC_FLAGS = -DEXTRAMODULE=gzio - MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 + *_*_*_CC_FLAGS = -Os -DCPU_$(ARCH) -DGRUB -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"ZFS\" + *_*_*_CC_FLAGS = -DEXTRAMODULE=gzio -DZSTD_NO_TRACE + MSFT:*_*_*_CC_FLAGS = /Oi- /std:clatest /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4211 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706 diff --git a/edk2_build_drivers.cmd b/edk2_build_drivers.cmd index c0c2a89..cf48629 100644 --- a/edk2_build_drivers.cmd +++ b/edk2_build_drivers.cmd @@ -1,4 +1,4 @@ -@rem This script builds all the drivers using EDK2 and VS2019. +@rem This script builds all the drivers using EDK2 and VS2022. @echo off setlocal enabledelayedexpansion @@ -49,7 +49,7 @@ if exist "%VS_PATH%\VC\Auxiliary\Build\vcvarsamd64_arm.bat" ( call "%VS_PATH%\VC\Auxiliary\Build\vcvarsamd64_arm.bat" call edksetup.bat reconfig call EfiFsPkg\set_grub_cpu.cmd ARM - call build -a ARM -b %BUILD% -t VS2019 -p EfiFsPkg/EfiFsPkg.dsc + call build -a ARM -b %BUILD% -t VS2022 -p EfiFsPkg/EfiFsPkg.dsc ) endlocal if not "%1"=="" goto out @@ -60,7 +60,7 @@ if exist "%VS_PATH%\VC\Auxiliary\Build\vcvarsamd64_arm64.bat" ( call "%VS_PATH%\VC\Auxiliary\Build\vcvarsamd64_arm64.bat" call edksetup.bat reconfig call EfiFsPkg\set_grub_cpu.cmd AARCH64 - call build -a AARCH64 -b %BUILD% -t VS2019 -p EfiFsPkg/EfiFsPkg.dsc + call build -a AARCH64 -b %BUILD% -t VS2022 -p EfiFsPkg/EfiFsPkg.dsc ) endlocal if not "%1"=="" goto out @@ -71,7 +71,7 @@ if exist "%VS_PATH%\VC\Auxiliary\Build\vcvars32.bat" ( call "%VS_PATH%\VC\Auxiliary\Build\vcvars32.bat" call edksetup.bat reconfig call EfiFsPkg\set_grub_cpu.cmd IA32 - call build -a IA32 -b %BUILD% -t VS2019 -p EfiFsPkg/EfiFsPkg.dsc + call build -a IA32 -b %BUILD% -t VS2022 -p EfiFsPkg/EfiFsPkg.dsc ) endlocal if not "%1"=="" goto out @@ -82,7 +82,7 @@ if exist "%VS_PATH%\VC\Auxiliary\Build\vcvars64.bat" ( call "%VS_PATH%\VC\Auxiliary\Build\vcvars64.bat" call edksetup.bat reconfig call EfiFsPkg\set_grub_cpu.cmd X64 - call build -a X64 -b %BUILD% -t VS2019 -p EfiFsPkg/EfiFsPkg.dsc + call build -a X64 -b %BUILD% -t VS2022 -p EfiFsPkg/EfiFsPkg.dsc ) endlocal diff --git a/gnu-efi b/gnu-efi index 9e47972..5ea320f 160000 --- a/gnu-efi +++ b/gnu-efi @@ -1 +1 @@ -Subproject commit 9e479726ed02f325c8a82b0985d021ed1fd13f00 +Subproject commit 5ea320f0f01c8de8f9dd4e4e38a245608f0287dd diff --git a/grub b/grub index 56e5882..6811f6f 160000 --- a/grub +++ b/grub @@ -1 +1 @@ -Subproject commit 56e58828cf3cd32ba4768779accc6655120c3136 +Subproject commit 6811f6f09d61996a3acbc4fc0414e45964f0e2d9