Branch to support build of OpenCorePkg 0.8.7

acidanthera · Apr 13, 2024 · 12256e7 · 12256e7
1 parent f84a7f4
commit 12256e7
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 19 deletions.
diff --git a/.github/workflows/build_uncrustify.yml b/.github/workflows/build_uncrustify.yml
@@ -25,7 +25,7 @@ jobs:
 
       - name: CI Bootstrap
         run: |
-          src=$(/usr/bin/curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/master/ci-bootstrap.sh) && eval "$src" || exit 1
+          src=$(/usr/bin/curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/build-0.8.7/ci-bootstrap.sh) && eval "$src" || exit 1
 
       - name: Build Uncrustify
         run: |
@@ -53,7 +53,7 @@ jobs:
 
       - name: CI Bootstrap
         run: |
-          src=$(/usr/bin/curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/master/ci-bootstrap.sh) && eval "$src" || exit 1
+          src=$(/usr/bin/curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/build-0.8.7/ci-bootstrap.sh) && eval "$src" || exit 1
 
       - name: Build Uncrustify
         run: |
@@ -83,7 +83,7 @@ jobs:
 
       - name: CI Bootstrap
         run: |
-          src=$(curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/master/ci-bootstrap.sh) && eval "$src" || exit 1
+          src=$(curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/build-0.8.7/ci-bootstrap.sh) && eval "$src" || exit 1
 
       - name: Build Uncrustify
         run: |

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 ocbuild
 =======
 
