Merge branch 'master' of https://github.com/CloverHackyColor/CloverBo…

…otloader
CloverHackyColor · Sep 3, 2023 · 7d21f54 · 7d21f54
2 parents 2aca955 + 54d9c5e
commit 7d21f54
Show file tree

Hide file tree

Showing 13 changed files with 3,274 additions and 1,371 deletions.
diff --git a/CloverPackage/CloverV2/EFI/CLOVER/config-sample.plist b/CloverPackage/CloverV2/EFI/CLOVER/config-sample.plist
diff --git a/CloverPackage/CloverV2/rcScripts/etc/rc.shutdown.d/80.save_nvram_plist.local b/CloverPackage/CloverV2/rcScripts/etc/rc.shutdown.d/80.save_nvram_plist.local
@@ -4,7 +4,7 @@
 # dump NVRAM for UEFI Clover with EmuVariable or Legacy Clover
 #
 # Script version info
-gScriptVersion=1.16.6
+gScriptVersion=1.16.7
 #================================= GLOBAL VARS ==================================
 #
 # The script expects '0.5' but non-US localizations use '0,5' so we export
@@ -44,7 +44,7 @@ fi
 # Variables
 #
 gNVRAMf=nvram.plist
-gNVRAMbuf=$(nvram -x -p)
+gNVRAMbuf=$(nvram2 -x -p)
 gNVRAMLogPath="${CLOVER_LOG_LOCATION}/rc.shutdown.log"
 gDisk=($(ls /dev/disk? |grep -i -o "disk[0-9]"))
 gESPList=""

diff --git a/CloverPackage/package/buildpkg.sh b/CloverPackage/package/buildpkg.sh
@@ -601,11 +601,13 @@ fi
     # ditto --noextattr --noqtn ${SYMROOT}/utils/clover-genconfig  ${PKG_BUILD_DIR}/${choiceId}/Root/Private/tmp/usr/local/bin/
      ditto --noextattr --noqtn ${SYMROOT}/utils/partutil          ${PKG_BUILD_DIR}/${choiceId}/Root/Private/tmp/usr/local/bin/
     # ditto --noextattr --noqtn ${SYMROOT}/utils/espfinder         ${PKG_BUILD_DIR}/${choiceId}/Root/Private/tmp/usr/local/bin/
+    ditto --noextattr --noqtn ${SYMROOT}/utils/nvram2          ${PKG_BUILD_DIR}/${choiceId}/Root/Private/tmp/usr/local/bin/
      fixperms "${PKG_BUILD_DIR}/${choiceId}/Root/"
     #chmod 755 "${PKG_BUILD_DIR}/${choiceId}"/Root/Private/tmp/usr/local/bin/{bdmesg,clover-genconfig,partutil,espfinder}
     # chmod 755 "${PKG_BUILD_DIR}/${choiceId}"/Root/Private/tmp/usr/local/bin/{bdmesg,partutil}
     chmod 755 "${PKG_BUILD_DIR}/${choiceId}"/Root/Private/tmp/usr/local/bin/partutil
     chmod 755 "${PKG_BUILD_DIR}/${choiceId}"/Root/usr/local/bin/bdmesg
+    chmod 755 "${PKG_BUILD_DIR}/${choiceId}"/Root/usr/local/bin/nvram2
     packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
     packageUtilsRefId=$packageRefId
     buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"

diff --git a/CloverPackage/utils/Makefile b/CloverPackage/utils/Makefile
@@ -3,6 +3,6 @@ include $(CURDIR)/Make.rules
 #fdisk440 out
 #clover-genconfig temporary out
 #espfinder out
-SUBDIRS = boot1-install partutil bdmesg
+SUBDIRS = boot1-install partutil bdmesg nvram
 
 all: all-recursive
diff --git a/CloverPackage/utils/nvram/Makefile b/CloverPackage/utils/nvram/Makefile
@@ -0,0 +1,26 @@
+
+PROGRAM = nvram2
+
+SRCROOT := $(abspath $(CURDIR)/..)
+SYMROOT := $(abspath $(CURDIR)/../../sym)
+OBJROOT := $(SYMROOT)/build/$(PROGRAM)
+INSTALL_DIR_NAME=utils
+UTILSDIR= $(SYMROOT)/$(INSTALL_DIR_NAME)
+
+
+SRC  := $(wildcard $(PROGRAM)/*.c)
+PROG := $(addprefix $(UTILSDIR)/, $(PROGRAM))
+
+all: $(PROG)
+
+$(PROG): $(SRC)
+	@echo "\t[CXX] $(PROGRAM)"
+	@cc -o $(PROGRAM) $(PROGRAM).c -framework CoreFoundation -framework IOKit -Wall >/dev/null
+	@mv $(PROGRAM) $(UTILSDIR)
+
+install-local: $(PROG)
+	@sudo install -d -g 0 -o 0 /usr/local/bin
+	@sudo install -psv -g 0 -o 0 $(PROG) /usr/local/bin
+
+clean-local:
+	@rm -rf $(OBJROOT) *~