Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions examples/tutorials/edk2-simics-platform/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@ RUN git clone https://github.com/tianocore/edk2.git && \
git clone https://github.com/tianocore/edk2-non-osi.git && \
git clone https://github.com/IntelFsp/FSP.git

ARG EDK2_HASH="eccdab6"
ARG EDK2_PLATFORMS_HASH="f446fff"
ARG EDK2_HASH="edk2-stable202505"
ARG EDK2_PLATFORMS_HASH="51c7f2948adeb8b6dc4db6a8f1ada8a1b4e5528e"
ARG EDK2_NON_OSI_HASH="1f4d784"
ARG INTEL_FSP_HASH="8beacd5"

RUN git -C edk2 checkout "${EDK2_HASH}" && \
git -C edk2 submodule update --init && \
git -C edk2 submodule update --init --depth 1 && \
git -C edk2-platforms checkout "${EDK2_PLATFORMS_HASH}" && \
git -C edk2-platforms submodule update --init && \
git -C edk2-platforms submodule update --init --depth 1 && \
git -C edk2-non-osi checkout "${EDK2_NON_OSI_HASH}" && \
git -C edk2-non-osi submodule update --init && \
git -C edk2-non-osi submodule update --init --depth 1 && \
git -C FSP checkout "${INTEL_FSP_HASH}" && \
git -C FSP submodule update --init
git -C FSP submodule update --init --depth 1

ENV EDK_TOOLS_PATH="${PROJECT}/edk2/BaseTools/"
ENV PACKAGES_PATH="${PROJECT}/edk2:${PROJECT}/edk2-platforms:${PROJECT}/edk2-non-osi"
Expand Down
12 changes: 6 additions & 6 deletions examples/tutorials/edk2-simics-platform/build-custom.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,26 @@ IMAGE_NAME="edk2-simics"
DOCKERFILE="${SCRIPT_DIR}/Dockerfile-custom"
CONTAINER_UID=$(echo "${RANDOM}" | sha256sum | head -c 8)
CONTAINER_NAME="${IMAGE_NAME}-tmp-${CONTAINER_UID}"
EDK2_HASH="eccdab6"
EDK2_PLATFORMS_HASH="f446fff"
EDK2_HASH="edk2-stable202505"
EDK2_PLATFORMS_HASH="51c7f2948adeb8b6dc4db6a8f1ada8a1b4e5528e"
EDK2_NON_OSI_HASH="1f4d784"
INTEL_FSP_HASH="8beacd5"

if [ ! -d "${SCRIPT_DIR}/workspace" ]; then
mkdir -p "${SCRIPT_DIR}/workspace"
git clone https://github.com/tianocore/edk2.git "${SCRIPT_DIR}/workspace/edk2"
git -C "${SCRIPT_DIR}/workspace/edk2" checkout "${EDK2_HASH}"
git -C "${SCRIPT_DIR}/workspace/edk2" submodule update --init
git -C "${SCRIPT_DIR}/workspace/edk2" submodule update --init --depth 1
git clone https://github.com/tianocore/edk2-platforms.git "${SCRIPT_DIR}/workspace/edk2-platforms"
git -C "${SCRIPT_DIR}/workspace/edk2-platforms" checkout "${EDK2_PLATFORMS_HASH}"
git -C "${SCRIPT_DIR}/workspace/edk2-platforms" submodule update --init
git -C "${SCRIPT_DIR}/workspace/edk2-platforms" submodule update --init --depth 1
cp "${SCRIPT_DIR}/../../../harness/tsffs.h" "${SCRIPT_DIR}/workspace/edk2-platforms/Platform/Intel/SimicsOpenBoardPkg/Library/DxeLogoLib/tsffs.h"
git clone https://github.com/tianocore/edk2-non-osi.git "${SCRIPT_DIR}/workspace/edk2-non-osi"
git -C "${SCRIPT_DIR}/workspace/edk2-non-osi" checkout "${EDK2_NON_OSI_HASH}"
git -C "${SCRIPT_DIR}/workspace/edk2-non-osi" submodule update --init
git -C "${SCRIPT_DIR}/workspace/edk2-non-osi" submodule update --init --depth 1
git clone https://github.com/IntelFsp/FSP.git "${SCRIPT_DIR}/workspace/FSP"
git -C "${SCRIPT_DIR}/workspace/FSP" checkout "${INTEL_FSP_HASH}"
git -C "${SCRIPT_DIR}/workspace/FSP" submodule update --init
git -C "${SCRIPT_DIR}/workspace/FSP" submodule update --init --depth 1
fi

docker build -t "${IMAGE_NAME}" -f "${DOCKERFILE}" "${SCRIPT_DIR}"
Expand Down
2 changes: 2 additions & 0 deletions examples/tutorials/edk2-simics-platform/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
# Copyright (C) 2024 Intel Corporation
# SPDX-License-Identifier: Apache-2.0

set -e

SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
IMAGE_NAME="edk2-simics-platform"
DOCKERFILE="${SCRIPT_DIR}/Dockerfile"
Expand Down
2 changes: 1 addition & 1 deletion examples/tutorials/edk2-uefi/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ENV DEBIAN_FRONTEND=noninteractive
SHELL ["/bin/bash", "-o", "pipefail", "-c"]

ENV EDK2_REPO_URL "https://github.com/tianocore/edk2.git"
ENV EDK2_REPO_HASH "d189de3b0a2f44f4c9b87ed120be16569ea19b51"
ENV EDK2_REPO_HASH "edk2-stable202505"
ENV EDK2_PATH "/edk2"


Expand Down
1 change: 1 addition & 0 deletions examples/tutorials/edk2-uefi/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# Copyright (C) 2024 Intel Corporation
# SPDX-License-Identifier: Apache-2.0

set -e

SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
IMAGE_NAME="tsffs-tutorial-edk2-uefi"
Expand Down
2 changes: 2 additions & 0 deletions examples/tutorials/risc-v-kernel/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
# Copyright (C) 2024 Intel Corporation
# SPDX-License-Identifier: Apache-2.0

set -e

SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
IMAGE_NAME="tsffs-tutorial-riscv64-kernel-module"
CONTAINER_UID=$(echo "${RANDOM}" | sha256sum | head -c 8)
Expand Down
Loading