Merge branch 'acidanthera:master' into YamingNetwork

Changelog.md

@@ -2,6 +2,8 @@ OpenCore Changelog
 ==================
 #### v1.0.1
 - Updated code and added progress bar to macrecovery, thx @soyeonswife63
+- Bundled fat binary i386/x64 10.6+ compatible `nvramdump` with LogoutHook release
+- Added support for manual build of i386/x64 10.6+ versions of userspace tools via `FATBIN32=1 make`
 
 #### v1.0.0
 - Updated builtin firmware versions for SMBIOS and the rest

User/Makefile

@@ -80,8 +80,13 @@ endif
 
 ifeq ($(DIST),Darwin)
 	ifneq ($(FUZZ),1)
-		CFLAGS  += -mmacosx-version-min=10.9 -arch x86_64 -arch arm64
-		LDFLAGS += -mmacosx-version-min=10.9 -arch x86_64 -arch arm64
+		ifeq ($(FATBIN32),1)
+			CFLAGS  += -mmacosx-version-min=10.6 -arch x86_64 -arch i386
+			LDFLAGS += -mmacosx-version-min=10.6 -arch x86_64 -arch i386
+		else
+			CFLAGS  += -mmacosx-version-min=10.9 -arch x86_64 -arch arm64
+			LDFLAGS += -mmacosx-version-min=10.9 -arch x86_64 -arch arm64
+		endif
 	endif
 endif
 

Utilities/LogoutHook/Legacy/README.md

@@ -0,0 +1,10 @@
+This is an i386/x86_64 fat binary version of `nvramdump`, built for macOS
+10.6+.
+
+It is bundled into the OpenCore `Utilities/LogoutHook` release folder in
+favour of the CI-built x86_64/arm64 10.9+ compatible version, since 32-bit
+support and 10.6+ support is relevant to users of this utility.
+
+Future updates to `nvramdump.c` will require this to be rebuilt manually,
+which can be done on an Xcode version which supports 10.6+ and i386 with
+`FATBIN32=1 make`.

build_oc.tool

@@ -261,7 +261,7 @@ package() {
     "Launchd.command"
     "Launchd.command.plist"
     "README.md"
-    "nvramdump"
+    "Legacy/nvramdump"
     )
   for file in "${logoutFiles[@]}"; do
     cp "${selfdir}/Utilities/LogoutHook/${file}" "${dstdir}/Utilities/LogoutHook"/ || exit 1