This is an automated email from the ASF dual-hosted git repository.
ivila pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/incubator-teaclave-trustzone-sdk.git
The following commit(s) were added to refs/heads/main by this push:
new f49bd8f update optee-version
f49bd8f is described below
commit f49bd8f5787d930fe31ea1c0114dd19e416c2dd9
Author: ivila <[email protected]>
AuthorDate: Tue Jul 15 10:49:58 2025 +0800
update optee-version
* ci: remove needless ipv6 patch
* scripts: use optee 4.7.0
Signed-off-by: Zehui Chen <[email protected]>
Acked-by: Yuan Zhuang <[email protected]>
---
.github/workflows/reuse_build_test_qemu_image.yml | 20 ++++++++++-------
.patches/test_qemu/README.md | 13 ------------
.patches/test_qemu/optee-build_ipv6_support.patch | 26 -----------------------
build_optee_libraries.sh | 2 +-
optee-version.txt | 1 +
tests/setup.sh | 3 ++-
6 files changed, 16 insertions(+), 49 deletions(-)
diff --git a/.github/workflows/reuse_build_test_qemu_image.yml
b/.github/workflows/reuse_build_test_qemu_image.yml
index 57d115f..8fbb386 100644
--- a/.github/workflows/reuse_build_test_qemu_image.yml
+++ b/.github/workflows/reuse_build_test_qemu_image.yml
@@ -53,10 +53,6 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4
- - name: Get Output Name
- id: output_name
- run: echo "name=$(uname -m)-optee-qemuv8-ubuntu-24.04${{
inputs.expand-memory && '-expand-ta-memory' || ''}}" > $GITHUB_OUTPUT
-
- name: Install OP-TEE dependencies
run: |
./setup_optee_dependencies.sh
@@ -68,13 +64,21 @@ jobs:
repo init -u https://github.com/OP-TEE/manifest.git -m qemu_v8.xml &&
repo sync -j4 --no-clone-bundle
- - name: Apply patches for Disabling WatchDog Test
+ - name: Get Output Name
+ id: output_name
run: |
- (cd ${{ env.QEMUV8_BUILD_FOLDER }}/build && git apply
$GITHUB_WORKSPACE/.patches/test_qemu/optee-build_disable_wd_test.patch)
+ cd ${{ env.QEMUV8_BUILD_FOLDER }}/optee_os && \
+ OPTEE_TAG=optee-$(git tag -l | grep -E
'^v?[0-9]+\.[0-9]+\.[0-9]+$' | sort -V | tail -1)
+ OS_VERSION_TAG="ubuntu-24.04"
+ ARCH_TAG=$(uname -m)
+ SUFFIX_TAG=${{ inputs.expand-memory && '-expand-ta-memory' || '' }}
+ OUTPUT_NAME=$ARCH_TAG-$OPTEE_TAG-qemuv8-$OS_VERSION_TAG$SUFFIX_TAG
+
+ echo "name=$OUTPUT_NAME" > $GITHUB_OUTPUT
- - name: Apply patches for IPV6 support
+ - name: Apply patches for Disabling WatchDog Test
run: |
- (cd ${{ env.QEMUV8_BUILD_FOLDER }}/build && git apply
$GITHUB_WORKSPACE/.patches/test_qemu/optee-build_ipv6_support.patch)
+ (cd ${{ env.QEMUV8_BUILD_FOLDER }}/build && git apply
$GITHUB_WORKSPACE/.patches/test_qemu/optee-build_disable_wd_test.patch)
- name: Apply patches to expand memory
if: ${{ inputs.expand-memory == true }}
diff --git a/.patches/test_qemu/README.md b/.patches/test_qemu/README.md
index 8a49e93..8a3794f 100644
--- a/.patches/test_qemu/README.md
+++ b/.patches/test_qemu/README.md
@@ -13,19 +13,6 @@ Relevant Patch File:
1. optee-build_disable_wd_test.patch: Updates build configurations to disable
the watch dog test.
-## Patches for IPV6 Support
-
-The official QEMUv8 configuration in OP-TEE does not currently support IPv6,
-which is required for our IPv6 tests.
-
-We temporarily use a patch to enable IPv6 support.
-This patch can be removed once Issue
[#174](https://github.com/apache/incubator-teaclave-trustzone-sdk/issues/174)
-is resolved.
-
-Relevant Patch File:
-
-1. optee-build_ipv6_support.patch: Enables IPv6 support in the Linux kernel.
-
## Patches for Expand Memory
Some of our tests require more Trusted Application (TA) memory than the default
diff --git a/.patches/test_qemu/optee-build_ipv6_support.patch
b/.patches/test_qemu/optee-build_ipv6_support.patch
deleted file mode 100644
index ef0b5e6..0000000
--- a/.patches/test_qemu/optee-build_ipv6_support.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-diff --git a/kconfigs/qemu.conf b/kconfigs/qemu.conf
-index f8373ee..bd1d256 100644
---- a/kconfigs/qemu.conf
-+++ b/kconfigs/qemu.conf
-@@ -15,3 +15,4 @@ CONFIG_ENCRYPTED_KEYS=y
- CONFIG_ARM_FFA_TRANSPORT=y
- CONFIG_TCG_TPM=y
- CONFIG_TCG_FTPM_TEE=y
-+CONFIG_IPV6=y
diff --git a/build_optee_libraries.sh b/build_optee_libraries.sh
index 02fe68e..36c3c3a 100755
--- a/build_optee_libraries.sh
+++ b/build_optee_libraries.sh
@@ -19,7 +19,7 @@
set -e
-OPTEE_VERSION=4.6.0
+OPTEE_VERSION=$(cat ./optee-version.txt)
OPTEE_DIR=$1
# check arguments
diff --git a/optee-version.txt b/optee-version.txt
new file mode 100644
index 0000000..f6cdf40
--- /dev/null
+++ b/optee-version.txt
@@ -0,0 +1 @@
+4.7.0
diff --git a/tests/setup.sh b/tests/setup.sh
index 72598ac..34e938a 100755
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -21,9 +21,10 @@ set -xe
# Default value for NEED_EXPANDED_MEM
: ${NEED_EXPANDED_MEM:=false}
+OPTEE_TAG=optee-$(cat ../optee-version.txt)
# Define IMG_VERSION
-IMG_VERSION="$(uname -m)-optee-qemuv8-ubuntu-24.04"
+IMG_VERSION="$(uname -m)-$OPTEE_TAG-qemuv8-ubuntu-24.04"
# Set IMG based on NEED_EXPANDED_MEM
if [ "$NEED_EXPANDED_MEM" = true ]; then
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
