Skip to content

Commit

Permalink
efibuild: Switched ocbuild master branch to audk-stable-202302 and au…
Browse files Browse the repository at this point in the history
…dk master branch to audk-stable-202211
  • Loading branch information
MikhailKrichanov committed Jul 3, 2023
1 parent 2620958 commit 3357490
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion ci-bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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/audk-stable-202302/clang32-bootstrap.sh) && eval "$src" || exit 1
fi
fi

Expand Down
2 changes: 1 addition & 1 deletion clang32-bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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/audk-stable-202302/scripts/"
CLANG32_SCRIPTS=(
"fix-macho32"
"libtool32"
Expand Down
2 changes: 1 addition & 1 deletion codesign/appsign.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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/audk-stable-202302/codesign/certificate.p12" || abort "Failed to download certificates"

local pw
pw=$(uuidgen)
Expand Down
12 changes: 6 additions & 6 deletions efibuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,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/audk-stable-202302/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/audk-stable-202302/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
Expand All @@ -200,10 +200,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/audk-stable-202302/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/audk-stable-202302/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
Expand Down Expand Up @@ -374,13 +374,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 audk-stable-202211 || 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 origin/audk-stable-202211)

if [ "$DISCARD_PACKAGES" != "" ]; then
for package_to_discard in "${DISCARD_PACKAGES[@]}" ; do
Expand Down
6 changes: 3 additions & 3 deletions uncstrap/uncstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -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/audk-stable-202302/uncstrap/configs/' + UNC_CONF, timeout=5)
with open(UNC_CONF, 'wb') as conf:
conf.write(response.content)

Expand All @@ -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/audk-stable-202302/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/audk-stable-202302/external/' + real_filename, timeout=5)
with open(zip_name, 'wb') as archive:
archive.write(response.content)

Expand Down

0 comments on commit 3357490

Please sign in to comment.