-[![Build Status](https://github.com/acidanthera/ocbuild/workflows/CI/badge.svg?branch=master)](https://github.com/acidanthera/ocbuild/actions)
+[![Build Status](https://github.com/acidanthera/ocbuild/workflows/CI/badge.svg?branch=build-0.8.7)](https://github.com/acidanthera/ocbuild/actions)
 
 Buildscripts and tools for various packages used in [Acidanthera](https://github.com/acidanthera).
diff --git a/ci-bootstrap.sh b/ci-bootstrap.sh
@@ -66,7 +66,7 @@ if [ "$(unamer)" = "Darwin" ]; then
   if [ -n "${ACID32}" ]; then
     echo "OVERRIDE_PYTHON3=${DEVELOPER_DIR}/usr/bin/python3" >> "$GITHUB_ENV"
     export OVERRIDE_PYTHON3="${DEVELOPER_DIR}/usr/bin/python3"
-    src=$(curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/master/clang32-bootstrap.sh) && eval "$src" || exit 1
+    src=$(curl -Lfs https://raw.githubusercontent.com/acidanthera/ocbuild/build-0.8.7/clang32-bootstrap.sh) && eval "$src" || exit 1
   fi
 fi
 

diff --git a/clang32-bootstrap.sh b/clang32-bootstrap.sh
@@ -21,7 +21,7 @@ fi
 
 CLANG32_DIR="clang32"
 
-CLANG32_SCRIPTS_URL="https://raw.githubusercontent.com/acidanthera/ocbuild/master/scripts/"
+CLANG32_SCRIPTS_URL="https://raw.githubusercontent.com/acidanthera/ocbuild/build-0.8.7/scripts/"
 CLANG32_SCRIPTS=(
   "fix-macho32"
   "libtool32"

diff --git a/codesign/appsign.sh b/codesign/appsign.sh
@@ -33,7 +33,7 @@ downloadcert() {
     abort "Unable to find macOS certificate password" "Set MAC_CERTIFICATE_PASSWORD environment variable"
   fi
 
-  curl -OL "https://github.com/acidanthera/ocbuild/raw/master/codesign/certificate.p12" || abort "Failed to download certificates"
+  curl -OL "https://github.com/acidanthera/ocbuild/raw/build-0.8.7/codesign/certificate.p12" || abort "Failed to download certificates"
 
   local pw
   pw=$(uuidgen)

diff --git a/efibuild.sh b/efibuild.sh
@@ -167,10 +167,10 @@ if [ "$(nasm -v)" = "" ] || [ "$(nasm -v | grep Apple)" != "" ]; then
   fi
   pushd /tmp >/dev/null || exit 1
   rm -rf nasm-mac64.zip
-  curl -OL "https://github.com/acidanthera/ocbuild/raw/master/external/nasm-mac64.zip" || exit 1
+  curl -OL "https://github.com/acidanthera/ocbuild/raw/build-0.8.7/external/nasm-mac64.zip" || exit 1
   nasmzip=$(cat nasm-mac64.zip)
   rm -rf nasm-*
-  curl -OL "https://github.com/acidanthera/ocbuild/raw/master/external/${nasmzip}" || exit 1
+  curl -OL "https://github.com/acidanthera/ocbuild/raw/build-0.8.7/external/${nasmzip}" || exit 1
   unzip -q "${nasmzip}" nasm*/nasm nasm*/ndisasm || exit 1
   sudo mkdir -p /usr/local/bin || exit 1
   sudo mv nasm*/nasm /usr/local/bin/ || exit 1
@@ -190,10 +190,10 @@ if [ "$(iasl -v)" = "" ]; then
   fi
   pushd /tmp >/dev/null || exit 1
   rm -rf iasl-macosx.zip
-  curl -OL "https://github.com/acidanthera/ocbuild/raw/master/external/iasl-macosx.zip" || exit 1
+  curl -OL "https://github.com/acidanthera/ocbuild/raw/build-0.8.7/external/iasl-macosx.zip" || exit 1
   iaslzip=$(cat iasl-macosx.zip)
   rm -rf iasl
-  curl -OL "https://github.com/acidanthera/ocbuild/raw/master/external/${iaslzip}" || exit 1
+  curl -OL "https://github.com/acidanthera/ocbuild/raw/build-0.8.7/external/${iaslzip}" || exit 1
   unzip -q "${iaslzip}" iasl || exit 1
   sudo mkdir -p /usr/local/bin || exit 1
   sudo mv iasl /usr/local/bin/ || exit 1
@@ -202,7 +202,7 @@ if [ "$(iasl -v)" = "" ]; then
 fi
 
 if [ "${MTOC_HASH}" = "" ]; then
-  MTOC_HASH=$(curl -L "https://github.com/acidanthera/ocbuild/raw/master/external/mtoc-mac64.sha256") || exit 1
+  MTOC_HASH=$(curl -L "https://github.com/acidanthera/ocbuild/raw/build-0.8.7/external/mtoc-mac64.sha256") || exit 1
 fi
 
 if [ "${MTOC_HASH}" = "" ]; then
@@ -243,10 +243,10 @@ if ! $valid_mtoc; then
   prompt "Install prebuilt mtoc automatically?"
   pushd /tmp >/dev/null || exit 1
   rm -f mtoc mtoc-mac64.zip
-  curl -OL "https://github.com/acidanthera/ocbuild/raw/master/external/mtoc-mac64.zip" || exit 1
+  curl -OL "https://github.com/acidanthera/ocbuild/raw/build-0.8.7/external/mtoc-mac64.zip" || exit 1
   mtoczip=$(cat mtoc-mac64.zip)
   rm -rf mtoc-*
-  curl -OL "https://github.com/acidanthera/ocbuild/raw/master/external/${mtoczip}" || exit 1
+  curl -OL "https://github.com/acidanthera/ocbuild/raw/build-0.8.7/external/${mtoczip}" || exit 1
   unzip -q "${mtoczip}" mtoc || exit 1
   sudo mkdir -p /usr/local/bin || exit 1
   sudo rm -f /usr/local/bin/mtoc /usr/local/bin/mtoc.NEW || exit 1
@@ -346,13 +346,13 @@ fi
 
 if [ "$NEW_BUILDSYSTEM" != "1" ]; then
   if [ "$OFFLINE_MODE" != "1" ]; then
-    updaterepo "https://github.com/acidanthera/audk" UDK master || exit 1
+    updaterepo "https://github.com/acidanthera/audk" UDK build-0.8.7 || exit 1
   else
     echo "Working in offline mode. Skip UDK update"
   fi
 fi
 cd UDK || exit 1
-HASH=$(git rev-parse origin/master)
+HASH=$(git rev-parse '@{upstream}')
 
 if [ "$NEW_BUILDSYSTEM" != "1" ]; then
   if [ -d ../Patches ]; then

diff --git a/uncstrap/uncstrap.py b/uncstrap/uncstrap.py
@@ -127,7 +127,7 @@ def build_uncrustify(url):
 
 
 def download_uncrustify_conf():
-    response = requests.get('https://raw.githubusercontent.com/acidanthera/ocbuild/master/uncstrap/configs/' + UNC_CONF, timeout=5)
+    response = requests.get('https://raw.githubusercontent.com/acidanthera/ocbuild/build-0.8.7/uncstrap/configs/' + UNC_CONF, timeout=5)
     with open(UNC_CONF, 'wb') as conf:
         conf.write(response.content)
 
@@ -137,10 +137,10 @@ def download_uncrustify_bin():
     if os.path.isfile(zip_name):
         os.remove(zip_name)
 
-    response = requests.get('https://raw.githubusercontent.com/acidanthera/ocbuild/master/external/' + zip_name, timeout=5)
+    response = requests.get('https://raw.githubusercontent.com/acidanthera/ocbuild/build-0.8.7/external/' + zip_name, timeout=5)
     real_filename = response.text
 
-    response = requests.get('https://raw.githubusercontent.com/acidanthera/ocbuild/master/external/' + real_filename, timeout=5)
+    response = requests.get('https://raw.githubusercontent.com/acidanthera/ocbuild/build-0.8.7/external/' + real_filename, timeout=5)
     with open(zip_name, 'wb') as archive:
         archive.write(response.content)