Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2024-11-26 12:05:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Steve Zheng 2021-05-13 08:29:14 +08:00 committed by GitHub
commit 0a1c2695a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 82 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
.gitignore vendored
View File

@ -9,83 +9,6 @@
/Conf
/toolchain/
# /CloverPackage/
/CloverPackage/sym/
/CloverPackage/CloverConfigPlistValidator/
/CloverPackage/CloverV2/BootSectors/boot0af
/CloverPackage/CloverV2/BootSectors/boot0ss
/CloverPackage/CloverV2/BootSectors/boot0md
/CloverPackage/CloverV2/BootSectors/boot1h
/CloverPackage/CloverV2/BootSectors/boot1h2
/CloverPackage/CloverV2/BootSectors/boot1f32alt
/CloverPackage/CloverV2/BootSectors/boot1f32
/CloverPackage/CloverV2/BootSectors/boot1x
/CloverPackage/CloverV2/BootSectors/boot1xalt
/CloverPackage/CloverV2/BootSectors/Description.txt
/CloverPackage/CloverV2/BootSectors/Installation.txt
/CloverPackage/CloverV2/Bootloaders/ia32/
/CloverPackage/CloverV2/Bootloaders/x64/
/CloverPackage/CloverV2/Bootloaders/X64/
/CloverPackage/CloverV2/EFI/BOOT/BOOTIA32.efi
/CloverPackage/CloverV2/EFI/BOOT/BOOTX64.efi
/CloverPackage/CloverV2/EFI/CLOVER/CLOVERX64.efi
/CloverPackage/CloverV2/EFI/CLOVER/CLOVERX64-test.efi
/CloverPackage/CloverV2/EFI/CLOVER/CLOVERIA32.efi
/CloverPackage/CloverV2/EFI/CLOVER/drivers/
/CloverPackage/CloverV2/EFI/CLOVER/drivers32/
/CloverPackage/CloverV2/EFI/CLOVER/drivers32UEFI/
/CloverPackage/CloverV2/EFI/CLOVER/drivers64/
/CloverPackage/CloverV2/EFI/CLOVER/drivers64UEFI/
/CloverPackage/CloverV2/EFI/CLOVER/tools/bdmesg.efi
/CloverPackage/CloverV2/EFI/CLOVER/tools/bdmesg-32.efi
/CloverPackage/CloverV2/EFI/CLOVER/tools/Shell64U.efi
/CloverPackage/CloverV2/drivers-Off/drivers32/
/CloverPackage/CloverV2/drivers-Off/drivers32UEFI/
/CloverPackage/CloverV2/drivers-Off/drivers64/
/CloverPackage/CloverV2/drivers-Off/drivers64UEFI/
/CloverPackage/CloverPrefpane/src/de.lproj/
/CloverPackage/CloverPrefpane/src/es.lproj/
/CloverPackage/CloverPrefpane/src/fr.lproj/
/CloverPackage/CloverPrefpane/src/hr.lproj/
/CloverPackage/CloverPrefpane/src/id.lproj/
/CloverPackage/CloverPrefpane/src/it.lproj/
/CloverPackage/CloverPrefpane/src/ja.lproj/
/CloverPackage/CloverPrefpane/src/ko.lproj/
/CloverPackage/CloverPrefpane/src/lv.lproj/
/CloverPackage/CloverPrefpane/src/nl.lproj/
/CloverPackage/CloverPrefpane/src/pl.lproj/
/CloverPackage/CloverPrefpane/src/pt-BR.lproj/
/CloverPackage/CloverPrefpane/src/pt.lproj/
/CloverPackage/CloverPrefpane/src/ro.lproj/
/CloverPackage/CloverPrefpane/src/ru.lproj/
/CloverPackage/CloverPrefpane/src/tr.lproj/
/CloverPackage/CloverPrefpane/src/uk.lproj/
/CloverPackage/CloverPrefpane/src/uk_UA.lproj/
/CloverPackage/CloverPrefpane/src/vi.lproj/
/CloverPackage/CloverPrefpane/src/zh_CN.lproj/
/CloverPackage/CloverPrefpane/src/zh_TW.lproj/
/CloverPackage/CloverUpdater/src/de.lproj/
/CloverPackage/CloverUpdater/src/es.lproj/
/CloverPackage/CloverUpdater/src/fr.lproj/
/CloverPackage/CloverUpdater/src/hr.lproj/
/CloverPackage/CloverUpdater/src/id.lproj/
/CloverPackage/CloverUpdater/src/it.lproj/
/CloverPackage/CloverUpdater/src/ja.lproj/
/CloverPackage/CloverUpdater/src/ko.lproj/
/CloverPackage/CloverUpdater/src/lv.lproj/
/CloverPackage/CloverUpdater/src/nl.lproj/
/CloverPackage/CloverUpdater/src/pl.lproj/
/CloverPackage/CloverUpdater/src/pt-BR.lproj/
/CloverPackage/CloverUpdater/src/pt.lproj/
/CloverPackage/CloverUpdater/src/ro.lproj/
/CloverPackage/CloverUpdater/src/ru.lproj/
/CloverPackage/CloverUpdater/src/tr.lproj/
/CloverPackage/CloverUpdater/src/uk.lproj/
/CloverPackage/CloverUpdater/src/uk_UA.lproj/
/CloverPackage/CloverUpdater/src/vi.lproj/
/CloverPackage/CloverUpdater/src/zh_CN.lproj/
/CloverPackage/CloverUpdater/src/zh_TW.lproj/
# /FileSystems/HFSPlus/
/FileSystems/HFSPlus/Ia32/
@ -134,5 +57,4 @@ RELEASE_*/
*copy [0-9]*
#work in progress
*_wip
*_wip

