提交 54ba2bf5 编写于 作者: 草原企鹅's avatar 草原企鹅

Merge branch 'master' of https://gitee.com/btwise/OpenCorePkg

......@@ -13,18 +13,21 @@ env:
jobs:
analyze-shell-scripts:
name: Shell Scripts
runs-on: macos-latest
# See https://github.blog/changelog/2024-01-30-github-actions-introducing-the-new-m1-macos-runner-available-to-open-source
runs-on: macos-14
env:
JOB_TYPE: ANALYZE
HOMEBREW_NO_INSTALL_CLEANUP: 1
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
# Due to brew adopting PEP 668 https://github.com/orgs/Homebrew/discussions/3404 pip installs should be in a Python venv
- name: Install Dependencies
run: |
brew install shellcheck
python3 -m venv ~/pyenv
source ~/pyenv/bin/activate
python3 -m pip install pyyaml
env:
HOMEBREW_NO_INSTALL_CLEANUP: 1
- name: CI Bootstrap
run: |
......@@ -36,6 +39,7 @@ jobs:
- name: Check AppleModels
working-directory: AppleModels
run: |
source ~/pyenv/bin/activate
python3 ./update_generated.py || exit 1
if [ "$(git status --porcelain)" != "" ]; then echo "DataBase desync"; exit 1 ; fi
......@@ -65,7 +69,7 @@ jobs:
env:
JOB_TYPE: ANALYZE
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Dependencies
run: |
......@@ -77,7 +81,7 @@ jobs:
python3 -m prospector . -P ./profile.yml | tee prospector_result.txt || exit 1
- name: Upload prospector result to Artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: failure()
with:
name: Prospector Artifacts
......@@ -88,7 +92,7 @@ jobs:
runs-on: ubuntu-22.04
if: github.repository_owner == 'acidanthera' && github.ref_name == 'master'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Dependencies
run: |
......@@ -106,7 +110,7 @@ jobs:
TOOLCHAINS: GCC
if: github.repository_owner == 'acidanthera' && github.event_name != 'pull_request'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Dependencies
run: |
......
......@@ -17,26 +17,22 @@ env:
jobs:
build-macos:
name: macOS XCODE5
runs-on: macos-13
# See https://github.blog/changelog/2024-01-30-github-actions-introducing-the-new-m1-macos-runner-available-to-open-source
runs-on: macos-14
env:
JOB_TYPE: BUILD
HOMEBREW_NO_INSTALL_CLEANUP: 1
HOMEBREW_NO_AUTO_UPDATE: 1
steps:
- uses: actions/checkout@v3
- name: Add Linux Toolchain
run: brew tap FiloSottile/homebrew-musl-cross
- uses: actions/checkout@v4
- name: Install Linux Toolchain
run: brew install musl-cross
env:
HOMEBREW_NO_INSTALL_CLEANUP: 1
HOMEBREW_NO_AUTO_UPDATE: 1
run: |
brew tap FiloSottile/homebrew-musl-cross
brew install musl-cross
- name: Install Dependencies
run: brew install openssl mingw-w64
env:
HOMEBREW_NO_INSTALL_CLEANUP: 1
HOMEBREW_NO_AUTO_UPDATE: 1
- name: CI Bootstrap
run: |
......@@ -46,13 +42,13 @@ jobs:
- run: ./build_oc.tool
- name: Upload to Artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: macOS XCODE5 Artifacts
path: Binaries/*.zip
- name: Upload to Release
if: github.event_name == 'release'
uses: svenstaro/upload-release-action@e74ff71f7d8a4c4745b560a485cc5fdb9b5b999d
uses: svenstaro/upload-release-action@04733e069f2d7f7f0b4aebc4fbdbce8613b03ccd # v2.9.0
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: Binaries/*.zip
......@@ -62,24 +58,22 @@ jobs:
build-linux-clangpdb:
name: Linux CLANGPDB
runs-on: ubuntu-22.04
env:
TOOLCHAINS: CLANGPDB
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Docker in rootless mode.
uses: ScribeMD/rootless-docker@0.2.2
- name: ./build_duet.tool
run: docker compose run build-duet
env:
TOOLCHAINS: CLANGPDB
- name: ./build_oc.tool
run: docker compose run build-oc
env:
TOOLCHAINS: CLANGPDB
- name: Upload to Artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Linux CLANGPDB Artifacts
path: Binaries/*.zip
......@@ -87,24 +81,22 @@ jobs:
build-linux-gcc5:
name: Linux GCC
runs-on: ubuntu-22.04
env:
TOOLCHAINS: GCC
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Docker in rootless mode.
uses: ScribeMD/rootless-docker@0.2.2
- name: ./build_duet.tool
run: docker compose run build-duet
env:
TOOLCHAINS: GCC
- name: ./build_oc.tool
run: docker compose run build-oc
env:
TOOLCHAINS: GCC
- name: Upload to Artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Linux GCC Artifacts
path: Binaries/*.zip
......@@ -112,24 +104,22 @@ jobs:
build-linux-clangdwarf:
name: Linux CLANGDWARF
runs-on: ubuntu-22.04
env:
TOOLCHAINS: CLANGDWARF
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Docker in rootless mode.
uses: ScribeMD/rootless-docker@0.2.2
- name: ./build_duet.tool
run: docker compose run build-duet
env:
TOOLCHAINS: CLANGDWARF
- name: ./build_oc.tool
run: docker compose run build-oc
env:
TOOLCHAINS: CLANGDWARF
- name: Upload to Artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Linux CLANGDWARF Artifacts
path: Binaries/*.zip
......@@ -138,7 +128,7 @@ jobs:
name: Linux Docs
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Docker in rootless mode.
uses: ScribeMD/rootless-docker@0.2.2
......@@ -156,7 +146,7 @@ jobs:
run:
shell: bash
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Dependencies
run: |
......@@ -170,7 +160,7 @@ jobs:
- run: ./build_oc.tool
- name: Upload to Artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Windows Artifacts
path: Binaries/*.zip
......@@ -15,7 +15,7 @@ jobs:
name: Check Codestyle
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Dependencies
run: |
......@@ -32,7 +32,7 @@ jobs:
python3 -c "$(/usr/bin/curl https://raw.githubusercontent.com/acidanthera/ocbuild/master/uncstrap/uncstrap.py)" ./Uncrustify.yml || exit 1
- name: Upload to Artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: failure()
with:
name: Uncrustify Artifacts
......
......@@ -262,4 +262,4 @@ AppleModelYear:
- 2018
- 2019
MinimumOSVersion: "10.12.5"
MaximumOSVersion: "13.6.5"
MaximumOSVersion: "13.6.6"
......@@ -155,4 +155,4 @@ AppleModelYear:
- 2018
- 2019
MinimumOSVersion: "10.12.5"
MaximumOSVersion: "13.6.5"
MaximumOSVersion: "13.6.6"
......@@ -248,4 +248,4 @@ AppleModelYear:
- 2017
- 2018
MinimumOSVersion: "10.12.5"
MaximumOSVersion: "13.6.5"
MaximumOSVersion: "13.6.6"
......@@ -211,4 +211,4 @@ AppleModelYear:
- 2017
- 2018
MinimumOSVersion: "10.12.5"
MaximumOSVersion: "13.6.5"
MaximumOSVersion: "13.6.6"
......@@ -118,4 +118,4 @@ AppleModelYear:
- 2020
- 2021
MinimumOSVersion: "10.12.4"
MaximumOSVersion: "13.6.5"
MaximumOSVersion: "13.6.6"
......@@ -145,4 +145,4 @@ AppleModelYear:
- 2018
- 2019
MinimumOSVersion: "10.12.4"
MaximumOSVersion: "13.6.5"
MaximumOSVersion: "13.6.6"
......@@ -153,4 +153,4 @@ AppleModelYear:
- 2018
- 2019
MinimumOSVersion: "10.12.4"
MaximumOSVersion: "13.6.5"
MaximumOSVersion: "13.6.6"
......@@ -2,6 +2,7 @@ OpenCore Changelog
==================
#### v1.0.0
- Updated builtin firmware versions for SMBIOS and the rest
- Use Apple silicon GitHub runner for CI, thx @Goooler
#### v0.9.9
- Fixed incorrect warning in ocvalidate
......
......@@ -9,6 +9,6 @@
- [Big Sur on Unsupported Macs](https://forums.macrumors.com/threads/macos-11-big-sur-on-unsupported-macs-thread.2242172/)
- [Monterey on Unsupported Macs](https://forums.macrumors.com/threads/macos-12-monterey-on-unsupported-macs-thread.2299557/)
- [OpenCore on the MacPro](https://forums.macrumors.com/threads/opencore-on-the-mac-pro.2207814/)
- [macOS86.it](https://www.macos86.it/showthread.php?4570-OpenCore-aka-OC-Nuovo-BootLoader) in Italian
- [macOS86.it](https://macos86.it/topic/1187-opencore-aka-oc-nuovo-bootloader/) in Italian
- [KVM-OpenCore](https://github.com/Leoyzen/KVM-Opencore) in English, KVM configuration
- [Reddit](https://www.reddit.com/r/hackintosh) in English
......@@ -101,7 +101,7 @@ Further discussion and community support for this driver is available at:
## Install to main firmware
For reading and writing to main firmware on the Mac Pro, @Macschrauber's [Rom Dump](https://youtu.be/yHnZeht_isU) works
For reading and writing to main firmware on the Mac Pro, @Macschrauber's [Rom Dump](https://github.com/Macschrauber/Macschrauber-s-Rom-Dump) works
well. Alternatively the kexts and executables which this uses can be sourced individually (or extracted from the Rom Dump app) and
run from the command line.
......
......@@ -123,7 +123,7 @@ VerifySignatureAndApfs (
}
if (ContextStatus == RETURN_VOLUME_CORRUPTED) {
DEBUG ((DEBUG_ERROR, "SIGN: Trying legacy fixup...\n", ContextStatus));
DEBUG ((DEBUG_ERROR, "SIGN: %r - Trying again using FixupAppleEfiImages quirk\n", ContextStatus));
ContextStatus = OcPeCoffFixupInitializeContext (
&Context,
Image,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册