From 45b557a1813653f2639bd319c44b6095e740103c Mon Sep 17 00:00:00 2001 From: YBronst Date: Mon, 22 Sep 2025 23:47:25 +0300 Subject: [PATCH 01/10] Update tools_def.template --- BaseTools/Conf/tools_def.template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template index 09d75799ab..faf8e83d16 100644 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -2117,7 +2117,7 @@ DEFINE GCC131_AARCH64_DLINK2_FLAGS = DEF(GCC49_AARCH64_DLINK2_FLAGS) -Wno-er DEFINE GCC131_ARM_ASLDLINK_FLAGS = DEF(GCC49_ARM_ASLDLINK_FLAGS) DEFINE GCC131_AARCH64_ASLDLINK_FLAGS = DEF(GCC49_AARCH64_ASLDLINK_FLAGS) -DEFINE GCC151_X64_CC_FLAGS = DEF(GCC49_X64_CC_FLAGS) -fno-unwind-tables -Wno-incompatible-ms-struct -Wno-misleading-indentation -mms-bitfields -fno-ms-extensions -ffreestanding -fno-exceptions +DEFINE GCC151_X64_CC_FLAGS = DEF(GCC49_X64_CC_FLAGS) -fno-unwind-tables -Wno-incompatible-ms-struct -Wno-misleading-indentation -mms-bitfields -fno-ms-extensions -ffreestanding -fno-exceptions -Wno-error=unused-but-set-variable -Wno-error=comment -Wno-error=deprecated-non-prototype DEFINE GCC151_IA32_X64_DLINK_COMMON = -nostdlib -Wl,--no-warn-rwx-segments,--gc-sections,-n,-q,--gc-sections,-z,common-page-size=0x40,--defsym=PECOFF_HEADER_SIZE=0x240,--script=$(EDK_TOOLS_PATH)/Scripts/GccBase.lds DEFINE GCC151_IA32_X64_ASLDLINK_FLAGS = DEF(GCC151_IA32_X64_DLINK_COMMON),--entry,ReferenceAcpiTable,-u,ReferenceAcpiTable DEFINE GCC151_IA32_X64_DLINK_FLAGS = DEF(GCC151_IA32_X64_DLINK_COMMON),--entry,$(IMAGE_ENTRY_POINT),-u,$(IMAGE_ENTRY_POINT),-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map @@ -2631,15 +2631,15 @@ RELEASE_GCC131_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x20 *_GCC151_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64 *_GCC151_X64_ASLDLINK_FLAGS = DEF(GCC48_IA32_X64_ASLDLINK_FLAGS),-m,elf_x86_64 *_GCC151_X64_ASM_FLAGS = DEF(GCC151_ASM_FLAGS) -m64 -*_GCC151_X64_DLINK_FLAGS = DEF(GCC151_X64_DLINK_FLAGS) DEF(GCC151_X64_CC_FLAGS) ENV(GCC151_X64_EXTRA_CC_FLAGS) +*_GCC151_X64_DLINK_FLAGS = DEF(GCC151_X64_DLINK_FLAGS) DEF(GCC151_X64_CC_FLAGS) ENV(GCC151_X64_EXTRA_CC_FLAGS) -Wno-error=unused-but-set-variable -Wno-error=comment -Wno-error=deprecated-non-prototype *_GCC151_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS) *_GCC151_X64_OBJCOPY_FLAGS = *_GCC151_X64_NASM_FLAGS = -f elf64 - DEBUG_GCC151_X64_CC_FLAGS = DEF(GCC151_X64_CC_FLAGS) -g3 -O0 -RELEASE_GCC151_X64_CC_FLAGS = DEF(GCC151_X64_CC_FLAGS) -Os -Werror - DEBUG_GCC151_X64_CXX_FLAGS = DEF(GCC151_X64_CC_FLAGS) -g3 -O0 -RELEASE_GCC151_X64_CXX_FLAGS = DEF(GCC151_X64_CC_FLAGS) -Os -Werror + DEBUG_GCC151_X64_CC_FLAGS = DEF(GCC151_X64_CC_FLAGS) -g3 -O0 -Wno-error=unused-but-set-variable -Wno-error=comment -Wno-error=deprecated-non-prototype +RELEASE_GCC151_X64_CC_FLAGS = DEF(GCC151_X64_CC_FLAGS) -Os -Werror -Wno-error=unused-but-set-variable -Wno-error=comment -Wno-error=deprecated-non-prototype + DEBUG_GCC151_X64_CXX_FLAGS = DEF(GCC151_X64_CC_FLAGS) -g3 -O0 -Wno-error=unused-but-set-variable -Wno-error=comment -Wno-error=deprecated-non-prototype +RELEASE_GCC151_X64_CXX_FLAGS = DEF(GCC151_X64_CC_FLAGS) -Os -Werror -Wno-error=unused-but-set-variable -Wno-error=comment -Wno-error=deprecated-non-prototype # # From 45283d7fa83f336c361d7b692f41968e5c03188d Mon Sep 17 00:00:00 2001 From: YBronst Date: Mon, 22 Sep 2025 23:47:29 +0300 Subject: [PATCH 02/10] Update buildme --- buildme | 903 ++++++++++++++++++++------------------------------------ 1 file changed, 328 insertions(+), 575 deletions(-) diff --git a/buildme b/buildme index de41b51dd6..438fcb17be 100755 --- a/buildme +++ b/buildme @@ -2,42 +2,81 @@ # created by vector sigma on July 15 2019 # modified by LAbyOne on My 2021 +# Remastered by YBronst in Aug 2025. # github version -# Linux users should be able to use this wrapper, although the following are needed: -# (Ubuntu alike) -# sudo apt-get install build-essential uuid-dev iasl git gcc-9 nasm python3-distutils +export TERM=xterm-256color +export LC_ALL=C.UTF-8 + +# Defining the base directory +BASE_DIR="$(dirname "$0")" + +# $1 argument overrides MYTOOLCHAIN variable (e.g., GCC53) +MYTOOLCHAIN="${1:-GCC151}" # Default to GCC151 if no argument provided -# $1 argument override MYTOOLCHAIN variable, in case you want GCC53 for example # ====== COLORS ====== -COL_BLACK="\x1b[40;01m" -COL_RED="\x1b[31;01m" -COL_GREEN="\x1b[32;01m" -COL_YELLOW="\x1b[33;01m" -COL_MAGENTA="\x1b[35;01m" -COL_CYAN="\x1b[36;01m" -COL_WHITE="\x1b[37;01m" -COL_BLUE="\x1b[34;01m" -COL_RESET="\x1b[39;49;00m" +# Основные цвета +COL_RED=$(tput setaf 1) # Red +COL_GREEN=$(tput setaf 2) # Green +COL_YELLOW=$(tput setaf 3) # Yellow +COL_BLUE=$(tput setaf 4) # Blue +COL_PURPLE=$(tput setaf 5) # Purple +COL_CYAN=$(tput setaf 6) # Cyan +COL_WHITE=$(tput setaf 7) # White + +# Light shades +COL_LIGHT_RED=$(tput setaf 9) # Light Red +COL_LIGHT_GREEN=$(tput setaf 10) # Light Green +COL_LIGHT_YELLOW=$(tput setaf 229) # Light Yellow (замена для setaf 11) +COL_LIGHT_BLUE=$(tput setaf 153) # Light Blue (замена для setaf 12) +COL_LIGHT_PURPLE=$(tput setaf 183) # Light Purple (замена для setaf 13) +COL_LIGHT_CYAN=$(tput setaf 14) # Light Cyan + +# Dark shades +COL_DARK_RED=$(tput setaf 124) # Dark Red +COL_DARK_GREEN=$(tput setaf 22) # Dark Green +COL_DARK_YELLOW=$(tput setaf 94) # Dark Yellow +COL_DARK_BLUE=$(tput setaf 18) # Dark Blue COL_DARK_PURPLE=$(tput setaf 54) # Dark Purple +COL_DARK_CYAN=$(tput setaf 30) # Dark Cyan + +# Bold options +COL_RED_BOLD=$(tput bold; tput setaf 1) # Bold Red +COL_GREEN_BOLD=$(tput bold; tput setaf 2) # Bold Green +COL_YELLOW_BOLD=$(tput bold; tput setaf 3) # Bold Yellow +COL_BLUE_BOLD=$(tput bold; tput setaf 4) # Bold Blue +COL_PURPLE_BOLD=$(tput bold; tput setaf 5) # Bold Purple +COL_CYAN_BOLD=$(tput bold; tput setaf 6) # Bold Cyan +COL_WHITE_BOLD=$(tput bold; tput setaf 7) # Bold White + +# Italic variants +COL_RED_ITALIC=$(tput sitm; tput setaf 1) # Italic Red +COL_GREEN_ITALIC=$(tput sitm; tput setaf 2) # Italic Green +COL_YELLOW_ITALIC=$(tput sitm; tput setaf 3) # Italic Yellow +COL_BLUE_ITALIC=$(tput sitm; tput setaf 4) # Italic Blue +COL_PURPLE_ITALIC=$(tput sitm; tput setaf 5) # Italic Purple +COL_CYAN_ITALIC=$(tput sitm; tput setaf 6) # Italic Cyan +COL_WHITE_ITALIC=$(tput sitm; tput setaf 7) # Italic White + +# Set background color +BG_BLUE=$(tput setab 4) +# Reset all attributes +COL_RESET=$(tput sgr0) + # ====== Main Window SetUp ====== if [[ "$2" != ci ]]; then osascript < /dev/null -fi +fi } updateClover() { echo "[UPDATE CLOVER]" cd "${CLOVERROOT}" -#clone_OpenCorePkg +clone_OpenCorePkg if [[ -d .git ]]; then git fetch --all --recurse-submodules git pull --recurse-submodules origin master @@ -180,7 +217,7 @@ fi } buildCloverHFSPlus() { -if [[ -f "${CLOVERROOT}"/FileSystems/HFSPlus/X64/HFSPlus.efi ]]; then +if [[ -f "${CLOVERROOT}/FileSystems/HFSPlus/X64/HFSPlus.efi" ]]; then echo "building Clover with HFSPlus" buildClover HFSPlus else @@ -191,213 +228,150 @@ fi } makeRelease() { - checkTools - - # to force recreation of the Conf folder. You can still use a custom CONF_PATH if you don't want recreation. - rm -rf "$CLOVERROOT"/Conf - mkdir "$CLOVERROOT"/Conf - - cd "${CLOVERROOT}" - if [[ -z "$WORKSPACE" ]]; then - export EDK_TOOLS_PATH="${PWD}"/BaseTools - set +u - source ./edksetup.sh BaseTools - set -u - cd "$CLOVERROOT" - WORKSPACE="${PWD}" - fi +checkTools +rm -rf "$CLOVERROOT/Conf" +mkdir "$CLOVERROOT/Conf" +cd "${CLOVERROOT}" +if [[ -z "$WORKSPACE" ]]; then + export EDK_TOOLS_PATH="${PWD}/BaseTools" + set +u + source ./edksetup.sh BaseTools + set -u + cd "$CLOVERROOT" + WORKSPACE="${PWD}" +fi - echo "[BUILD CLOVER RELEASE]" - ./ebuild.sh -fr -mc --no-usb -D NO_GRUB_DRIVERS_EMBEDDED -t $MYTOOLCHAIN - ./ebuild.sh -fr -D NO_GRUB_DRIVERS_EMBEDDED -D LESS_DEBUG -t $MYTOOLCHAIN - # Run a post build script if exist (${DIR_TOOLS}/CloverScripts/postbuild.sh) - if [[ -x "${DIR_TOOLS}"/CloverScripts/postbuild.sh ]]; then - chmod +x "${DIR_TOOLS}"/CloverScripts/postbuild.sh - echo "Running Clover postbuild script" - "${DIR_TOOLS}"/CloverScripts/postbuild.sh "${CLOVERROOT}" $MYTOOLCHAIN - fi +echo "[BUILD CLOVER RELEASE]" +./ebuild.sh -fr -mc --no-usb -D NO_GRUB_DRIVERS_EMBEDDED -t $MYTOOLCHAIN +./ebuild.sh -fr -D NO_GRUB_DRIVERS_EMBEDDED -D LESS_DEBUG -t $MYTOOLCHAIN +if [[ -x "${DIR_TOOLS}/CloverScripts/postbuild.sh" ]]; then + chmod +x "${DIR_TOOLS}/CloverScripts/postbuild.sh" + echo "Running Clover postbuild script" + "${DIR_TOOLS}/CloverScripts/postbuild.sh" "${CLOVERROOT}" $MYTOOLCHAIN +fi } makeReleaseXC() { - checkTools - - # to force recreation of the Conf folder. You can still use a custom CONF_PATH if you don't want recreation. - rm -rf "$CLOVERROOT"/Conf - mkdir "$CLOVERROOT"/Conf - - cd "${CLOVERROOT}" - if [[ -z "$WORKSPACE" ]]; then - export EDK_TOOLS_PATH="${PWD}"/BaseTools - set +u - source ./edksetup.sh BaseTools - set -u - cd "$CLOVERROOT" - WORKSPACE="${PWD}" - fi - - echo "[BUILD CLOVER RELEASE WITH XCODE]" - local xrel="$(defaults read /Applications/Xcode.app/Contents/version.plist CFBundleShortVersionString)" - if [[ "$xrel" < "14.*" ]]; then - ./ebuild.sh -fr -mc --no-usb -D NO_GRUB_DRIVERS_EMBEDDED -D -t XCODE8 - ./ebuild.sh -fr -D NO_GRUB_DRIVERS_EMBEDDED -D -t XCODE8 - elif [[ "$xrel" == "14.*" ]]; then - ./ebuild.sh -fr -mc --no-usb -D NO_GRUB_DRIVERS_EMBEDDED -D -t XCODE14 - ./ebuild.sh -fr -D NO_GRUB_DRIVERS_EMBEDDED -D -t XCODE14 - elif [[ "$xrel" == "15.*" ]]; then - ./ebuild.sh -fr -mc --no-usb -D NO_GRUB_DRIVERS_EMBEDDED -D -t XCODE15 - ./ebuild.sh -fr -D NO_GRUB_DRIVERS_EMBEDDED -D -t XCODE15 - elif [[ "$xrel" == "16.*" ]]; then - ./ebuild.sh -fr -mc --no-usb -D NO_GRUB_DRIVERS_EMBEDDED -D -t XCODE16 - ./ebuild.sh -fr -D NO_GRUB_DRIVERS_EMBEDDED -D -t XCODE16 - fi - # Run a post build script if exist (${DIR_TOOLS}/CloverScripts/postbuild.sh) - if [[ -x "${DIR_TOOLS}"/CloverScripts/postbuild.sh ]]; then - chmod +x "${DIR_TOOLS}"/CloverScripts/postbuild.sh - echo "Running Clover postbuild script" - "${DIR_TOOLS}"/CloverScripts/postbuild.sh "${CLOVERROOT}" $MYTOOLCHAIN - fi -} - - -buildCCPV() { - cd "${CLOVERROOT}"/Xcode/CloverConfigPlistValidator - make -} +checkTools +rm -rf "$CLOVERROOT/Conf" +mkdir "$CLOVERROOT/Conf" +cd "${CLOVERROOT}" +if [[ -z "$WORKSPACE" ]]; then + export EDK_TOOLS_PATH="${PWD}/BaseTools" + set +u + source ./edksetup.sh BaseTools + set -u + cd "$CLOVERROOT" + WORKSPACE="${PWD}" +fi -BLC() { -if [[ ! -d "${CLOVERROOT}"/CloverPackage/BootLoaderChooser ]]; then - mkdir -p "${CLOVERROOT}"/CloverPackage/BootLoaderChooser +echo "[BUILD CLOVER RELEASE WITH XCODE]" +local ver=$(defaults read /Applications/Xcode.app/Contents/version.plist CFBundleShortVersionString | cut -d. -f1) +local xrel="XCODE$(( ver>16 ? 16 : ver ))" +./ebuild.sh -fr -mc --no-usb -D NO_GRUB_DRIVERS_EMBEDDED -t $xrel +./ebuild.sh -fr -D NO_GRUB_DRIVERS_EMBEDDED -t $xrel +if [[ -x "${DIR_TOOLS}/CloverScripts/postbuild.sh" ]]; then + chmod +x "${DIR_TOOLS}/CloverScripts/postbuild.sh" + echo "Running Clover postbuild script" + "${DIR_TOOLS}/CloverScripts/postbuild.sh" "${CLOVERROOT}" $MYTOOLCHAIN fi -curl -sLq https://github.com/jief666/BootloaderChooser/releases/download/1.4/BootX64.efi > "${CLOVERROOT}"/CloverPackage/BootLoaderChooser/BootX64.efi -chmod 775 "${CLOVERROOT}"/CloverPackage/BootLoaderChooser/BootX64.efi } buildClover() { - checkTools - - # to force recreation of the Conf folder. You can still use a custom CONF_PATH if you don't want recreation. - rm -rf "$CLOVERROOT"/Conf - mkdir "$CLOVERROOT"/Conf - - cd "${CLOVERROOT}" - if [[ -z "$WORKSPACE" ]]; then - export EDK_TOOLS_PATH="${PWD}"/BaseTools - set +u - source ./edksetup.sh BaseTools - set -u - cd "$CLOVERROOT" - WORKSPACE="${PWD}" - fi +checkTools +rm -rf "$CLOVERROOT/Conf" +mkdir "$CLOVERROOT/Conf" +cd "${CLOVERROOT}" +if [[ -z "$WORKSPACE" ]]; then + export EDK_TOOLS_PATH="${PWD}/BaseTools" + set +u + source ./edksetup.sh BaseTools + set -u + cd "$CLOVERROOT" + WORKSPACE="${PWD}" +fi - echo "[BUILD CLOVER]" - # Run a custom build script if exist (${DIR_TOOLS}/Scripts/build.sh) - # This allow the user to run ebuild.sh with own parameters - if [[ -x "${DIR_TOOLS}"/Scripts/build.sh ]]; then - echo "Running custom build script" - "${DIR_TOOLS}"/Scripts/build.sh "${CLOVERROOT}" $MYTOOLCHAIN +echo "[BUILD CLOVER]" +if [[ -x "${DIR_TOOLS}/Scripts/build.sh" ]]; then + echo "Running custom build script" + "${DIR_TOOLS}/Scripts/build.sh" "${CLOVERROOT}" $MYTOOLCHAIN +else + local parameter=${1:-none} + if [[ "${parameter}" == HFSPlus ]]; then + ./ebuild.sh -fr -D NO_GRUB_DRIVERS_EMBEDDED -D USE_APPLE_HFSPLUS_DRIVER -t $MYTOOLCHAIN else - local parameter=${1:-none} - if [[ "${parameter}" == HFSPlus ]]; then - #./ebuild.sh -fr -mc --no-usb -D NO_GRUB_DRIVERS_EMBEDDED -D USE_APPLE_HFSPLUS_DRIVER -t $MYTOOLCHAIN - ./ebuild.sh -fr -D NO_GRUB_DRIVERS_EMBEDDED -D USE_APPLE_HFSPLUS_DRIVER -t $MYTOOLCHAIN - else - #./ebuild.sh -fr -mc --no-usb -D NO_GRUB_DRIVERS_EMBEDDED -t $MYTOOLCHAIN - ./ebuild.sh -fr -D NO_GRUB_DRIVERS_EMBEDDED -D LESS_DEBUG -t $MYTOOLCHAIN - fi - fi - # Run a post build script if exist (${DIR_TOOLS}/CloverScripts/postbuild.sh) - if [[ -x "${DIR_TOOLS}"/CloverScripts/postbuild.sh ]]; then - chmod +x "${DIR_TOOLS}"/CloverScripts/postbuild.sh - echo "Running Clover postbuild script" - "${DIR_TOOLS}"/CloverScripts/postbuild.sh "${CLOVERROOT}" $MYTOOLCHAIN - fi - # Run a custom post build script if exist (${DIR_TOOLS}/Scripts/postbuild.sh) - if [[ -x "${DIR_TOOLS}"/Scripts/postbuild.sh ]]; then - echo "Running postbuild script" - "${DIR_TOOLS}"/Scripts/postbuild.sh "${CLOVERROOT}" $MYTOOLCHAIN + ./ebuild.sh -fr -D NO_GRUB_DRIVERS_EMBEDDED -D LESS_DEBUG -t $MYTOOLCHAIN fi +fi +if [[ -x "${DIR_TOOLS}/CloverScripts/postbuild.sh" ]]; then + chmod +x "${DIR_TOOLS}/CloverScripts/postbuild.sh" + echo "Running Clover postbuild script" + "${DIR_TOOLS}/CloverScripts/postbuild.sh" "${CLOVERROOT}" $MYTOOLCHAIN +fi +if [[ -x "${DIR_TOOLS}/Scripts/postbuild.sh" ]]; then + echo "Running postbuild script" + "${DIR_TOOLS}/Scripts/postbuild.sh" "${CLOVERROOT}" $MYTOOLCHAIN +fi } buildCloverXC() { - checkTools - - # to force recreation of the Conf folder. You can still use a custom CONF_PATH if you don't want recreation. - rm -rf "$CLOVERROOT"/Conf - mkdir "$CLOVERROOT"/Conf - - cd "${CLOVERROOT}" - if [[ -z "$WORKSPACE" ]]; then - export EDK_TOOLS_PATH="${PWD}"/BaseTools - set +u - source ./edksetup.sh BaseTools - set -u - cd "$CLOVERROOT" - WORKSPACE="${PWD}" - fi +checkTools +rm -rf "$CLOVERROOT/Conf" +mkdir "$CLOVERROOT/Conf" +cd "${CLOVERROOT}" +if [[ -z "$WORKSPACE" ]]; then + export EDK_TOOLS_PATH="${PWD}/BaseTools" + set +u + source ./edksetup.sh BaseTools + set -u + cd "$CLOVERROOT" + WORKSPACE="${PWD}" +fi - echo "[BUILD CLOVER WITH XCODE]" - # Run a custom build script if exist (${DIR_TOOLS}/Scripts/build.sh) - # This allow the user to run ebuild.sh with own parameters - if [[ -x "${DIR_TOOLS}"/Scripts/build.sh ]]; then - echo "Running custom build script" - "${DIR_TOOLS}"/Scripts/build.sh "${CLOVERROOT}" $MYTOOLCHAIN - else - local xrel="$(defaults read /Applications/Xcode.app/Contents/version.plist CFBundleShortVersionString)" - if [[ "$xrel" < "14.*" ]]; then - ./ebuild.sh -fr -D NO_GRUB_DRIVERS_EMBEDDED -D USE_APPLE_HFSPLUS_DRIVER -t XCODE8 - elif [[ "$xrel" > "16.0" ]]; then - ./ebuild.sh -fr -D NO_GRUB_DRIVERS_EMBEDDED -D USE_APPLE_HFSPLUS_DRIVER -t XCODE16 - elif [[ "$xrel" > "15.0" ]]; then - ./ebuild.sh -fr -D NO_GRUB_DRIVERS_EMBEDDED -D USE_APPLE_HFSPLUS_DRIVER -t XCODE15 - elif [[ "$xrel" > "14.0" ]]; then - ./ebuild.sh -fr -D NO_GRUB_DRIVERS_EMBEDDED -D USE_APPLE_HFSPLUS_DRIVER -t XCODE14 - fi - fi - # Run a post build script if exist (${DIR_TOOLS}/CloverScripts/postbuild.sh) - if [[ -x "${DIR_TOOLS}"/CloverScripts/postbuild.sh ]]; then - chmod +x "${DIR_TOOLS}"/CloverScripts/postbuild.sh - echo "Running Clover postbuild script" - "${DIR_TOOLS}"/CloverScripts/postbuild.sh "${CLOVERROOT}" $MYTOOLCHAIN - fi - # Run a custom post build script if exist (${DIR_TOOLS}/Scripts/postbuild.sh) - if [[ -x "${DIR_TOOLS}"/Scripts/postbuild.sh ]]; then - echo "Running postbuild script" - "${DIR_TOOLS}"/Scripts/postbuild.sh "${CLOVERROOT}" $MYTOOLCHAIN - fi +echo "[BUILD CLOVER WITH XCODE]" +if [[ -x "${DIR_TOOLS}/Scripts/build.sh" ]]; then + echo "Running custom build script" + "${DIR_TOOLS}/Scripts/build.sh" "${CLOVERROOT}" $MYTOOLCHAIN +else +local ver=$(defaults read /Applications/Xcode.app/Contents/version.plist CFBundleShortVersionString | cut -d. -f1) +local xrel="XCODE$(( ver>16 ? 16 : ver ))" + + ./ebuild.sh -fr -D NO_GRUB_DRIVERS_EMBEDDED -D USE_APPLE_HFSPLUS_DRIVER -t $xrel +fi +if [[ -x "${DIR_TOOLS}/CloverScripts/postbuild.sh" ]]; then + chmod +x "${DIR_TOOLS}/CloverScripts/postbuild.sh" + echo "Running Clover postbuild script" + "${DIR_TOOLS}/CloverScripts/postbuild.sh" "${CLOVERROOT}" $MYTOOLCHAIN +fi +if [[ -x "${DIR_TOOLS}/Scripts/postbuild.sh" ]]; then + echo "Running postbuild script" + "${DIR_TOOLS}/Scripts/postbuild.sh" "${CLOVERROOT}" $MYTOOLCHAIN +fi } buildtestsix() { - checkTools - - # to force recreation of the Conf folder. You can still use a custom CONF_PATH if you don't want recreation. - rm -rf "$CLOVERROOT"/Conf - mkdir "$CLOVERROOT"/Conf - - cd "${CLOVERROOT}" - echo "[BUILD CLOVERDB]" - ./hebuild.sh -t $MYTOOLCHAIN +checkTools +rm -rf "$CLOVERROOT/Conf" +mkdir "$CLOVERROOT/Conf" +cd "${CLOVERROOT}" +echo "[BUILD CLOVERDB]" +./hebuild.sh -t $MYTOOLCHAIN } buildtestsev() { - checkTools - - # to force recreation of the Conf folder. You can still use a custom CONF_PATH if you don't want recreation. - rm -rf "$CLOVERROOT"/Conf - mkdir "$CLOVERROOT"/Conf - - cd "${CLOVERROOT}" - echo "[BUILD CLOVERDB]" - ./hebuild.sh -mc --no-usb -D NO_GRUB_DRIVERS_EMBEDDED -t $MYTOOLCHAIN +checkTools +rm -rf "$CLOVERROOT/Conf" +mkdir "$CLOVERROOT/Conf" +cd "${CLOVERROOT}" +echo "[BUILD CLOVERDB]" +./hebuild.sh -mc --no-usb -D NO_GRUB_DRIVERS_EMBEDDED -t $MYTOOLCHAIN } - buildCloverTest() { checkTools - cd "${CLOVERROOT}" - if [[ -z "$WORKSPACE" ]]; then - export EDK_TOOLS_PATH="${PWD}"/BaseTools + export EDK_TOOLS_PATH="${PWD}/BaseTools" set +u source ./edksetup.sh BaseTools set -u @@ -411,12 +385,13 @@ echo "[BUILD CLOVER TEST]" buildPkg() { if [[ "$SYSNAME" == Darwin ]]; then - cd "${CLOVERROOT}"/CloverPackage - echo "[BUILD PKG]" + cd "${CLOVERROOT}/CloverPackage" checkXCODE checkGETTEXT -# source ./makepkg - make pkg + echo "[BUILD PKG]" + echo "The log will be created in the CloverPackage folder." + rm -f mpkg.log + make pkg | tee mpkg.log else echo && echo "can't build pkg on a non Darwin OS!" fi @@ -424,7 +399,7 @@ fi buildUtils() { if [[ "$SYSNAME" == Darwin ]]; then - cd "${CLOVERROOT}"/CloverPackage + cd "${CLOVERROOT}/CloverPackage" echo "[BUILD UTILS]" checkXCODE make utils @@ -436,13 +411,13 @@ fi buildApp() { local withClover=${1-"none"} if [[ "$SYSNAME" == Darwin ]]; then - if [[ -f "${CLOVERROOT}"/CloverPackage/CloverV2/EFI/CLOVER/CLOVERX64.efi ]]; then - rm -f "${CLOVERROOT}"/CloverPackage/sym/.withV2 - mkdir -p "${CLOVERROOT}"/CloverPackage/sym + if [[ -f "${CLOVERROOT}/CloverPackage/CloverV2/EFI/CLOVER/CLOVERX64.efi" ]]; then + rm -f "${CLOVERROOT}/CloverPackage/sym/.withV2" + mkdir -p "${CLOVERROOT}/CloverPackage/sym" if [[ $withClover == withV2 ]]; then - touch "${CLOVERROOT}"/CloverPackage/sym/.withV2 + touch "${CLOVERROOT}/CloverPackage/sym/.withV2" fi - cd "${CLOVERROOT}"/CloverApp + cd "${CLOVERROOT}/CloverApp" echo "[BUILD APP]" checkXCODE make @@ -456,185 +431,60 @@ fi } buildIso() { - cd "${CLOVERROOT}"/CloverPackage - echo "[BUILD ISO]" - make iso +cd "${CLOVERROOT}/CloverPackage" +echo "[BUILD ISO]" +make iso } makeV2() { - #clear - export V2=${V2:-${CLOVERROOT}/CloverPackage/CloverV2} - if [[ -f $V2/EFI/CLOVER/CLOVERX64.efi ]]; then - cd "${CLOVERROOT}"/CloverPackage - echo "" && echo -e $COL_CYAN"[BUILD CloverV2]" - make zip - else - echo "" && echo -e $COL_RED"please, Compile Clover first!!" - Sleep 3 - fi +export V2=${V2:-"${CLOVERROOT}/CloverPackage/CloverV2"} +if [[ -f "$V2/EFI/CLOVER/CLOVERX64.efi" ]]; then + cd "${CLOVERROOT}/CloverPackage" + echo "" && echo -e "${COL_CYAN}[BUILD CloverV2]" + make zip +else + echo "" && echo -e "${COL_RED}please, Compile Clover first!!" + sleep 3 +fi } - checkStatus() { - if [[ -d .git ]]; then - git fetch --recurse-submodules origin - git log -n 1 > "${DIR_OUT}"/status_${revision}-$(date +%Y%m%d-%H.%M.%S).txt - git status >> "${DIR_OUT}"/status_${revision}-$(date +%Y%m%d-%H.%M.%S).txt - git submodule foreach --recursive "git log -n 1 && git status" >> "${DIR_OUT}"/status_${revision}-$(date +%Y%m%d-%H.%M.%S).txt && open "${DIR_OUT}"/status_${revision}-*.txt - else - echo "Error: this is not a git repository, can't get info!" - fi +if [[ -d .git ]]; then + git fetch --recurse-submodules origin + git log -n 1 > "${DIR_OUT}"/status_${revision}-$(date +%Y%m%d-%H.%M.%S).txt + git status >> "${DIR_OUT}"/status_${revision}-$(date +%Y%m%d-%H.%M.%S).txt + git submodule foreach --recursive "git log -n 1 && git status" >> "${DIR_OUT}"/status_${revision}-$(date +%Y%m%d-%H.%M.%S).txt && open "${DIR_OUT}"/status_${revision}-*.txt +else + echo "Error: this is not a git repository, can't get info!" +fi } showdiff() { - if [[ -d .git ]]; then +if [[ -d .git ]]; then git fetch --recurse-submodules origin git diff > "${DIR_OUT}"/diff_${revision}-$(date +%Y%m%d-%H.%M.%S).txt && open "${DIR_OUT}"/diff_${revision}-*.txt - else - echo "Error: this is not a git repository, can't get info!" - fi +else + echo "Error: this is not a git repository, can't get info!" +fi } cleanBaseTools() { -cd "${CLOVERROOT}"/BaseTools +cd "${CLOVERROOT}/BaseTools" make clean } -## Utilities -buildCPV() { - revision=r$(git describe --tags $(git rev-list --tags --max-count=1)) - if [[ -d "${CLOVERROOT}"/CloverPackage/CloverConfigPlistValidator ]]; then - rm -Rf "${CLOVERROOT}"/CloverPackage/CloverConfigPlistValidator - fi - mkdir -p "${CLOVERROOT}"/CloverPackage/CloverConfigPlistValidator - cd "${CLOVERROOT}"/Xcode/CloverConfigPlistValidator - checkXCODE - xcodebuild -project ./CloverConfigPlistValidator.xcodeproj -quiet CONFIGURATION_BUILD_DIR="${CLOVERROOT}"/CloverPackage/CloverConfigPlistValidator - mv -f "${CLOVERROOT}"/CloverPackage/CloverConfigPlistValidator/CloverConfigPlistValidator "${CLOVERROOT}"/CloverPackage/CloverConfigPlistValidator/CloverConfigPlistValidator_${revision} - rm -r "${CLOVERROOT}"/CloverPackage/CloverConfigPlistValidator/*.dSYM - open "${CLOVERROOT}"/CloverPackage/CloverConfigPlistValidator -} - -PlistEDPlus() { - if [[ ! -d $HOME/Desktop/ClovUtils ]]; then - mkdir -p $HOME/Desktop/ClovUtils - fi - cd $HOME/Desktop/ClovUtils && curl -qsSLk https://github.com/ic005k/PlistEDPlus/releases/download/1.2.35/PlistEDPlus_Mac.dmg > PlistEDPlus_Mac.dmg - hdiutil attach -quiet -noverify -nobrowse PlistEDPlus_Mac.dmg && cp -Rf /Volumes/bin\:release\:PlistEDPlus/PlistEDPlus.app $HOME/Desktop/ClovUtils - hdiutil detach -force /Volumes/bin\:release\:PlistEDPlus - rm -r $HOME/Desktop/ClovUtils/PlistEDPlus_Mac.dmg && open $HOME/Desktop/ClovUtils -} - -Hackintool() { - if [[ ! -d $HOME/Desktop/ClovUtils ]]; then - mkdir -p $HOME/Desktop/ClovUtils - fi - cd $HOME/Desktop/ClovUtils && curl -sLq https://github.com/headkaze/Hackintool/releases/download/3.8.4/Hackintool.zip -o Hackintool.zip - unzip -q Hackintool.zip && rm -r Hackintool.zip && open $HOME/Desktop/ClovUtils -} - -BitmaskDecode() { - if [[ ! -d $HOME/Desktop/ClovUtils ]]; then - mkdir -p $HOME/Desktop/ClovUtils - fi - cd $HOME/Desktop/ClovUtils && git clone -q https://github.com/corpnewt/BitmaskDecode && open $HOME/Desktop/ClovUtils -} - -MaciASL() { - if [[ ! -d $HOME/Desktop/ClovUtils ]]; then - mkdir -p $HOME/Desktop/ClovUtils - fi - cd $HOME/Desktop/ClovUtils && curl -sLq https://github.com/acidanthera/MaciASL/releases/download/1.6.2/MaciASL-1.6.2-RELEASE.dmg > MaciASL-1.6.2-RELEASE.dmg - hdiutil attach -quiet -noverify -nobrowse MaciASL-1.6.2-RELEASE.dmg && cp -Rf /Volumes/MaciASL/MaciASL.app $HOME/Desktop/ClovUtils - hdiutil detach -force /Volumes/MaciASL - rm -r $HOME/Desktop/ClovUtils/MaciASL-1.6.2-RELEASE.dmg && open $HOME/Desktop/ClovUtils -} - -dmidecode() { - if [[ ! -d $HOME/Desktop/ClovUtils ]]; then - mkdir -p $HOME/Desktop/ClovUtils/dmidecode - fi - cd $HOME/Desktop/ClovUtils && git clone -q https://github.com/acidanthera/dmidecode dmi-decode && xcodebuild -project ./dmi-decode/dmidecode.xcodeproj -quiet - cp -r dmi-decode/dmidecode $HOME/Desktop/ClovUtils/dmidecode && rm -Rf $HOME/Desktop/ClovUtils/dmi-decode && open $HOME/Desktop/ClovUtils -} - -Get-IOReg-Devices() { - if [[ ! -d $HOME/Desktop/ClovUtils ]]; then - mkdir -p $HOME/Desktop/ClovUtils - fi - cd $HOME/Desktop/ClovUtils && git clone -q https://github.com/LAbyOne/Get-IOReg-Devices - mv -f Get-IOReg-Devices/Get\ IOReg\ Devices $HOME/Desktop/ClovUtils/Get\ IOReg-Devices && chmod a+x $HOME/Desktop/ClovUtils/Get\ IOReg-Devices/*.command - rm -rf Get-IOReg-Devices && open $HOME/Desktop/ClovUtils -} - -NDBrightness () { - if [[ ! -d $HOME/Desktop/ClovUtils ]]; then - mkdir -p $HOME/Desktop/ClovUtils - fi - cd $HOME/Desktop/ClovUtils && git clone -q https://github.com/KAMIKAZEUA/NativeDisplayBrightness NDBrightness - xcodebuild -project ./NDBrightness/NativeDisplayBrightness.xcodeproj -quiet -configuration Release clean build ARCHS=x86_64 ONLY_ACTIVE_ARCH=YES CONFIGURATION_BUILD_DIR=$HOME/Desktop/ClovUtils - rm -Rf $HOME/Desktop/ClovUtils/NDBrightness && rm -r $HOME/Desktop/ClovUtils/*.dSYM && open $HOME/Desktop/ClovUtils -} - -SSDTTime() { - if [[ ! -d $HOME/Desktop/ClovUtils ]]; then - mkdir -p $HOME/Desktop/ClovUtils - fi - cd $HOME/Desktop/ClovUtils && git clone -q https://github.com/corpnewt/SSDTTime && open $HOME/Desktop/ClovUtils -} - -USBMap() { - if [[ ! -d $HOME/Desktop/ClovUtils ]]; then - mkdir -p $HOME/Desktop/ClovUtils - fi - cd $HOME/Desktop/ClovUtils && git clone -q https://github.com/corpnewt/USBMap - open $HOME/Desktop/ClovUtils -} - -Xiasl() { - if [[ ! -d $HOME/Desktop/ClovUtils ]]; then - mkdir -p $HOME/Desktop/ClovUtils - fi - #cd $HOME/Desktop/ClovUtils && curl -sLq https://github.com/ic005k/Xiasl/releases/download/1.1.66/Xiasl_Mac.dmg > Xiasl_Mac.dmg - #hdiutil attach -quiet -noverify -nobrowse Xiasl_Mac.dmg && cp -Rf /Volumes/bin\:release\:Xiasl/Xiasl.app $HOME/Desktop/ClovUtils - #hdiutil detach -force /Volumes/bin\:release\:Xiasl - #rm -r $HOME/Desktop/ClovUtils/Xiasl_Mac.dmg && open $HOME/Desktop/ClovUtils - - cd $HOME/Desktop/ClovUtils && curl -sLq https://github.com/CloverHackyColor/Xiasl/releases/download/1.1.8/Xiasl.zip > Xiasl.zip - unzip -q Xiasl.zip && rm -r Xiasl.zip && open $HOME/Desktop/ClovUtils -} - -CsrDecode() { - if [[ ! -d $HOME/Desktop/ClovUtils ]]; then - mkdir -p $HOME/Desktop/ClovUtils/CsrDecode - fi - cd $HOME/Desktop/ClovUtils && git clone -q https://github.com/corpnewt/CsrDecode && open $HOME/Desktop/ClovUtils -} - -gibMacOS() { - if [[ ! -d $HOME/Desktop/ClovUtils ]]; then - mkdir -p $HOME/Desktop/ClovUtils - fi - cd $HOME/Desktop/ClovUtils && git clone -q https://github.com/corpnewt/gibMacOS && open $HOME/Desktop/ClovUtils -} - -mountR/W() { - if [[ ! -d $HOME/Desktop/ClovUtils ]]; then - mkdir -p $HOME/Desktop/ClovUtils - fi - cd $HOME/Desktop/ClovUtils && curl -sLq https://github.com/jacklukem/BigSurmountsrw/releases/download/1.0/BigSurmountsrw2.app.zip -o BigSurmountsrw2.app.zip && open $HOME/Desktop/ClovUtils - unzip -q $HOME/Desktop/ClovUtils/BigSurmountsrw2.app.zip && rm -r $HOME/Desktop/ClovUtils/BigSurmountsrw2.app.zip $HOME/Desktop/ClovUtils/__MACOSX +makeBaseTools() { +cd "${CLOVERROOT}" +make -C BaseTools "BUILD_CC=clang" } - testing() { -#clear -echo -echo -e $COL_GREEN" ---------------------------------------------------------------------------------" -echo -e " 🍀 Clover r${revision}$COL_CYAN (SHA: $lsha1)" -echo -e $COL_BLUE" Test Builds" -echo -e $COL_GREEN" ---------------------------------------------------------------------------------"$COL_RESET -echo -e "\n\n\n\n\n\n\n\n\n\n\n" +echo -e "\n" +echo -e "${COL_GREEN} ---------------------------------------------------------------------------------${COL_RESET}" +echo -e " 🍀 Clover r${revision}${COL_YELLOW} (SHA: ${lsha1})${COL_RESET}" +echo -e "${COL_CYAN} Test Builds${COL_RESET}" +echo -e "${COL_GREEN} ---------------------------------------------------------------------------------${COL_RESET}" +echo -e "\n" PS3=' Please enter your choice: ' @@ -643,9 +493,9 @@ options=( 'test Clover with boot6' 'test build (no autogen, no boot files)' 'back to Cloverbuilds' 'Exit') -select opt in "${options[@]}" - do - case $opt in +select opt in "${options[@]}" +do + case $opt in "test Clover with boot6") buildtestsix break @@ -670,155 +520,56 @@ select opt in "${options[@]}" echo "invalid option $REPLY" break ;; - esac - done + esac +done testing } -Utilities() { -echo -echo -e $COL_GREEN" ---------------------------------------------------------------------------------" -echo -e " 🍀 Clover r${revision}$COL_DARK_PURPLE (SHA: $lsha1)" -echo -e $COL_CYAN" External Utilities " -echo -e $COL_DARK_PURPLE" All Files will be put on Desktop/ClovUtils" -echo -e $COL_GREEN" ---------------------------------------------------------------------------------"$COL_RESET -echo -e "\n\n\n\n\n\n\n" - -PS3=' -Please enter your choice: ' -options=( 'Get CloverConfigPlistValidator ' - 'Get PlistEDPlus ' - 'Get Hackintool ' - 'Get BitmaskDecode ' - 'Get MaciASL ' - 'Get dmidecode ' - 'Get IOReg-Devices ' - 'Get NativeDisplayBrightness ' - 'Get SSDTTime' - 'Get USBMap' - 'Get Xiasl' - 'Get CsrDecode' - 'Get gibMacOS' - 'Get mountR/W' - 'back to Cloverbuilds' - 'Exit') -select opt in "${options[@]}" - do - case $opt in - "Get CloverConfigPlistValidator ") - buildCPV - break - ;; - "Get PlistEDPlus ") - PlistEDPlus - break - ;; - "Get Hackintool ") - Hackintool - break - ;; - "Get BitmaskDecode ") - BitmaskDecode - break - ;; - "Get MaciASL ") - MaciASL - break - ;; - "Get dmidecode ") - dmidecode - break - ;; - "Get IOReg-Devices ") - Get-IOReg-Devices - break - ;; - "Get NativeDisplayBrightness ") - NDBrightness - break - ;; - "Get SSDTTime") - SSDTTime - break - ;; - "Get USBMap") - USBMap - break - ;; - "Get Xiasl") - Xiasl - break - ;; - "Get CsrDecode") - CsrDecode - break - ;; - "Get gibMacOS") - gibMacOS - break - ;; - "Get mountR/W") - mountR/W - break - ;; - "back to Cloverbuilds") - menu - break - ;; - "Exit") - exit - break - ;; - *) - echo "invalid option $REPLY" - break - ;; - esac - done -Utilities -} - Extra() { -#clear -echo -echo -e $COL_GREEN" ---------------------------------------------------------------------------------" +echo -e "\n" +echo -e "${COL_GREEN} ---------------------------------------------------------------------------------" if [[ ! -x "$(which python3)" ]]; then - echo -e " ${pynone}" + echo -e " ${pynone}" fi -echo -e "$COL_GREEN 🍀 Clover r${revision}$COL_DARK_PURPLE (SHA: $lsha1)" -echo -e "$COL_DARK_PURPLE Default TOOLCHAIN:$COL_CYAN $MYTOOLCHAIN$COL_DARK_PURPLE " -echo -e "${COL_DARK_PURPLE} Switch to${COL_CYAN} XCODE${COL_DARK_PURPLE} can be done on${COL_CYAN} Cloverbuilds" +echo -e "${COL_GREEN} 🍀 Clover r${revision}${COL_YELLOW} (SHA: ${lsha1})${COL_RESET}" +echo -e "${COL_YELLOW} Default TOOLCHAIN:${COL_CYAN} $MYTOOLCHAIN${COL_RESET}" +echo -e "${COL_YELLOW} Switch to${COL_CYAN} XCODE can be done on Cloverbuilds${COL_RESET}" if [[ -x "$(which python3)" ]]; then - echo -e $COL_GREEN" ---------------------- ${pyversion}$COL_GREEN -------------------- "$COL_RESET - echo -e "\n\n\n\n\n\n\n\n\n\n" + echo -e "${COL_GREEN} ${pyversion}${COL_GREEN} ${COL_RESET}" + echo -e "${COL_GREEN} ---------------------------------------------------------------------------------${COL_RESET}" + echo -e "\n" else -echo -e $COL_GREEN" ---------------------------------------------------------------------------------"$COL_RESET -echo -e "\n\n\n\n\n\n\n\n\n" + echo -e "${COL_GREEN} ---------------------------------------------------------------------------------${COL_RESET}" + echo -e "\n" fi PS3=' Please enter your choice: ' -options=( 'Cloverbuilds' +options=( 'back to main menu' + 'make BaseTools' 'test Clover' 'check status' 'show diff' 'open CloverV2 directory' 'update Clover (reset changes)' 'clean BaseTools' - 'Utilities' 'Exit') -select opt in "${options[@]}" +select opt in "${options[@]}" do case $opt in - "Cloverbuilds") + "back to main menu") menu break ;; - "test Clover") + "make BaseTools") + makeBaseTools + break + ;; + "test Clover") testing break ;; - "check status") + "check status") checkStatus break ;; @@ -827,8 +578,8 @@ do break ;; "open CloverV2 directory") - if [[ -d "${CLOVERROOT}"/CloverPackage/CloverV2/EFI/CLOVER ]]; then - open "${CLOVERROOT}"/CloverPackage/CloverV2/EFI/CLOVER + if [[ -d "${CLOVERROOT}/CloverPackage/CloverV2/EFI/CLOVER" ]]; then + open "${CLOVERROOT}/CloverPackage/CloverV2/EFI/CLOVER" else echo && echo "Directory not found. Compile Clover first!!" sleep 2 @@ -868,23 +619,22 @@ Extra } menu() { -#clear -echo -echo -e $COL_GREEN" ---------------------------------------------------------------------------------" +echo -e "\n" +echo -e "${COL_GREEN} ---------------------------------------------------------------------------------${COL_RESET}" if [[ ! -x "$(which python3)" ]]; then - echo -e " ${pynone}" + echo -e " ${pynone}" fi -echo -e "$COL_GREEN 🍀 Clover r${revision}$COL_DARK_PURPLE (SHA: $lsha1)" -echo -e "$COL_DARK_PURPLE Default TOOLCHAIN:$COL_CYAN $MYTOOLCHAIN$COL_DARK_PURPLE " -echo -e "${COL_DARK_PURPLE} Switch to${COL_CYAN} XCODE${COL_DARK_PURPLE} select:${COL_CYAN} build (with XCode)" -echo -e "${COL_DARK_PURPLE} Depending on your${COL_CYAN} XCODE version${COL_DARK_PURPLE} the Toolset will be${COL_CYAN} automatically chosen" -# echo -e "${COL_DARK_PURPLE} Toolset${COL_CYAN} is automatically chosen${COL_DARK_PURPLE} depending on the${COL_CYAN} XCODE installed version" +echo -e "${COL_GREEN} 🍀 Clover r${revision}${COL_YELLOW} (SHA: ${lsha1})${COL_RESET}" +echo -e "${COL_YELLOW} Default TOOLCHAIN:${COL_CYAN} $MYTOOLCHAIN${COL_RESET}" +echo -e "${COL_YELLOW} Switch to${COL_CYAN} XCODE${COL_YELLOW} select:${COL_CYAN} build (with XCode)${COL_RESET}" +echo -e "${COL_YELLOW} Depending on your${COL_CYAN} XCODE version${COL_YELLOW} the Toolset will be${COL_CYAN} automatically chosen${COL_RESET}" if [[ -x "$(which python3)" ]]; then - echo -e $COL_GREEN" ---------------------- ${pyversion}$COL_GREEN -------------------- "$COL_RESET - echo -e "\n\n\n\n\n" + echo -e "${COL_GREEN} ${pyversion}${COL_GREEN} ${COL_RESET}" + echo -e "${COL_GREEN} ---------------------------------------------------------------------------------${COL_RESET}" + echo -e "\n" else -echo -e $COL_GREEN" ---------------------------------------------------------------------------------"$COL_RESET -echo -e "\n\n\n\n\n" + echo -e "${COL_GREEN} ---------------------------------------------------------------------------------${COL_RESET}" + echo -e "\n" fi PS3=' Please enter your choice: ' @@ -910,13 +660,13 @@ do buildClover break ;; - "build all (Default Toolchain)") + "build all (Default Toolchain)") buildClover buildPkg buildIso - makeV2 + makeV2 break - ;; + ;; "make Release (Default Toolchain)") makeRelease buildPkg @@ -944,36 +694,35 @@ do buildCloverXC break ;; - "build all (with XCode)") - buildCloverXC - BLC - buildPkg - buildIso - makeV2 - break - ;; - "make Release (with XCode)") - makeReleaseXC - buildPkg - buildIso - makeV2 - break - ;; - "build Clover with HFSPlus") - buildCloverHFSPlus - break - ;; - "Extra Options") - Extra - break - ;; - "make utils") - buildUtils - break - ;; - "Exit") + "build all (with XCode)") + buildCloverXC + buildPkg + buildIso + makeV2 + break + ;; + "make Release (with XCode)") + makeReleaseXC + buildPkg + buildIso + makeV2 + break + ;; + "build Clover with HFSPlus") + buildCloverHFSPlus + break + ;; + "Extra Options") + Extra + break + ;; + "make utils") + buildUtils + break + ;; + "Exit") exit 0 - ;; + ;; *) echo "invalid option $REPLY" break @@ -984,14 +733,18 @@ menu } # Main -#clone_OpenCorePkg +clone_OpenCorePkg set -e -if [[ "$2" == ci ]]; then - makeRelease - BLC - buildPkg - buildIso - makeV2 +if [[ "$2" == "ci" ]]; then + makeRelease + buildPkg + buildIso + makeV2 +elif [[ "$2" == "xci" ]]; then + makeReleaseXC + buildPkg + buildIso + makeV2 else - menu -fi + menu +fi \ No newline at end of file From 111ce18771990d4c3f258dac36c68883f1f9e663 Mon Sep 17 00:00:00 2001 From: YBronst Date: Mon, 22 Sep 2025 23:47:33 +0300 Subject: [PATCH 03/10] Create makeiso7z --- CloverPackage/makeiso7z | 155 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 155 insertions(+) create mode 100755 CloverPackage/makeiso7z diff --git a/CloverPackage/makeiso7z b/CloverPackage/makeiso7z new file mode 100755 index 0000000000..a064e0ac03 --- /dev/null +++ b/CloverPackage/makeiso7z @@ -0,0 +1,155 @@ +#!/bin/bash +# +# Reset default charset for GNUsed problems... +export LC_ALL=C + +declare -r SYSNAME="$(uname)" + +# === Ensure 7z is available on macOS === +if [[ "$SYSNAME" == Darwin ]]; then + if ! command -v 7z &>/dev/null; then + TMPDIR="/private/tmp/7ztemp" + mkdir -p "$TMPDIR" + cd "$TMPDIR" || exit 1 + echo "[7Z] Downloading 7zz..." + curl -LO https://www.7-zip.org/a/7z2501-mac.tar.xz + tar -xf 7z2501-mac.tar.xz + xattr -d com.apple.quarantine 7zz 2>/dev/null || true + cp 7zz /usr/local/bin/7z + chmod +x /usr/local/bin/7z + cd - >/dev/null || exit 1 + rm -rf "$TMPDIR" + echo "[7Z] Installed to /usr/local/bin/7z" + fi +fi + +# ====== GLOBAL VARIABLES ====== +declare -r DRIVERS_LEGACY="BIOS" +declare -r DRIVERS_UEFI="UEFI" +declare -r DRIVERS_OFF="off" + +# Check that the caller is make +caller=$(ps -p $PPID -o comm=) +if [[ "$caller" != "make" ]]; then + echo "Error: don't call the '$0' script directly !" >&2 + echo "Use the 'make iso' command instead" >&2 +fi + +set -u + +# Go to the script directory +cd "$(dirname $0)" + +plistbuddy='/usr/libexec/PlistBuddy' +SRCROOT="$PWD" +SYMROOT=${SRCROOT}/sym +CLOVERROOT=${SRCROOT}/CloverV2 +IMGROOT=${SYMROOT}/CloverCD +CDBOOT=${IMGROOT}/usr/standalone/i386/cdboot +BASETOOLS_DIR=${SRCROOT}/../BaseTools/Source/C/bin + +REVISION=$(git describe --tags $(git rev-list --tags --max-count=1)) +PRODUCT=Clover-${REVISION} +CDLABEL=${PRODUCT}-X64 +ISOIMAGE=${SYMROOT}/${CDLABEL}.iso +THEME=embedded + +rm -rf ${SYMROOT}/CloverCD +rm -rf ${SYMROOT}/CloverISO + +[[ ! -d sym ]] && mkdir sym + +echo "====================== Creating cdboot =====================" +mkdir -p ${SYMROOT}/i386 +cp -f ${CLOVERROOT}/BootSectors/cdboot ${SYMROOT}/i386/ +dd if=${CLOVERROOT}/Bootloaders/x64/boot6 of=${SYMROOT}/i386/cdboot conv=sync bs=2k seek=1 &> /dev/null + +echo "Update cdboot with boot file size info" +if [[ "$SYSNAME" == Linux ]]; then + declare -r STAT_PARAM='-c%s' +else + declare -r STAT_PARAM='-f%z' +fi +stat "$STAT_PARAM" ${CLOVERROOT}/Bootloaders/x64/boot6 \ + | perl -ane "print pack('V',@F[0]);" \ + | dd of=${SYMROOT}/i386/cdboot bs=1 count=4 seek=2044 conv=notrunc &> /dev/null + +echo "======================= Creating ISO/7z =======================" +rm -rf ${IMGROOT} +mkdir -p ${IMGROOT}/usr/standalone/i386/x64 +mkdir -p ${IMGROOT}/EFI/BOOT +mkdir -p ${IMGROOT}/EFI/CLOVER/themes/ +mkdir -p ${IMGROOT}/usr/bin +mkdir -p "${IMGROOT}/usr/local/bin" + +cp -p "${SYMROOT}"/utils/* "${IMGROOT}"/usr/local/bin +cp -f ${SYMROOT}/i386/cdboot ${CDBOOT} + +if [[ -d "${CLOVERROOT}/themespkg/$THEME" ]]; then + cp -r -f ${CLOVERROOT}/themespkg/$THEME ${IMGROOT}/EFI/CLOVER/themes/ +fi + +cp -f ${CLOVERROOT}/EFI/BOOT/BOOTX64.efi ${IMGROOT}/EFI/BOOT/ +cp -f ${CLOVERROOT}/EFI/CLOVER/CLOVERX64.efi ${IMGROOT}/EFI/CLOVER/ +cp -f ${CLOVERROOT}/EFI/CLOVER/config-sample.plist ${IMGROOT}/EFI/CLOVER/config.plist +$plistbuddy -c "Delete :GUI:Theme" "${IMGROOT}/EFI/CLOVER/config.plist" &>/dev/null +$plistbuddy -c "Add :GUI:Theme string $THEME" "${IMGROOT}/EFI/CLOVER/config.plist" &>/dev/null + +mkdir -p ${IMGROOT}/EFI/CLOVER/drivers +cp -r -f ${CLOVERROOT}/EFI/CLOVER/drivers/$DRIVERS_LEGACY ${IMGROOT}/EFI/CLOVER/drivers/ +cp -r -f ${CLOVERROOT}/EFI/CLOVER/drivers/$DRIVERS_UEFI ${IMGROOT}/EFI/CLOVER/drivers/ +cp -r -f ${CLOVERROOT}/ThirdParty/* ${IMGROOT}/EFI/CLOVER/ +cp -r -f ${CLOVERROOT}/EFI/CLOVER/tools ${IMGROOT}/EFI/CLOVER/ + +isoOffPath=${IMGROOT}/EFI/CLOVER/drivers/$DRIVERS_OFF +mkdir -p ${isoOffPath} +find ${CLOVERROOT}/EFI/CLOVER/drivers -type f -name '*.efi' -exec cp -R {} "${isoOffPath}"/ \; + +# File System BIOS/UEFI +cp -f ${CLOVERROOT}/EFI/CLOVER/drivers/$DRIVERS_OFF/$DRIVERS_UEFI/FileSystem/ApfsDriverLoader.efi ${IMGROOT}/EFI/CLOVER/drivers/$DRIVERS_UEFI/ +cp -f ${CLOVERROOT}/EFI/CLOVER/drivers/$DRIVERS_OFF/$DRIVERS_UEFI/FileSystem/VBoxHfs.efi ${IMGROOT}/EFI/CLOVER/drivers/$DRIVERS_UEFI/ +cp -f ${CLOVERROOT}/EFI/CLOVER/drivers/$DRIVERS_OFF/$DRIVERS_UEFI/FileSystem/Fat.efi ${IMGROOT}/EFI/CLOVER/drivers/$DRIVERS_UEFI/ +cp -f ${CLOVERROOT}/EFI/CLOVER/drivers/$DRIVERS_OFF/$DRIVERS_UEFI/FileSystem/Ext4Dxe.efi ${IMGROOT}/EFI/CLOVER/drivers/$DRIVERS_UEFI/ + +cp -f ${CLOVERROOT}/EFI/CLOVER/drivers/$DRIVERS_OFF/$DRIVERS_UEFI/MemoryFix/OpenRuntime.efi ${IMGROOT}/EFI/CLOVER/drivers/$DRIVERS_UEFI/ + +cp -f ${CLOVERROOT}/EFI/CLOVER/drivers/$DRIVERS_OFF/$DRIVERS_UEFI/HID/AptioInputFix.efi ${IMGROOT}/EFI/CLOVER/drivers/$DRIVERS_UEFI/ +cp -f ${CLOVERROOT}/EFI/CLOVER/drivers/$DRIVERS_OFF/$DRIVERS_UEFI/HID/UsbMouseDxe.efi ${IMGROOT}/EFI/CLOVER/drivers/$DRIVERS_LEGACY/ +cp -f ${CLOVERROOT}/EFI/CLOVER/drivers/$DRIVERS_OFF/$DRIVERS_UEFI/HID/Ps2MouseDxe.efi ${IMGROOT}/EFI/CLOVER/drivers/$DRIVERS_LEGACY/ + +cp -f ${CLOVERROOT}/Bootloaders/x64/boot? ${IMGROOT}/usr/standalone/i386/x64/ +cp -f ${CLOVERROOT}/BootSectors/boot0af ${IMGROOT}/usr/standalone/i386 +cp -f ${CLOVERROOT}/BootSectors/boot0ss ${IMGROOT}/usr/standalone/i386 +cp -f ${CLOVERROOT}/BootSectors/boot0md ${IMGROOT}/usr/standalone/i386 +cp -f ${CLOVERROOT}/BootSectors/boot1h ${IMGROOT}/usr/standalone/i386 +cp -f ${CLOVERROOT}/BootSectors/boot1h2 ${IMGROOT}/usr/standalone/i386 +cp -f ${CLOVERROOT}/BootSectors/boot1f32 ${IMGROOT}/usr/standalone/i386 +cp -f ${CLOVERROOT}/BootSectors/boot1f32alt ${IMGROOT}/usr/standalone/i386 +cp -f ${CLOVERROOT}/BootSectors/boot1x ${IMGROOT}/usr/standalone/i386 +cp -f ${CLOVERROOT}/BootSectors/boot1xalt ${IMGROOT}/usr/standalone/i386 + +rm -rf ${IMGROOT}/.s* ${IMGROOT}/*/.s* ${IMGROOT}/*/*/.s* ${IMGROOT}/*/*/*/.s* ${IMGROOT}/*/*/*/*/.s* +find "${IMGROOT}" -name '.DS_Store' -exec rm -R -f {} \; 2>/dev/null + +mkdir -p ${SYMROOT}/CloverISO-${REVISION} +echo "[HDIUTIL] ${ISOIMAGE}" +hdiutil makehybrid -iso -joliet -hfs -hfs-volume-name ${CDLABEL} \ + -eltorito-boot ${CDBOOT} -no-emul-boot -ov -o "${ISOIMAGE}" ${IMGROOT} -quiet + +mv -f ${ISOIMAGE} ${SYMROOT}/CloverISO-${REVISION}/ + +# ====== 7z упаковка с отдельной папкой ====== +TMPDIR="${SYMROOT}/CloverISO-${REVISION}-tmp" +mkdir -p "${TMPDIR}/${CDLABEL}" +cp "${SYMROOT}/CloverISO-${REVISION}/${CDLABEL}.iso" "${TMPDIR}/${CDLABEL}/" + +echo "[7Z] Packing ${CDLABEL}.7z" +7z a -t7z "${SYMROOT}/CloverISO-${REVISION}.7z" "${TMPDIR}/${CDLABEL}" -mx=9 + +rm -rf "${TMPDIR}" + +# Open the final folder +if [[ "${1:-}" == "" ]]; then + ls -la sym + [[ "$SYSNAME" != Linux ]] && open sym +fi From f4e5a773863cbc89618d755fabc080045ed13bd6 Mon Sep 17 00:00:00 2001 From: YBronst Date: Mon, 22 Sep 2025 23:47:41 +0300 Subject: [PATCH 04/10] Update makepkg --- CloverPackage/makepkg | 106 +++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 69 deletions(-) diff --git a/CloverPackage/makepkg b/CloverPackage/makepkg index c472d54697..28625fea1e 100755 --- a/CloverPackage/makepkg +++ b/CloverPackage/makepkg @@ -1,98 +1,66 @@ #!/bin/bash # -# Reset default charset for GNUsed problems... -#set -x +# Reset default charset to avoid GNUsed issues export LC_ALL=C +# --- Define paths --- +SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" # Script folder +REPO_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)" # Repository root + +# Add toolchain/bin to PATH +export PATH="$REPO_ROOT/toolchain/bin:$PATH" + +# --- Buildpkg.sh options --- usage () { -printf "\n\e[1m%s\e[0m\n" "Usage: $0 [flag1 flag2...]" -printf "\n%s" "The (optional) exclude flags are being passed to the buildpkg.sh script, when specified." -printf "\n%s\n" "Possible flag values:" -printf "\n\e[1m%s\e[0m\t%s" "--nothemes" "Excludes the Themes subpackage." -# printf "\n\e[1m%s\e[0m\t%s" "--noprefpane" "Excludes the Clover Prefpane / Clover Updater subpackage." -printf "\n\e[1m%s\e[0m\t\t%s" "--norc" "Excludes the RC scripts subpackage." -printf "\n\e[1m%s\e[0m\t%s" "--nolegacy" "Excludes the CloverEFI subpackages." -echo + printf "\n\e[1m%s\e[0m\n" "Usage: $0 [flag1 flag2...]" + printf "\n%s\n" "Optional flags passed to buildpkg.sh:" + printf "\n\e[1m%s\e[0m\t%s" "--nothemes" "Excludes the Themes subpackage." + printf "\n\e[1m%s\e[0m\t%s" "--norc" "Excludes the RC scripts subpackage." + printf "\n\e[1m%s\e[0m\t%s" "--nolegacy" "Excludes the CloverEFI subpackages." + echo } +NOEXTRAS="" + while [[ $# -gt 0 ]]; do - case "${1}" in - --nothemes ) NOEXTRAS+=" --nothemes";; - # --noprefpane ) NOEXTRAS+=" --noprefpane";; - --norc ) NOEXTRAS+=" --norc";; - --nolegacy ) NOEXTRAS+=" --nolegacy";; - * ) printf "\e[1m%s\e[0m\n" "Invalid option: ${1} !"; usage; exit 1;; - esac - shift + case "${1}" in + --nothemes ) NOEXTRAS+=" --nothemes";; + --norc ) NOEXTRAS+=" --norc";; + --nolegacy ) NOEXTRAS+=" --nolegacy";; + * ) echo "Invalid option: ${1}!"; usage; exit 1;; + esac + shift done -# Workspace = edk2/Clover/CloverPackage - -# Go to the script directory to create the package -cd "$(dirname $0)" +# --- Change to script directory --- +cd "$SCRIPT_DIR" -revision=$(git describe --tags $(git rev-list --tags --max-count=1)) - -SRCROOT="${PWD}" -SYMROOT="${SRCROOT}"/sym -PKG_BUILD_DIR="${SYMROOT}"/package +revision=$(git describe --tags $(git rev-list --tags --max-count=1)) +SRCROOT="${SCRIPT_DIR}" +SYMROOT="${SRCROOT}/sym" +PKG_BUILD_DIR="${SYMROOT}/package" echo "${revision}" > revision -# Workspace = edk2/Clover/CloverPackage - - -# Workspace = Clover/CloverPackage -# Prepare i386 for building package installer. - -# if [[ -d "$PKG_BUILD_DIR" && $(stat -f '%u' "$PKG_BUILD_DIR") -eq 0 ]]; then -# sudo rm -rf sym -# fi -# rm -rf sym -# -# # Create a new sym directory -# mkdir sym - -# Make the translation +# --- Translate resources --- echo "" echo "========= Translating Resources ========" ./package/translate.sh || exit $? -# Check that XCode is install properly +# --- Build utils if Xcode exists --- xcode_path=$(/usr/bin/xcode-select --print-path 2>/dev/null) if [[ -n "$xcode_path" ]]; then - # # Make CloverUpdater - # "${SRCROOT}"/CloverUpdater/translate_xib.sh # workaround for a bug in Xcode 10 Beta - # make -C "${SRCROOT}"/CloverUpdater || exit $? - # # Make CloverPrefpane - # "${SRCROOT}"/CloverPrefpane/translate_xib.sh # workaround for a bug in Xcode 10 Beta - # "${SRCROOT}"/CloverPrefpane/translate_source.sh # workaround for a bug in Xcode 10 Beta - # make -C "${SRCROOT}"/CloverPrefpane || exit $? - # Make utils - make -C "${SRCROOT}"/utils || exit $? -# temporary use ready-to-use binaries -# mkdir -p "${SYMROOT}"/utils -# cp -v "${SRCROOT}"/utils/binaries/* "${SYMROOT}"/utils/ + make -C "${SRCROOT}/utils" || exit $? fi -# Start to build installer. - +# --- Build the package --- package/buildpkg.sh --srcroot "$SRCROOT" --symroot "sym" --builddir "$PKG_BUILD_DIR" ${NOEXTRAS:1} || exit $? -#(cd sym ; zip Clover_r${revision}.zip \ -# Clover_r${revision}.pkg \ -# Clover_r${revision}.pkg.md5 ) - -# Workspace = edk2/Clover/CloverPackage/ -# Remove temp files. - -rm -f version # take this to clean old sources -rm -f revision +# --- Clean temporary files --- +rm -f version revision -# Workspace = edk2/Clover/CloverPackage -# Open the final folder. +# --- Open the output folder --- ls -la sym open sym -# Finish building installer. #exit 0 From f0d2b55b2a87decf7862c1cfd1f661a2335912fe Mon Sep 17 00:00:00 2001 From: YBronst Date: Mon, 22 Sep 2025 23:47:46 +0300 Subject: [PATCH 05/10] Create makeutils7z --- CloverPackage/makeutils7z | 45 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100755 CloverPackage/makeutils7z diff --git a/CloverPackage/makeutils7z b/CloverPackage/makeutils7z new file mode 100755 index 0000000000..56c4bdf362 --- /dev/null +++ b/CloverPackage/makeutils7z @@ -0,0 +1,45 @@ +#!/bin/bash +set -e +SYSNAME=$(uname) + +# Ensure 7z is available on macOS +if [[ "$SYSNAME" == Darwin ]]; then + if ! command -v 7z &>/dev/null; then + TMPDIR="/private/tmp/7ztemp" + mkdir -p "$TMPDIR" + cd "$TMPDIR" || exit 1 + echo "[7Z] Downloading 7zz..." + curl -LO https://www.7-zip.org/a/7z2501-mac.tar.xz + tar -xf 7z2501-mac.tar.xz + xattr -d com.apple.quarantine 7zz 2>/dev/null || true + cp 7zz /usr/local/bin/7z + chmod +x /usr/local/bin/7z + cd - >/dev/null || exit 1 + rm -rf "$TMPDIR" + echo "[7Z] Installed to /usr/local/bin/7z" + fi +fi + +# Check again +if ! command -v 7z &>/dev/null; then + echo "Error: 7z not found. Please install 7-Zip manually." + exit 1 +fi + +# Paths +SRCROOT="$(dirname "$0")" +SYMROOT=${SRCROOT}/sym + +[[ ! -d "${SYMROOT}/utils" ]] && { echo "No utils folder found."; exit 1; } + +echo "[7Z] Packing utils..." +7z a -t7z "${SYMROOT}/utils.7z" "${SYMROOT}/utils" -mx=9 +echo "Done." + +# Open folder with archive +if [[ "$SYSNAME" == "Darwin" ]]; then + open "${SYMROOT}" +elif [[ "$SYSNAME" == "Linux" ]]; then + xdg-open "${SYMROOT}" >/dev/null 2>&1 & +fi + From 3f1257faf10045743724e45e18c736e47d437354 Mon Sep 17 00:00:00 2001 From: YBronst Date: Mon, 22 Sep 2025 23:47:50 +0300 Subject: [PATCH 06/10] Update ebuild.sh --- ebuild.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ebuild.sh b/ebuild.sh index b0db237411..147b22a4dc 100755 --- a/ebuild.sh +++ b/ebuild.sh @@ -468,7 +468,7 @@ MainBuildScript() { checkCmdlineArguments $@ checkToolchain - # local repoRev=$(git describe --tags $(git rev-list --tags --max-count=1)) + # local repoRev=$(git describe --tags $(git rev-list --tags --max-count=1)) local repoRev=$(git describe --tags --abbrev=0) # From 7c2d922d6b6472cfcb9b28c2e8702cb589b668d3 Mon Sep 17 00:00:00 2001 From: YBronst Date: Mon, 22 Sep 2025 23:47:56 +0300 Subject: [PATCH 07/10] Update makeall.sh --- makeall.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makeall.sh b/makeall.sh index f846202515..8eff24e8b9 100755 --- a/makeall.sh +++ b/makeall.sh @@ -3,9 +3,9 @@ ./ebuild.sh -gcc151 -fr -n 5 -mc --no-usb -D NO_GRUB_DRIVERS_EMBEDDED ./ebuild.sh -gcc151 -fr -n 5 -D NO_GRUB_DRIVERS_EMBEDDED cd CloverPackage -./makepkg >log.txt +./makepkg ./makeiso -#make iso +./makeV2 cd .. echo "done!" From a89de8c845a08221cdc2cfde401e0476968a6011 Mon Sep 17 00:00:00 2001 From: YBronst Date: Mon, 22 Sep 2025 23:48:00 +0300 Subject: [PATCH 08/10] Update xbuildme --- xbuildme | 44 ++++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/xbuildme b/xbuildme index 6e2011b8a8..b1b45889c1 100755 --- a/xbuildme +++ b/xbuildme @@ -61,33 +61,29 @@ COL_BLUE_ITALIC=$(tput sitm; tput setaf 4) # Italic Blue COL_PURPLE_ITALIC=$(tput sitm; tput setaf 5) # Italic Purple COL_CYAN_ITALIC=$(tput sitm; tput setaf 6) # Italic Cyan COL_WHITE_ITALIC=$(tput sitm; tput setaf 7) # Italic White -COL_RESET="\x1b[39;49;00m"  -revision=$(git describe --tags $(git rev-list --tags --max-count=1)) +#Set background color +BG_BLUE=$(tput setab 4) +# Reset all attributes +COL_RESET=$(tput sgr0) # ====== Main Window SetUp ====== -if [[ "$2" != "ci" ]]; then - osascript < Date: Mon, 22 Sep 2025 23:49:47 +0300 Subject: [PATCH 09/10] Update main.yml --- .github/workflows/main.yml | 88 +++++++++++++++++++++++++++++++++++--- 1 file changed, 82 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 21357c1b6f..fc53e4aaa1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,35 +11,111 @@ jobs: runs-on: macos-latest steps: - uses: actions/checkout@v4 + with: + fetch-depth: 0 + fetch-tags: true - name: Manage Version run: | - git fetch --prune --unshallow --tags + git fetch --prune --tags echo "CUR_TAG=$(git tag -l | tail -1)" >> $GITHUB_ENV echo "GIT_SHA=$(git rev-parse --short HEAD)" >> $GITHUB_ENV - - name: Install Dependencies - run: brew install p7zip + - name: Reinstall Dependencies + run: brew reinstall p7zip env: HOMEBREW_NO_INSTALL_CLEANUP: 1 HOMEBREW_NO_AUTO_UPDATE: 1 + + - name: Check Xcode version + run: | + XCODE_VER=$(xcodebuild -version | grep Xcode | awk '{print $2}' | tr -d '[:space:]') + echo "Detected Xcode version: $XCODE_VER" + if [[ -z "$XCODE_VER" ]]; then + echo "❌ Failed to detect Xcode version!" + exit 1 + fi + + MAJOR_VER=${XCODE_VER%%.*} + if [[ "$MAJOR_VER" -eq 26 ]]; then + CHECK_VER=16 + else + CHECK_VER=$MAJOR_VER + fi + + if [[ "$CHECK_VER" -lt 16 ]]; then + echo "❌ Xcode 16+ required!" + exit 1 + fi + + echo "✅ Using Xcode version $XCODE_VER (check $CHECK_VER)" + + - name: Setup Python 3.13 + uses: actions/setup-python@v5 + with: + python-version: '3.13' + + - name: Verify Python framework symlink + run: | + FRAMEWORK_PATH="/Library/Frameworks/Python.framework/Versions/3.13/bin/python3.13" + if [ ! -x "$FRAMEWORK_PATH" ]; then + echo "❌ Expected Python 3.13 at $FRAMEWORK_PATH not found!" + exit 1 + fi + echo "✅ Python 3.13 found at $FRAMEWORK_PATH" + + - name: Prepare Python env + run: | + python3.13 --version + pip3 install --upgrade pip + pip3 install setuptools + pip3 install --upgrade setuptools + + - name: Download CloverGnuBuildTools + run: | + mkdir -p toolchain/tools/download + cd toolchain/tools/download + curl -L -o CloverBuildTools.zip https://github.com/YBronst/CloverBuildUtilities/releases/download/V.1.0/CloverBuildTools.zip + unzip CloverBuildTools.zip + cp -r CloverBuildTools/* . + rm -rf CloverBuildTools CloverBuildTools.zip - name: Build Clover Pack run: | chmod +x ./buildme ./buildme "" ci + - name: Prepare Release Packs run: | + # Zip Clover EFI (cd "CloverPackage/CloverV2/EFI/CLOVER/" && zip -q "CLOVERX64.efi.zip" "CLOVERX64.efi" || exit 1) - (cd "CloverPackage/sym/CloverISO-${{ env.CUR_TAG }}" && 7z a Clover-${{ env.CUR_TAG }}-X64.iso.7z *.iso || exit 1) - releaseItems=(CloverPackage/sym/CloverISO*/*.7z CloverPackage/sym/CloverV2*.zip CloverPackage/CloverV2/EFI/CLOVER/CLOVERX64.efi.zip CloverPackage/sym/Clover_r*.pkg) - for releaseItem in "${releaseItems[@]}"; do cp -Rf "${releaseItem}" ./ || exit 1; done + + # 7z ISO + (cd "CloverPackage/sym/CloverISO-${{ env.CUR_TAG }}" && 7z a "Clover-${{ env.CUR_TAG }}-X64.iso.7z" *.iso || exit 1) + + # 7z utils + (cd "CloverPackage/sym/" && 7z a utils.7z utils/* || exit 1) + + # Сбор всех файлов для публикации + releaseItems=( + CloverPackage/sym/CloverISO*/*.7z + CloverPackage/sym/utils.7z + CloverPackage/sym/CloverV2*.zip + CloverPackage/CloverV2/EFI/CLOVER/CLOVERX64.efi.zip + CloverPackage/sym/Clover_r*.pkg + ) + for releaseItem in "${releaseItems[@]}"; do + cp -Rf "${releaseItem}" ./ || exit 1 + done + - name: Upload to Artifacts uses: actions/upload-artifact@v4 with: name: Clover-GCC-15.1.0-${{ env.GIT_SHA }} path: | *.7z + utils.7z CloverV2*.zip CLOVERX64.efi.zip Clover_r*.pkg + From ab5a6d92b10cdeaa95009331cc2c7956d143d4af Mon Sep 17 00:00:00 2001 From: YBronst Date: Tue, 23 Sep 2025 00:23:45 +0300 Subject: [PATCH 10/10] Important changes and fixes. --- .gitignore | 1 + CloverPackage/makeV2 | 3 +-- CloverPackage/makeiso | 2 +- CloverPackage/package/po/clover.pot | 8 ++++---- CloverPackage/package/po/de.po | 18 ++++++++++++------ CloverPackage/package/po/en.po | 18 ++++++++++++------ CloverPackage/package/po/es.po | 18 ++++++++++++------ CloverPackage/package/po/fr.po | 18 ++++++++++++------ CloverPackage/package/po/hr.po | 22 ++++++++++++---------- CloverPackage/package/po/id.po | 21 ++++++++++++--------- CloverPackage/package/po/it.po | 21 ++++++++++++--------- CloverPackage/package/po/ja.po | 21 ++++++++++++--------- CloverPackage/package/po/ko.po | 21 ++++++++++++--------- CloverPackage/package/po/lv.po | 21 ++++++++++++--------- CloverPackage/package/po/nl.po | 21 ++++++++++++--------- CloverPackage/package/po/pl.po | 21 ++++++++++++--------- CloverPackage/package/po/pt-BR.po | 21 ++++++++++++--------- CloverPackage/package/po/pt.po | 21 ++++++++++++--------- CloverPackage/package/po/ro.po | 21 ++++++++++++--------- CloverPackage/package/po/ru.po | 21 ++++++++++++--------- CloverPackage/package/po/tr.po | 21 ++++++++++++--------- CloverPackage/package/po/uk.po | 21 ++++++++++++--------- CloverPackage/package/po/uk_UA.po | 21 ++++++++++++--------- CloverPackage/package/po/vi.po | 21 ++++++++++++--------- CloverPackage/package/po/zh_CN.po | 21 ++++++++++++--------- CloverPackage/package/po/zh_TW.po | 21 ++++++++++++--------- 26 files changed, 271 insertions(+), 194 deletions(-) diff --git a/.gitignore b/.gitignore index c90569fd72..2016db251e 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,4 @@ RELEASE_*/ #work in progress *_wip +CloverPackage/mpkg.log diff --git a/CloverPackage/makeV2 b/CloverPackage/makeV2 index aed4bc843d..2fda919d0c 100755 --- a/CloverPackage/makeV2 +++ b/CloverPackage/makeV2 @@ -5,7 +5,7 @@ cd "$(dirname $([ -L $0 ] && readlink $0 || echo $0))" ROOT="$PWD" SYMROOT="${ROOT}"/sym -REVISION=$(git describe --tags $(git rev-list --tags --max-count=1)) +REVISION=$(git describe --tags $(git rev-list --tags --max-count=1)) # zip CloverV2, excluding all .empty and all .DS_Store zip -qr CloverV2-${REVISION}.zip CloverV2 -x "*/.DS_Store" "*/.empty" @@ -14,4 +14,3 @@ mv CloverV2-${REVISION}.zip $SYMROOT open sym #exit 0 - diff --git a/CloverPackage/makeiso b/CloverPackage/makeiso index a80572161c..1ec1a48c2d 100755 --- a/CloverPackage/makeiso +++ b/CloverPackage/makeiso @@ -32,7 +32,7 @@ CDBOOT=${IMGROOT}/usr/standalone/i386/cdboot EFIROOT=${SRCROOT}/CloverV2/EFI BASETOOLS_DIR=${SRCROOT}/../BaseTools/Source/C/bin -REVISION=$(git describe --tags $(git rev-list --tags --max-count=1)) +REVISION=$(git describe --tags $(git rev-list --tags --max-count=1)) PRODUCT=Clover-${REVISION} CDLABEL=${PRODUCT}-X64 ISOIMAGE=${SYMROOT}/${CDLABEL}.iso diff --git a/CloverPackage/package/po/clover.pot b/CloverPackage/package/po/clover.pot index bbf8b39565..36cdead75d 100644 --- a/CloverPackage/package/po/clover.pot +++ b/CloverPackage/package/po/clover.pot @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Clover r5160\n" -"POT-Creation-Date: 2024-09-14 09:44+0300\n" +"Project-Id-Version: Clover r5163\n" +"POT-Creation-Date: 2025-09-23 00:10+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -786,13 +786,13 @@ msgstr "" #. type: "VBoxExt2.UEFI_description" #: Resources/templates/Localizable.strings:171 #, no-wrap -msgid "ext2/3 filesystem driver from virtualbox, 64bit" +msgid "ext2/3 filesystem driver from tianocore, 64bit" msgstr "" #. type: "Ext4Dxe.UEFI_description" #: Resources/templates/Localizable.strings:172 #, no-wrap -msgid "ext4 filesystem driver from tianocore, 64bit" +msgid "ext4 filesystem driver from EDK2-platform, 64bit" msgstr "" #. type: "VBoxHfs.UEFI_description" diff --git a/CloverPackage/package/po/de.po b/CloverPackage/package/po/de.po index c00d5254f1..c719011a49 100644 --- a/CloverPackage/package/po/de.po +++ b/CloverPackage/package/po/de.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-30 12:26+0300\n" +"POT-Creation-Date: 2025-09-23 00:10+0300\n" "PO-Revision-Date: 2020-03-08 18:53+0100\n" "Last-Translator: vector sigma\n" "Language-Team: ge \n" @@ -846,14 +846,16 @@ msgstr "Treiber für USB Maus, 64bit" #. type: "VBoxExt2.UEFI_description" #: Resources/templates/Localizable.strings:171 -#, no-wrap -msgid "ext2/3 filesystem driver from virtualbox, 64bit" -msgstr "Treiber für das ext2/3 Dateisystem aus VirtualBox, 64bit" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from tianocore, 64bit" +msgid "ext2/3 filesystem driver from tianocore, 64bit" +msgstr "Treiber für das ext4 Dateisystem aus tianocore, 64bit" #. type: "Ext4Dxe.UEFI_description" #: Resources/templates/Localizable.strings:172 -#, no-wrap -msgid "ext4 filesystem driver from tianocore, 64bit" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from tianocore, 64bit" +msgid "ext4 filesystem driver from EDK2-platform, 64bit" msgstr "Treiber für das ext4 Dateisystem aus tianocore, 64bit" #. type: "VBoxHfs.UEFI_description" @@ -1446,6 +1448,10 @@ msgstr "Setze das EFI Verzeichnis" msgid "Unknown" msgstr "Unbekannt" +#, no-wrap +#~ msgid "ext2/3 filesystem driver from virtualbox, 64bit" +#~ msgstr "Treiber für das ext2/3 Dateisystem aus VirtualBox, 64bit" + #~ msgid "" #~ "Preferred 64bit driver to fix Memory problems on UEFI firmware such as " #~ "AMI Aptio" diff --git a/CloverPackage/package/po/en.po b/CloverPackage/package/po/en.po index 69fc99907e..c8287ee69c 100644 --- a/CloverPackage/package/po/en.po +++ b/CloverPackage/package/po/en.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-30 12:26+0300\n" +"POT-Creation-Date: 2025-09-23 00:10+0300\n" "PO-Revision-Date: \n" "Last-Translator: vector sigma\n" "Language-Team: en \n" @@ -843,14 +843,16 @@ msgstr "USB mouse driver, 64 bit." #. type: "VBoxExt2.UEFI_description" #: Resources/templates/Localizable.strings:171 -#, no-wrap -msgid "ext2/3 filesystem driver from virtualbox, 64bit" -msgstr "EXT2/3 filesystem driver from VirtualBox, 64 bit." +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from tianocore, 64bit" +msgid "ext2/3 filesystem driver from tianocore, 64bit" +msgstr "EXT4 filesystem driver from tianocore, 64 bit." #. type: "Ext4Dxe.UEFI_description" #: Resources/templates/Localizable.strings:172 -#, no-wrap -msgid "ext4 filesystem driver from tianocore, 64bit" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from tianocore, 64bit" +msgid "ext4 filesystem driver from EDK2-platform, 64bit" msgstr "EXT4 filesystem driver from tianocore, 64 bit." #. type: "VBoxHfs.UEFI_description" @@ -1447,6 +1449,10 @@ msgstr "Set EFI directory" msgid "Unknown" msgstr "Unknown" +#, no-wrap +#~ msgid "ext2/3 filesystem driver from virtualbox, 64bit" +#~ msgstr "EXT2/3 filesystem driver from VirtualBox, 64 bit." + #~ msgid "" #~ "Preferred 64bit driver to fix Memory problems on UEFI firmware such as " #~ "AMI Aptio" diff --git a/CloverPackage/package/po/es.po b/CloverPackage/package/po/es.po index 746fcac5dc..cb5d89c52a 100644 --- a/CloverPackage/package/po/es.po +++ b/CloverPackage/package/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-30 12:26+0300\n" +"POT-Creation-Date: 2025-09-23 00:10+0300\n" "PO-Revision-Date: 2018-10-02 11:38+0200\n" "Last-Translator: vector sigma\n" "Language-Team: es \n" @@ -843,14 +843,16 @@ msgstr "Controlador para ratones USB, 64bit" #. type: "VBoxExt2.UEFI_description" #: Resources/templates/Localizable.strings:171 -#, no-wrap -msgid "ext2/3 filesystem driver from virtualbox, 64bit" -msgstr "Controlador para sistema de archivos ext2/3 de VirtualBox, 64bit" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from tianocore, 64bit" +msgid "ext2/3 filesystem driver from tianocore, 64bit" +msgstr "Controlador para sistema de archivos ext4 de tianocore, 64bit" #. type: "Ext4Dxe.UEFI_description" #: Resources/templates/Localizable.strings:172 -#, no-wrap -msgid "ext4 filesystem driver from tianocore, 64bit" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from tianocore, 64bit" +msgid "ext4 filesystem driver from EDK2-platform, 64bit" msgstr "Controlador para sistema de archivos ext4 de tianocore, 64bit" #. type: "VBoxHfs.UEFI_description" @@ -1462,6 +1464,10 @@ msgstr "Defina la carpeta EFI" msgid "Unknown" msgstr "Desconocido" +#, no-wrap +#~ msgid "ext2/3 filesystem driver from virtualbox, 64bit" +#~ msgstr "Controlador para sistema de archivos ext2/3 de VirtualBox, 64bit" + #~ msgid "" #~ "Preferred 64bit driver to fix Memory problems on UEFI firmware such as " #~ "AMI Aptio" diff --git a/CloverPackage/package/po/fr.po b/CloverPackage/package/po/fr.po index 32e1828a89..f1bedf6c8a 100644 --- a/CloverPackage/package/po/fr.po +++ b/CloverPackage/package/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 5.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-30 12:26+0300\n" +"POT-Creation-Date: 2025-09-23 00:10+0300\n" "PO-Revision-Date: \n" "Last-Translator: vector sigma\n" "Language-Team: en \n" @@ -850,14 +850,16 @@ msgstr "Pilote 64 bit pour souris USB." #. type: "VBoxExt2.UEFI_description" #: Resources/templates/Localizable.strings:171 -#, no-wrap -msgid "ext2/3 filesystem driver from virtualbox, 64bit" -msgstr "Pilote 64 bit pour lire les partitions formatées en ext2/3." +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from tianocore, 64bit" +msgid "ext2/3 filesystem driver from tianocore, 64bit" +msgstr "Pilote 64 bit pour lire les partitions formatées en ext4." #. type: "Ext4Dxe.UEFI_description" #: Resources/templates/Localizable.strings:172 -#, no-wrap -msgid "ext4 filesystem driver from tianocore, 64bit" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from tianocore, 64bit" +msgid "ext4 filesystem driver from EDK2-platform, 64bit" msgstr "Pilote 64 bit pour lire les partitions formatées en ext4." #. type: "VBoxHfs.UEFI_description" @@ -1452,6 +1454,10 @@ msgstr "Définir le répertoire EFI" msgid "Unknown" msgstr "Inconnu" +#, no-wrap +#~ msgid "ext2/3 filesystem driver from virtualbox, 64bit" +#~ msgstr "Pilote 64 bit pour lire les partitions formatées en ext2/3." + #~ msgid "" #~ "Preferred 64bit driver to fix Memory problems on UEFI firmware such as " #~ "AMI Aptio" diff --git a/CloverPackage/package/po/hr.po b/CloverPackage/package/po/hr.po index faf595faff..ba78fa162d 100644 --- a/CloverPackage/package/po/hr.po +++ b/CloverPackage/package/po/hr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-30 12:26+0300\n" +"POT-Creation-Date: 2025-09-23 00:10+0300\n" "PO-Revision-Date: 2018-10-02 11:39+0200\n" "Last-Translator: vector sigma\n" "Language-Team: hr \n" @@ -839,14 +839,16 @@ msgstr "USB upravljački program za miša, 64 bitna verzija" #. type: "VBoxExt2.UEFI_description" #: Resources/templates/Localizable.strings:171 -#, no-wrap -msgid "ext2/3 filesystem driver from virtualbox, 64bit" -msgstr "ext2/3 filesystem upravljački program iz virtualbox-a , 64 bitna verzija" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from tianocore, 32bit" +msgid "ext2/3 filesystem driver from tianocore, 64bit" +msgstr "ext4 filesystem upravljački program iz tianocore-a , 32 bitna verzija" #. type: "Ext4Dxe.UEFI_description" #: Resources/templates/Localizable.strings:172 -#, no-wrap -msgid "ext4 filesystem driver from virtualbox, 64bit" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from virtualbox, 64bit" +msgid "ext4 filesystem driver from EDK2-platform, 64bit" msgstr "ext4 filesystem upravljački program iz virtualbox-a , 64 bitna verzija" #. type: "VBoxHfs.UEFI_description" @@ -1456,6 +1458,10 @@ msgstr "Odaberi EFI direktorij" msgid "Unknown" msgstr "Nepoznat" +#, no-wrap +#~ msgid "ext2/3 filesystem driver from virtualbox, 64bit" +#~ msgstr "ext2/3 filesystem upravljački program iz virtualbox-a , 64 bitna verzija" + #~ msgid "" #~ "Preferred 64bit driver to fix Memory problems on UEFI firmware such as " #~ "AMI Aptio" @@ -1504,10 +1510,6 @@ msgstr "Nepoznat" #~ msgstr "" #~ "ext2/3 filesystem upravljački program iz virtualbox-a , 32 bitna verzija" -#~ msgid "ext4 filesystem driver from tianocore, 32bit" -#~ msgstr "" -#~ "ext4 filesystem upravljački program iz tianocore-a , 32 bitna verzija" - #~ msgid "USB 3.0 driver, 32bit" #~ msgstr "USB upravljački program za miša, 32 bitna verzija" diff --git a/CloverPackage/package/po/id.po b/CloverPackage/package/po/id.po index c1e2aecba9..390a98a2f2 100644 --- a/CloverPackage/package/po/id.po +++ b/CloverPackage/package/po/id.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-30 12:26+0300\n" +"POT-Creation-Date: 2025-09-23 00:10+0300\n" "PO-Revision-Date: 2019-07-20 10:15+0700\n" "Last-Translator: Badruzeus\n" "Language-Team: id \n" @@ -858,14 +858,16 @@ msgstr "Driver Mouse USB, 64-bit" #. type: "VBoxExt2.UEFI_description" #: Resources/templates/Localizable.strings:171 -#, no-wrap -msgid "ext2/3 filesystem driver from virtualbox, 64bit" -msgstr "Driver File System EXT2/3 dari VirtualBox, 64-bit" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from tianocore, 32bit" +msgid "ext2/3 filesystem driver from tianocore, 64bit" +msgstr "driver untuk ext4 dari tianocore, 32bit" #. type: "Ext4Dxe.UEFI_description" #: Resources/templates/Localizable.strings:172 -#, no-wrap -msgid "ext4 filesystem driver from virtualbox, 64bit" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from virtualbox, 64bit" +msgid "ext4 filesystem driver from EDK2-platform, 64bit" msgstr "Driver File System EXT4 dari VirtualBox, 64-bit" #. type: "VBoxHfs.UEFI_description" @@ -1467,6 +1469,10 @@ msgstr "Setel direktori EFI" msgid "Unknown" msgstr "Tidak diketahui" +#, no-wrap +#~ msgid "ext2/3 filesystem driver from virtualbox, 64bit" +#~ msgstr "Driver File System EXT2/3 dari VirtualBox, 64-bit" + #~ msgid "" #~ "Preferred 64bit driver to fix Memory problems on UEFI firmware such as " #~ "AMI Aptio" @@ -1514,9 +1520,6 @@ msgstr "Tidak diketahui" #~ msgid "ext2/3 filesystem driver from virtualbox, 32bit" #~ msgstr "driver untuk ext2/3 dari virtualbox, 32bit" -#~ msgid "ext4 filesystem driver from tianocore, 32bit" -#~ msgstr "driver untuk ext4 dari tianocore, 32bit" - #~ msgid "USB 3.0 driver, 32bit" #~ msgstr "driver USB 3.0, 32bit" diff --git a/CloverPackage/package/po/it.po b/CloverPackage/package/po/it.po index 80366c5e13..c7e1d286b2 100644 --- a/CloverPackage/package/po/it.po +++ b/CloverPackage/package/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-30 12:26+0300\n" +"POT-Creation-Date: 2025-09-23 00:10+0300\n" "PO-Revision-Date: 2019-07-13 10:25+0200\n" "Last-Translator: vector sigma\n" "Language-Team: it \n" @@ -845,14 +845,16 @@ msgstr "Driver a 64 bit per mouse USB" #. type: "VBoxExt2.UEFI_description" #: Resources/templates/Localizable.strings:171 -#, no-wrap -msgid "ext2/3 filesystem driver from virtualbox, 64bit" -msgstr "Driver a 64 bit per accedere a partizioni formattate in ext2/3" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from tianocore, 32bit" +msgid "ext2/3 filesystem driver from tianocore, 64bit" +msgstr "Driver a 32 bit per accedere a partizioni formattate in ext4" #. type: "Ext4Dxe.UEFI_description" #: Resources/templates/Localizable.strings:172 -#, no-wrap -msgid "ext4 filesystem driver from virtualbox, 64bit" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from virtualbox, 64bit" +msgid "ext4 filesystem driver from EDK2-platform, 64bit" msgstr "Driver a 64 bit per accedere a partizioni formattate in ext4" #. type: "VBoxHfs.UEFI_description" @@ -1457,6 +1459,10 @@ msgstr "Imposta la directory EFI" msgid "Unknown" msgstr "Sconosciuto" +#, no-wrap +#~ msgid "ext2/3 filesystem driver from virtualbox, 64bit" +#~ msgstr "Driver a 64 bit per accedere a partizioni formattate in ext2/3" + #~ msgid "" #~ "Preferred 64bit driver to fix Memory problems on UEFI firmware such as " #~ "AMI Aptio" @@ -1504,9 +1510,6 @@ msgstr "Sconosciuto" #~ msgid "ext2/3 filesystem driver from virtualbox, 32bit" #~ msgstr "Driver a 32 bit per accedere a partizioni formattate in ext2/3" -#~ msgid "ext4 filesystem driver from tianocore, 32bit" -#~ msgstr "Driver a 32 bit per accedere a partizioni formattate in ext4" - #~ msgid "USB 3.0 driver, 32bit" #~ msgstr "Driver a 32 bit che aggiunge supporto USB 3.0" diff --git a/CloverPackage/package/po/ja.po b/CloverPackage/package/po/ja.po index 0311068b69..cb88532056 100644 --- a/CloverPackage/package/po/ja.po +++ b/CloverPackage/package/po/ja.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-30 12:26+0300\n" +"POT-Creation-Date: 2025-09-23 00:10+0300\n" "PO-Revision-Date: 2018-10-02 11:41+0200\n" "Last-Translator: vector sigma\n" "Language-Team: \n" @@ -838,14 +838,16 @@ msgstr "USBマウスドライバ -64bit" #. type: "VBoxExt2.UEFI_description" #: Resources/templates/Localizable.strings:171 -#, no-wrap -msgid "ext2/3 filesystem driver from virtualbox, 64bit" -msgstr "virtual boxのext2/3ファイルシステムドライバ -64bit" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from tianocore, 32bit" +msgid "ext2/3 filesystem driver from tianocore, 64bit" +msgstr "virtual boxのext4ファイルシステムドライバ -32bit" #. type: "Ext4Dxe.UEFI_description" #: Resources/templates/Localizable.strings:172 -#, no-wrap -msgid "ext4 filesystem driver from virtualbox, 64bit" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from virtualbox, 64bit" +msgid "ext4 filesystem driver from EDK2-platform, 64bit" msgstr "virtual boxのext4ファイルシステムドライバ -64bit" #. type: "VBoxHfs.UEFI_description" @@ -1455,6 +1457,10 @@ msgstr "EFIディレクトリを設定" msgid "Unknown" msgstr "不明" +#, no-wrap +#~ msgid "ext2/3 filesystem driver from virtualbox, 64bit" +#~ msgstr "virtual boxのext2/3ファイルシステムドライバ -64bit" + #~ msgid "" #~ "Preferred 64bit driver to fix Memory problems on UEFI firmware such as " #~ "AMI Aptio" @@ -1501,9 +1507,6 @@ msgstr "不明" #~ msgid "ext2/3 filesystem driver from virtualbox, 32bit" #~ msgstr "virtual boxのext2/3ファイルシステムドライバ -32bit" -#~ msgid "ext4 filesystem driver from tianocore, 32bit" -#~ msgstr "virtual boxのext4ファイルシステムドライバ -32bit" - #~ msgid "USB 3.0 driver, 32bit" #~ msgstr "USB 3.0ドライバ -32bit" diff --git a/CloverPackage/package/po/ko.po b/CloverPackage/package/po/ko.po index 93cc543fd0..8c6555f0eb 100644 --- a/CloverPackage/package/po/ko.po +++ b/CloverPackage/package/po/ko.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-30 12:26+0300\n" +"POT-Creation-Date: 2025-09-23 00:10+0300\n" "PO-Revision-Date: \n" "Last-Translator: vector sigma\n" "Language-Team: ko \n" @@ -848,14 +848,16 @@ msgstr "USB 마우스 드라이버, 64비트" #. type: "VBoxExt2.UEFI_description" #: Resources/templates/Localizable.strings:171 -#, no-wrap -msgid "ext2/3 filesystem driver from virtualbox, 64bit" -msgstr "Virtualbox 용 Ext2/3 파일 시스템 드라이버, 64비트" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from tianocore, 32bit" +msgid "ext2/3 filesystem driver from tianocore, 64bit" +msgstr "tianocore 용 Ext4 파일 시스템 드라이버, 32비트" #. type: "Ext4Dxe.UEFI_description" #: Resources/templates/Localizable.strings:172 -#, no-wrap -msgid "ext4 filesystem driver from virtualbox, 64bit" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from virtualbox, 64bit" +msgid "ext4 filesystem driver from EDK2-platform, 64bit" msgstr "Virtualbox 용 Ext4 파일 시스템 드라이버, 64비트" #. type: "VBoxHfs.UEFI_description" @@ -1457,6 +1459,10 @@ msgstr "EFI 디렉토리를 설정하세요" msgid "Unknown" msgstr "알 수 없음" +#, no-wrap +#~ msgid "ext2/3 filesystem driver from virtualbox, 64bit" +#~ msgstr "Virtualbox 용 Ext2/3 파일 시스템 드라이버, 64비트" + #~ msgid "" #~ "Preferred 64bit driver to fix Memory problems on UEFI firmware such as " #~ "AMI Aptio" @@ -1505,9 +1511,6 @@ msgstr "알 수 없음" #~ msgid "ext2/3 filesystem driver from virtualbox, 32bit" #~ msgstr "Virtualbox 용 Ext2/3 파일 시스템 드라이버, 32비트" -#~ msgid "ext4 filesystem driver from tianocore, 32bit" -#~ msgstr "tianocore 용 Ext4 파일 시스템 드라이버, 32비트" - #~ msgid "USB 3.0 driver, 32bit" #~ msgstr "USB 3.0 드라이버, 32비트" diff --git a/CloverPackage/package/po/lv.po b/CloverPackage/package/po/lv.po index 05f7755f16..67d1f5390e 100644 --- a/CloverPackage/package/po/lv.po +++ b/CloverPackage/package/po/lv.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-30 12:26+0300\n" +"POT-Creation-Date: 2025-09-23 00:10+0300\n" "PO-Revision-Date: 2018-10-02 11:42+0200\n" "Last-Translator: vector sigma\n" "Language-Team: \n" @@ -847,14 +847,16 @@ msgstr "USB peles draiveris, 64 biti" #. type: "VBoxExt2.UEFI_description" #: Resources/templates/Localizable.strings:171 -#, no-wrap -msgid "ext2/3 filesystem driver from virtualbox, 64bit" -msgstr "Datņu sistēmas EXT2/3 (Linux) draiveris, 64 biti" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from tianocore, 32bit" +msgid "ext2/3 filesystem driver from tianocore, 64bit" +msgstr "Datņus sistēmas EXT4 (Linux) draiveris, 32 biti" #. type: "Ext4Dxe.UEFI_description" #: Resources/templates/Localizable.strings:172 -#, no-wrap -msgid "ext4 filesystem driver from virtualbox, 64bit" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from virtualbox, 64bit" +msgid "ext4 filesystem driver from EDK2-platform, 64bit" msgstr "Datņus sistēmas EXT4 (Linux) draiveris, 64 biti" #. type: "VBoxHfs.UEFI_description" @@ -1464,6 +1466,10 @@ msgstr "Iestātīt EFI direktoriju" msgid "Unknown" msgstr "Nav zinams" +#, no-wrap +#~ msgid "ext2/3 filesystem driver from virtualbox, 64bit" +#~ msgstr "Datņu sistēmas EXT2/3 (Linux) draiveris, 64 biti" + #~ msgid "" #~ "Preferred 64bit driver to fix Memory problems on UEFI firmware such as " #~ "AMI Aptio" @@ -1511,9 +1517,6 @@ msgstr "Nav zinams" #~ msgid "ext2/3 filesystem driver from virtualbox, 32bit" #~ msgstr "Datņu sistēmas EXT2/3 (Linux) draiveris, 32 biti" -#~ msgid "ext4 filesystem driver from tianocore, 32bit" -#~ msgstr "Datņus sistēmas EXT4 (Linux) draiveris, 32 biti" - #~ msgid "USB 3.0 driver, 32bit" #~ msgstr "USB 3.0 kopnes draiveris, 32 biti" diff --git a/CloverPackage/package/po/nl.po b/CloverPackage/package/po/nl.po index e58a168dd2..c5ad4eb155 100644 --- a/CloverPackage/package/po/nl.po +++ b/CloverPackage/package/po/nl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-30 12:26+0300\n" +"POT-Creation-Date: 2025-09-23 00:10+0300\n" "PO-Revision-Date: 2019-07-14 12:37+0200\n" "Last-Translator: vector sigma\n" "Language-Team: \n" @@ -842,14 +842,16 @@ msgstr "USB muis stuurprogramma, 64bit" #. type: "VBoxExt2.UEFI_description" #: Resources/templates/Localizable.strings:171 -#, no-wrap -msgid "ext2/3 filesystem driver from virtualbox, 64bit" -msgstr "ext2/3 bestandssysteem stuurprogramma van virtualbox, 64bit" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from tianocore, 32bit" +msgid "ext2/3 filesystem driver from tianocore, 64bit" +msgstr "ext4 bestandssysteem stuurprogramma van tianocore, 32bit" #. type: "Ext4Dxe.UEFI_description" #: Resources/templates/Localizable.strings:172 -#, no-wrap -msgid "ext4 filesystem driver from virtualbox, 64bit" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from virtualbox, 64bit" +msgid "ext4 filesystem driver from EDK2-platform, 64bit" msgstr "ext4 bestandssysteem stuurprogramma van virtualbox, 64bit" #. type: "VBoxHfs.UEFI_description" @@ -1452,6 +1454,10 @@ msgstr "Instellen EFI map" msgid "Unknown" msgstr "Onbekend" +#, no-wrap +#~ msgid "ext2/3 filesystem driver from virtualbox, 64bit" +#~ msgstr "ext2/3 bestandssysteem stuurprogramma van virtualbox, 64bit" + #~ msgid "" #~ "Preferred 64bit driver to fix Memory problems on UEFI firmware such as " #~ "AMI Aptio" @@ -1499,9 +1505,6 @@ msgstr "Onbekend" #~ msgid "ext2/3 filesystem driver from virtualbox, 32bit" #~ msgstr "ext2/3 bestandssysteem stuurprogramma van virtualbox, 32bit" -#~ msgid "ext4 filesystem driver from tianocore, 32bit" -#~ msgstr "ext4 bestandssysteem stuurprogramma van tianocore, 32bit" - #~ msgid "USB 3.0 driver, 32bit" #~ msgstr "USB 3.0 stuurprogramma, 32bit" diff --git a/CloverPackage/package/po/pl.po b/CloverPackage/package/po/pl.po index f4cedd3290..1491fd5fcf 100644 --- a/CloverPackage/package/po/pl.po +++ b/CloverPackage/package/po/pl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-30 12:26+0300\n" +"POT-Creation-Date: 2025-09-23 00:10+0300\n" "PO-Revision-Date: 2018-10-02 11:43+0200\n" "Last-Translator: vector sigma\n" "Language-Team: pl \n" @@ -849,14 +849,16 @@ msgstr "Sterownik (64-ro bitowy) myszy na USB." #. type: "VBoxExt2.UEFI_description" #: Resources/templates/Localizable.strings:171 -#, no-wrap -msgid "ext2/3 filesystem driver from virtualbox, 64bit" -msgstr "Sterownik (64-ro bitowy) dla formatu ext2/3 z VirtualBox'a." +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from tianocore, 32bit" +msgid "ext2/3 filesystem driver from tianocore, 64bit" +msgstr "Sterownik (32 bitowy) dla formatu ext4 z tianocore'a." #. type: "Ext4Dxe.UEFI_description" #: Resources/templates/Localizable.strings:172 -#, no-wrap -msgid "ext4 filesystem driver from virtualbox, 64bit" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from virtualbox, 64bit" +msgid "ext4 filesystem driver from EDK2-platform, 64bit" msgstr "Sterownik (64-ro bitowy) dla formatu ext4 z VirtualBox'a." #. type: "VBoxHfs.UEFI_description" @@ -1466,6 +1468,10 @@ msgstr "Ustaw lokalizację EFI" msgid "Unknown" msgstr "Nieznany" +#, no-wrap +#~ msgid "ext2/3 filesystem driver from virtualbox, 64bit" +#~ msgstr "Sterownik (64-ro bitowy) dla formatu ext2/3 z VirtualBox'a." + #~ msgid "" #~ "Preferred 64bit driver to fix Memory problems on UEFI firmware such as " #~ "AMI Aptio" @@ -1513,9 +1519,6 @@ msgstr "Nieznany" #~ msgid "ext2/3 filesystem driver from virtualbox, 32bit" #~ msgstr "Sterownik (32 bitowy) dla formatu ext2/3 z VirtualBox'a." -#~ msgid "ext4 filesystem driver from tianocore, 32bit" -#~ msgstr "Sterownik (32 bitowy) dla formatu ext4 z tianocore'a." - #~ msgid "USB 3.0 driver, 32bit" #~ msgstr "Sterownik (32 bitowy) USB 3.0" diff --git a/CloverPackage/package/po/pt-BR.po b/CloverPackage/package/po/pt-BR.po index 066c3a140d..9556e0ea9e 100644 --- a/CloverPackage/package/po/pt-BR.po +++ b/CloverPackage/package/po/pt-BR.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-30 12:26+0300\n" +"POT-Creation-Date: 2025-09-23 00:10+0300\n" "PO-Revision-Date: 2018-10-02 11:44+0200\n" "Last-Translator: vector sigma\n" "Language-Team: pt \n" @@ -840,14 +840,16 @@ msgstr "Driver para Mouse USB, 64bit" #. type: "VBoxExt2.UEFI_description" #: Resources/templates/Localizable.strings:171 -#, no-wrap -msgid "ext2/3 filesystem driver from virtualbox, 64bit" -msgstr "driver para sistema de arquivos ext2/3 do virtualbox, 64bit" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from tianocore, 32bit" +msgid "ext2/3 filesystem driver from tianocore, 64bit" +msgstr "driver para sistema de arquivos ext4 do tianocore, 32bit" #. type: "Ext4Dxe.UEFI_description" #: Resources/templates/Localizable.strings:172 -#, no-wrap -msgid "ext4 filesystem driver from virtualbox, 64bit" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from virtualbox, 64bit" +msgid "ext4 filesystem driver from EDK2-platform, 64bit" msgstr "driver para sistema de arquivos ext4 do virtualbox, 64bit" #. type: "VBoxHfs.UEFI_description" @@ -1457,6 +1459,10 @@ msgstr "Definir a pasta EFI" msgid "Unknown" msgstr "Desconhecido" +#, no-wrap +#~ msgid "ext2/3 filesystem driver from virtualbox, 64bit" +#~ msgstr "driver para sistema de arquivos ext2/3 do virtualbox, 64bit" + #~ msgid "" #~ "Preferred 64bit driver to fix Memory problems on UEFI firmware such as " #~ "AMI Aptio" @@ -1504,9 +1510,6 @@ msgstr "Desconhecido" #~ msgid "ext2/3 filesystem driver from virtualbox, 32bit" #~ msgstr "driver para sistema de arquivos ext2/3 do virtualbox, 32bit" -#~ msgid "ext4 filesystem driver from tianocore, 32bit" -#~ msgstr "driver para sistema de arquivos ext4 do tianocore, 32bit" - #~ msgid "USB 3.0 driver, 32bit" #~ msgstr "Driver para USB 3.0, 32bit" diff --git a/CloverPackage/package/po/pt.po b/CloverPackage/package/po/pt.po index ddb4a28b40..4f87b8312f 100644 --- a/CloverPackage/package/po/pt.po +++ b/CloverPackage/package/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-30 12:26+0300\n" +"POT-Creation-Date: 2025-09-23 00:10+0300\n" "PO-Revision-Date: 2019-07-19 10:48+0100\n" "Last-Translator: vector sigma\n" "Language-Team: pt \n" @@ -834,14 +834,16 @@ msgstr "Driver para Rato USB, 64bit" #. type: "VBoxExt2.UEFI_description" #: Resources/templates/Localizable.strings:171 -#, no-wrap -msgid "ext2/3 filesystem driver from virtualbox, 64bit" -msgstr "driver para sistema de arquivos ext2/3 do virtualbox, 64bit" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from tianocore, 32bit" +msgid "ext2/3 filesystem driver from tianocore, 64bit" +msgstr "driver para sistema de arquivos ext4 do tianocore, 32bit" #. type: "Ext4Dxe.UEFI_description" #: Resources/templates/Localizable.strings:172 -#, no-wrap -msgid "ext4 filesystem driver from virtualbox, 64bit" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from virtualbox, 64bit" +msgid "ext4 filesystem driver from EDK2-platform, 64bit" msgstr "driver para sistema de arquivos ext4 do virtualbox, 64bit" #. type: "VBoxHfs.UEFI_description" @@ -1443,6 +1445,10 @@ msgstr "Defina directório EFI" msgid "Unknown" msgstr "Desconhecido" +#, no-wrap +#~ msgid "ext2/3 filesystem driver from virtualbox, 64bit" +#~ msgstr "driver para sistema de arquivos ext2/3 do virtualbox, 64bit" + #~ msgid "" #~ "Preferred 64bit driver to fix Memory problems on UEFI firmware such as " #~ "AMI Aptio" @@ -1490,9 +1496,6 @@ msgstr "Desconhecido" #~ msgid "ext2/3 filesystem driver from virtualbox, 32bit" #~ msgstr "driver para sistema de arquivos ext2/3 do virtualbox, 32bit" -#~ msgid "ext4 filesystem driver from tianocore, 32bit" -#~ msgstr "driver para sistema de arquivos ext4 do tianocore, 32bit" - #~ msgid "USB 3.0 driver, 32bit" #~ msgstr "Driver para USB 3.0, 32bit" diff --git a/CloverPackage/package/po/ro.po b/CloverPackage/package/po/ro.po index 8d1d093877..d91d52e88d 100644 --- a/CloverPackage/package/po/ro.po +++ b/CloverPackage/package/po/ro.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-30 12:26+0300\n" +"POT-Creation-Date: 2025-09-23 00:10+0300\n" "PO-Revision-Date: 2019-07-14 21:16+0300\n" "Last-Translator: vector sigma\n" "Language-Team: ro \n" @@ -844,14 +844,16 @@ msgstr "Driver pentru mouse pe USB, 64-bit" #. type: "VBoxExt2.UEFI_description" #: Resources/templates/Localizable.strings:171 -#, no-wrap -msgid "ext2/3 filesystem driver from virtualbox, 64bit" -msgstr "driver ext2/3 din VirtualBox, 64-bit" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from tianocore, 32bit" +msgid "ext2/3 filesystem driver from tianocore, 64bit" +msgstr "driver ext4 din tianocore, 32-bit" #. type: "Ext4Dxe.UEFI_description" #: Resources/templates/Localizable.strings:172 -#, no-wrap -msgid "ext4 filesystem driver from virtualbox, 64bit" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from virtualbox, 64bit" +msgid "ext4 filesystem driver from EDK2-platform, 64bit" msgstr "driver ext4 din VirtualBox, 64-bit" #. type: "VBoxHfs.UEFI_description" @@ -1454,6 +1456,10 @@ msgstr "Setati directorul EFI" msgid "Unknown" msgstr "Necunoscut" +#, no-wrap +#~ msgid "ext2/3 filesystem driver from virtualbox, 64bit" +#~ msgstr "driver ext2/3 din VirtualBox, 64-bit" + #~ msgid "" #~ "Preferred 64bit driver to fix Memory problems on UEFI firmware such as " #~ "AMI Aptio" @@ -1502,9 +1508,6 @@ msgstr "Necunoscut" #~ msgid "ext2/3 filesystem driver from virtualbox, 32bit" #~ msgstr "driver ext2/3 din VirtualBox, 32-bit" -#~ msgid "ext4 filesystem driver from tianocore, 32bit" -#~ msgstr "driver ext4 din tianocore, 32-bit" - #~ msgid "USB 3.0 driver, 32bit" #~ msgstr "Driver USB 3.0, 32-bit" diff --git a/CloverPackage/package/po/ru.po b/CloverPackage/package/po/ru.po index f08a6c88f2..dcd27a85f9 100644 --- a/CloverPackage/package/po/ru.po +++ b/CloverPackage/package/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 5.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-30 12:26+0300\n" +"POT-Creation-Date: 2025-09-23 00:10+0300\n" "PO-Revision-Date: \n" "Last-Translator: vector sigma\n" "Language-Team: ru \n" @@ -842,14 +842,16 @@ msgstr "Драйвер для мыши USB." #. type: "VBoxExt2.UEFI_description" #: Resources/templates/Localizable.strings:171 -#, no-wrap -msgid "ext2/3 filesystem driver from virtualbox, 64bit" -msgstr "Поддержка файловых систем EXT2 и EXT3 (Linux)." +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from tianocore, 32bit" +msgid "ext2/3 filesystem driver from tianocore, 64bit" +msgstr "Драйвер файловой системы EXT4 (Linux), 32 бита." #. type: "Ext4Dxe.UEFI_description" #: Resources/templates/Localizable.strings:172 -#, no-wrap -msgid "ext4 filesystem driver from virtualbox, 64bit" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from virtualbox, 64bit" +msgid "ext4 filesystem driver from EDK2-platform, 64bit" msgstr "Поддержка файловой системы EXT4 (Linux)." #. type: "VBoxHfs.UEFI_description" @@ -1437,6 +1439,10 @@ msgstr "Установить папку EFI" msgid "Unknown" msgstr "Неизвестно" +#, no-wrap +#~ msgid "ext2/3 filesystem driver from virtualbox, 64bit" +#~ msgstr "Поддержка файловых систем EXT2 и EXT3 (Linux)." + #~ msgid "" #~ "Preferred 64bit driver to fix Memory problems on UEFI firmware such as " #~ "AMI Aptio" @@ -1496,9 +1502,6 @@ msgstr "Неизвестно" #~ msgid "ext2/3 filesystem driver from virtualbox, 32bit" #~ msgstr "Драйвер файловой системы EXT2/3 (Linux), 32 бита." -#~ msgid "ext4 filesystem driver from tianocore, 32bit" -#~ msgstr "Драйвер файловой системы EXT4 (Linux), 32 бита." - #~ msgid "USB 3.0 driver, 32bit" #~ msgstr "Драйвер для USB 3.0, 32 бита." diff --git a/CloverPackage/package/po/tr.po b/CloverPackage/package/po/tr.po index 0d9257da3a..bdb4495f0b 100644 --- a/CloverPackage/package/po/tr.po +++ b/CloverPackage/package/po/tr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-30 12:26+0300\n" +"POT-Creation-Date: 2025-09-23 00:10+0300\n" "PO-Revision-Date: 2018-10-02 11:46+0200\n" "Last-Translator: vector sigma\n" "Language-Team: \n" @@ -840,14 +840,16 @@ msgstr "USB fare sürücüsü, 64bit" #. type: "VBoxExt2.UEFI_description" #: Resources/templates/Localizable.strings:171 -#, no-wrap -msgid "ext2/3 filesystem driver from virtualbox, 64bit" -msgstr "Virtualbox'tan ext2/3 dosya sistemi sürücüsü, 64bit" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from tianocore, 32bit" +msgid "ext2/3 filesystem driver from tianocore, 64bit" +msgstr "tianocore'tan ext4 dosya sistemi sürücüsü, 32bit" #. type: "Ext4Dxe.UEFI_description" #: Resources/templates/Localizable.strings:172 -#, no-wrap -msgid "ext4 filesystem driver from virtualbox, 64bit" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from virtualbox, 64bit" +msgid "ext4 filesystem driver from EDK2-platform, 64bit" msgstr "Virtualbox'tan ext4 dosya sistemi sürücüsü, 64bit" #. type: "VBoxHfs.UEFI_description" @@ -1457,6 +1459,10 @@ msgstr "EFI dizinini belirle" msgid "Unknown" msgstr "Bilinmeyen" +#, no-wrap +#~ msgid "ext2/3 filesystem driver from virtualbox, 64bit" +#~ msgstr "Virtualbox'tan ext2/3 dosya sistemi sürücüsü, 64bit" + #~ msgid "" #~ "Preferred 64bit driver to fix Memory problems on UEFI firmware such as " #~ "AMI Aptio" @@ -1505,9 +1511,6 @@ msgstr "Bilinmeyen" #~ msgid "ext2/3 filesystem driver from virtualbox, 32bit" #~ msgstr "Virtualbox'tan ext2/3 dosya sistemi sürücüsü, 32bit" -#~ msgid "ext4 filesystem driver from tianocore, 32bit" -#~ msgstr "tianocore'tan ext4 dosya sistemi sürücüsü, 32bit" - #~ msgid "USB 3.0 driver, 32bit" #~ msgstr "USB 3.0 sürücüsü, 32bit" diff --git a/CloverPackage/package/po/uk.po b/CloverPackage/package/po/uk.po index 86d9237118..9e1f9bb7a6 100644 --- a/CloverPackage/package/po/uk.po +++ b/CloverPackage/package/po/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-30 12:26+0300\n" +"POT-Creation-Date: 2025-09-23 00:10+0300\n" "PO-Revision-Date: 2018-10-02 11:47+0200\n" "Last-Translator: vector sigma\n" "Language-Team: ua \n" @@ -853,14 +853,16 @@ msgstr "64-бітний драйвер для USB миші" #. type: "VBoxExt2.UEFI_description" #: Resources/templates/Localizable.strings:171 -#, no-wrap -msgid "ext2/3 filesystem driver from virtualbox, 64bit" -msgstr "64-бітний драйвер для Linux EXT2/3 - файлової системи" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from tianocore, 32bit" +msgid "ext2/3 filesystem driver from tianocore, 64bit" +msgstr "32-бітний драйвер для Linux EXT4 - файлової системи" #. type: "Ext4Dxe.UEFI_description" #: Resources/templates/Localizable.strings:172 -#, no-wrap -msgid "ext4 filesystem driver from virtualbox, 64bit" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from virtualbox, 64bit" +msgid "ext4 filesystem driver from EDK2-platform, 64bit" msgstr "64-бітний драйвер для Linux EXT4 - файлової системи" #. type: "VBoxHfs.UEFI_description" @@ -1470,6 +1472,10 @@ msgstr "Встановити EFI каталог" msgid "Unknown" msgstr "Невідомо" +#, no-wrap +#~ msgid "ext2/3 filesystem driver from virtualbox, 64bit" +#~ msgstr "64-бітний драйвер для Linux EXT2/3 - файлової системи" + #~ msgid "" #~ "Preferred 64bit driver to fix Memory problems on UEFI firmware such as " #~ "AMI Aptio" @@ -1518,9 +1524,6 @@ msgstr "Невідомо" #~ msgid "ext2/3 filesystem driver from virtualbox, 32bit" #~ msgstr "32-бітний драйвер для Linux EXT2/3 - файлової системи" -#~ msgid "ext4 filesystem driver from tianocore, 32bit" -#~ msgstr "32-бітний драйвер для Linux EXT4 - файлової системи" - #~ msgid "USB 3.0 driver, 32bit" #~ msgstr "32-бітний драйвер для USB v3.0" diff --git a/CloverPackage/package/po/uk_UA.po b/CloverPackage/package/po/uk_UA.po index 7763a55a68..1dcb12aa54 100644 --- a/CloverPackage/package/po/uk_UA.po +++ b/CloverPackage/package/po/uk_UA.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-30 12:26+0300\n" +"POT-Creation-Date: 2025-09-23 00:10+0300\n" "PO-Revision-Date: 2018-10-02 11:47+0200\n" "Last-Translator: vector sigma\n" "Language-Team: ua \n" @@ -853,14 +853,16 @@ msgstr "64-бітний драйвер для USB миші" #. type: "VBoxExt2.UEFI_description" #: Resources/templates/Localizable.strings:171 -#, no-wrap -msgid "ext2/3 filesystem driver from virtualbox, 64bit" -msgstr "64-бітний драйвер для Linux EXT2/3 - файлової системи" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from tianocore, 32bit" +msgid "ext2/3 filesystem driver from tianocore, 64bit" +msgstr "32-бітний драйвер для Linux EXT4 - файлової системи" #. type: "Ext4Dxe.UEFI_description" #: Resources/templates/Localizable.strings:172 -#, no-wrap -msgid "ext4 filesystem driver from virtualbox, 64bit" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from virtualbox, 64bit" +msgid "ext4 filesystem driver from EDK2-platform, 64bit" msgstr "64-бітний драйвер для Linux EXT4 - файлової системи" #. type: "VBoxHfs.UEFI_description" @@ -1470,6 +1472,10 @@ msgstr "Встановити EFI каталог" msgid "Unknown" msgstr "Невідомо" +#, no-wrap +#~ msgid "ext2/3 filesystem driver from virtualbox, 64bit" +#~ msgstr "64-бітний драйвер для Linux EXT2/3 - файлової системи" + #~ msgid "" #~ "Preferred 64bit driver to fix Memory problems on UEFI firmware such as " #~ "AMI Aptio" @@ -1518,9 +1524,6 @@ msgstr "Невідомо" #~ msgid "ext2/3 filesystem driver from virtualbox, 32bit" #~ msgstr "32-бітний драйвер для Linux EXT2/3 - файлової системи" -#~ msgid "ext4 filesystem driver from tianocore, 32bit" -#~ msgstr "32-бітний драйвер для Linux EXT4 - файлової системи" - #~ msgid "USB 3.0 driver, 32bit" #~ msgstr "32-бітний драйвер для USB v3.0" diff --git a/CloverPackage/package/po/vi.po b/CloverPackage/package/po/vi.po index d2b6c514e3..4787a20e9b 100644 --- a/CloverPackage/package/po/vi.po +++ b/CloverPackage/package/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-30 12:26+0300\n" +"POT-Creation-Date: 2025-09-23 00:10+0300\n" "PO-Revision-Date: 2018-10-02 11:47+0200\n" "Last-Translator: vector sigma\n" "Language-Team: en \n" @@ -847,14 +847,16 @@ msgstr "USB mouse driver, 64bit" #. type: "VBoxExt2.UEFI_description" #: Resources/templates/Localizable.strings:171 -#, no-wrap -msgid "ext2/3 filesystem driver from virtualbox, 64bit" -msgstr "ext2/3 filesystem driver from virtual box, 64bit" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from tianocore, 32bit" +msgid "ext2/3 filesystem driver from tianocore, 64bit" +msgstr "ext4 filesystem driver from virtual box, 32bit" #. type: "Ext4Dxe.UEFI_description" #: Resources/templates/Localizable.strings:172 -#, no-wrap -msgid "ext4 filesystem driver from virtualbox, 64bit" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from virtualbox, 64bit" +msgid "ext4 filesystem driver from EDK2-platform, 64bit" msgstr "ext4 filesystem driver from virtual box, 64bit" #. type: "VBoxHfs.UEFI_description" @@ -1464,6 +1466,10 @@ msgstr "Thiết lập thư mục EFI" msgid "Unknown" msgstr "Không xác định." +#, no-wrap +#~ msgid "ext2/3 filesystem driver from virtualbox, 64bit" +#~ msgstr "ext2/3 filesystem driver from virtual box, 64bit" + #~ msgid "" #~ "Preferred 64bit driver to fix Memory problems on UEFI firmware such as " #~ "AMI Aptio" @@ -1511,9 +1517,6 @@ msgstr "Không xác định." #~ msgid "ext2/3 filesystem driver from virtualbox, 32bit" #~ msgstr "ext2/3 filesystem driver from virtual box, 32bit" -#~ msgid "ext4 filesystem driver from tianocore, 32bit" -#~ msgstr "ext4 filesystem driver from virtual box, 32bit" - #~ msgid "USB 3.0 driver, 32bit" #~ msgstr "USB 3.0 driver, 32bit" diff --git a/CloverPackage/package/po/zh_CN.po b/CloverPackage/package/po/zh_CN.po index 7479488503..f6f19296ee 100644 --- a/CloverPackage/package/po/zh_CN.po +++ b/CloverPackage/package/po/zh_CN.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-30 12:26+0300\n" +"POT-Creation-Date: 2025-09-23 00:10+0300\n" "PO-Revision-Date: 2019-08-09 19:03-0400\n" "Last-Translator: vector sigma\n" "Language-Team: zh_CN \n" @@ -829,14 +829,16 @@ msgstr "64位版本, USB 鼠标 驱动" #. type: "VBoxExt2.UEFI_description" #: Resources/templates/Localizable.strings:171 -#, no-wrap -msgid "ext2/3 filesystem driver from virtualbox, 64bit" -msgstr "64位版本, 来自 virtualbox 的 ext2/3 文件系统驱动" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from tianocore, 32bit" +msgid "ext2/3 filesystem driver from tianocore, 64bit" +msgstr "32位版本, 来自 tianocore 的 ext4 文件系统驱动。" #. type: "Ext4Dxe.UEFI_description" #: Resources/templates/Localizable.strings:172 -#, no-wrap -msgid "ext4 filesystem driver from virtualbox, 64bit" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from virtualbox, 64bit" +msgid "ext4 filesystem driver from EDK2-platform, 64bit" msgstr "64位版本, 来自 virtualbox 的 ext4 文件系统驱动" #. type: "VBoxHfs.UEFI_description" @@ -1431,6 +1433,10 @@ msgstr "设置 EFI 目录" msgid "Unknown" msgstr "未知" +#, no-wrap +#~ msgid "ext2/3 filesystem driver from virtualbox, 64bit" +#~ msgstr "64位版本, 来自 virtualbox 的 ext2/3 文件系统驱动" + #~ msgid "" #~ "Preferred 64bit driver to fix Memory problems on UEFI firmware such as " #~ "AMI Aptio" @@ -1476,9 +1482,6 @@ msgstr "未知" #~ msgid "ext2/3 filesystem driver from virtualbox, 32bit" #~ msgstr "32位版本, 来自 virtualbox 的 ext2/3 文件系统驱动。" -#~ msgid "ext4 filesystem driver from tianocore, 32bit" -#~ msgstr "32位版本, 来自 tianocore 的 ext4 文件系统驱动。" - #~ msgid "USB 3.0 driver, 32bit" #~ msgstr "32位版本, USB 3.0 驱动。" diff --git a/CloverPackage/package/po/zh_TW.po b/CloverPackage/package/po/zh_TW.po index 0a5442eb76..5bd72ad559 100644 --- a/CloverPackage/package/po/zh_TW.po +++ b/CloverPackage/package/po/zh_TW.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-30 12:26+0300\n" +"POT-Creation-Date: 2025-09-23 00:10+0300\n" "PO-Revision-Date: 2018-10-02 11:48+0200\n" "Last-Translator: vector sigma\n" "Language-Team: zh_TW \n" @@ -841,14 +841,16 @@ msgstr "64位，USB 滑鼠 驅動。" #. type: "VBoxExt2.UEFI_description" #: Resources/templates/Localizable.strings:171 -#, no-wrap -msgid "ext2/3 filesystem driver from virtualbox, 64bit" -msgstr "64位，來自 Virtualbox 的 ext2/3 檔案系統驅動。" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from tianocore, 32bit" +msgid "ext2/3 filesystem driver from tianocore, 64bit" +msgstr "32位，來自 tianocore 的 ext4 檔案系統驅動。" #. type: "Ext4Dxe.UEFI_description" #: Resources/templates/Localizable.strings:172 -#, no-wrap -msgid "ext4 filesystem driver from virtualbox, 64bit" +#, fuzzy, no-wrap +#| msgid "ext4 filesystem driver from virtualbox, 64bit" +msgid "ext4 filesystem driver from EDK2-platform, 64bit" msgstr "64位，來自 Virtualbox 的 ext4 檔案系統驅動。" #. type: "VBoxHfs.UEFI_description" @@ -1458,6 +1460,10 @@ msgstr "設定 EFI 資料夾" msgid "Unknown" msgstr "未知" +#, no-wrap +#~ msgid "ext2/3 filesystem driver from virtualbox, 64bit" +#~ msgstr "64位，來自 Virtualbox 的 ext2/3 檔案系統驅動。" + #~ msgid "" #~ "Preferred 64bit driver to fix Memory problems on UEFI firmware such as " #~ "AMI Aptio" @@ -1503,9 +1509,6 @@ msgstr "未知" #~ msgid "ext2/3 filesystem driver from virtualbox, 32bit" #~ msgstr "32位，來自 Virtualbox 的 ext2/3 檔案系統驅動。" -#~ msgid "ext4 filesystem driver from tianocore, 32bit" -#~ msgstr "32位，來自 tianocore 的 ext4 檔案系統驅動。" - #~ msgid "USB 3.0 driver, 32bit" #~ msgstr "32位，XHCI USB 3.0 驅動。"