76
CloverPackage/.gitignore vendored Normal file
View File

@ -0,0 +1,76 @@
/sym/
/CloverV2/BootSectors/boot0af
/CloverV2/BootSectors/boot0ss
/CloverV2/BootSectors/boot0md
/CloverV2/BootSectors/boot1h
/CloverV2/BootSectors/boot1h2
/CloverV2/BootSectors/boot1f32alt
/CloverV2/BootSectors/boot1f32
/CloverV2/BootSectors/boot1x
/CloverV2/BootSectors/boot1xalt
/CloverV2/BootSectors/Description.txt
/CloverV2/BootSectors/Installation.txt
/CloverV2/Bootloaders/ia32/
/CloverV2/Bootloaders/x64/
/CloverV2/Bootloaders/X64/
/CloverV2/EFI/BOOT/BOOTIA32.efi
/CloverV2/EFI/BOOT/BOOTX64.efi
/CloverV2/EFI/CLOVER/CLOVERX64.efi
/CloverV2/EFI/CLOVER/CLOVERX64-test.efi
/CloverV2/EFI/CLOVER/CLOVERIA32.efi
/CloverV2/EFI/CLOVER/drivers/
/CloverV2/EFI/CLOVER/drivers32/
/CloverV2/EFI/CLOVER/drivers32UEFI/
/CloverV2/EFI/CLOVER/drivers64/
/CloverV2/EFI/CLOVER/drivers64UEFI/
/CloverV2/EFI/CLOVER/tools/bdmesg.efi
/CloverV2/EFI/CLOVER/tools/bdmesg-32.efi
/CloverV2/EFI/CLOVER/tools/Shell64U.efi
/CloverV2/drivers-Off/drivers32/
/CloverV2/drivers-Off/drivers32UEFI/
/CloverV2/drivers-Off/drivers64/
/CloverV2/drivers-Off/drivers64UEFI/
/CloverPrefpane/src/de.lproj/
/CloverPrefpane/src/es.lproj/
/CloverPrefpane/src/fr.lproj/
/CloverPrefpane/src/hr.lproj/
/CloverPrefpane/src/id.lproj/
/CloverPrefpane/src/it.lproj/
/CloverPrefpane/src/ja.lproj/
/CloverPrefpane/src/ko.lproj/
/CloverPrefpane/src/lv.lproj/
/CloverPrefpane/src/nl.lproj/
/CloverPrefpane/src/pl.lproj/
/CloverPrefpane/src/pt-BR.lproj/
/CloverPrefpane/src/pt.lproj/
/CloverPrefpane/src/ro.lproj/
/CloverPrefpane/src/ru.lproj/
/CloverPrefpane/src/tr.lproj/
/CloverPrefpane/src/uk.lproj/
/CloverPrefpane/src/uk_UA.lproj/
/CloverPrefpane/src/vi.lproj/
/CloverPrefpane/src/zh_CN.lproj/
/CloverPrefpane/src/zh_TW.lproj/
/CloverUpdater/src/de.lproj/
/CloverUpdater/src/es.lproj/
/CloverUpdater/src/fr.lproj/
/CloverUpdater/src/hr.lproj/
/CloverUpdater/src/id.lproj/
/CloverUpdater/src/it.lproj/
/CloverUpdater/src/ja.lproj/
/CloverUpdater/src/ko.lproj/
/CloverUpdater/src/lv.lproj/
/CloverUpdater/src/nl.lproj/
/CloverUpdater/src/pl.lproj/
/CloverUpdater/src/pt-BR.lproj/
/CloverUpdater/src/pt.lproj/
/CloverUpdater/src/ro.lproj/
/CloverUpdater/src/ru.lproj/
/CloverUpdater/src/tr.lproj/
/CloverUpdater/src/uk.lproj/
/CloverUpdater/src/uk_UA.lproj/
/CloverUpdater/src/vi.lproj/
/CloverUpdater/src/zh_CN.lproj/
/CloverUpdater/src/zh_TW.lproj/
/BootLoaderChooser
/CloverConfigPlistValidator

4
CloverPackage/package/po/clover.pot
View File

@ -6,8 +6,8 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Clover r5126\n"
"POT-Creation-Date: 2020-11-22 13:02+0300\n"
"Project-Id-Version: Clover r5134\n"
"POT-Creation-Date: 2021-05-06 18:23+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

4
buildme
View File

@ -189,10 +189,10 @@ if [[ -x "${DIR_TOOLS}"/Scripts/build.sh ]]; then
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 -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 -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

2
rEFIt_UEFI/Settings/ConfigPlist/Config_Quirks.h
View File

@ -125,7 +125,7 @@ public:
protected:
XmlBool FuzzyMatch = XmlBool();
XmlString8AllowEmpty KernelCache = XmlString8AllowEmpty();
XmlBool ProvideConsoleGopEnable = XmlBool();
// XmlBool ProvideConsoleGopEnable = XmlBool();
public:
OcKernelQuirks_Class OcKernelQuirks;
OcBooterQuirks_Class OcBooterQuirks;