Skip to content

Commit 3ee6fda

Browse files
gpouliosAlan C. Assis
authored andcommitted
tee/libteec: Remove downloaded zip file on distclean
Initially, leaving the .zip around seemed like a good idea to avoid re-downloading often. But it turns out deleting downloaded packages during distclean is standard practice and some CI scripts depend on the git local copy being clean, including ignored files. Change also CMakeLists.txt to download the zip instead of the tarball. Signed-off-by: George Poulios <[email protected]>
1 parent 7506c02 commit 3ee6fda

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

tee/libteec/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,11 @@ if(CONFIG_LIBTEEC)
2424
set(OPTEE_CLIENT_DIR ${CMAKE_CURRENT_LIST_DIR}/optee_client)
2525

2626
if(NOT EXISTS ${OPTEE_CLIENT_DIR})
27+
set(OPTEE_CLIENT_URL https://github.com/OP-TEE/optee_client/archive/refs/tags)
28+
set(OPTEE_CLIENT_VER ${CONFIG_LIBTEEC_VERSION})
2729
FetchContent_Declare(
2830
optee_client_fetch
29-
URL https://github.com/OP-TEE/optee_client/archive/refs/tags/${CONFIG_LIBTEEC_VERSION}.tar.gz
31+
URL ${OPTEE_CLIENT_URL}/${OPTEE_CLIENT_VER}.zip
3032
SOURCE_DIR
3133
${OPTEE_CLIENT_DIR}
3234
BINARY_DIR

tee/libteec/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ ifeq ($(wildcard $(LIBTEEC_UNPACKNAME)/.git),)
4646
context:: $(LIBTEEC_UNPACKNAME)
4747

4848
distclean::
49-
$(Q) rm -rf $(LIBTEEC_UNPACKNAME)
49+
$(call DELDIR, $(LIBTEEC_UNPACKNAME))
50+
$(call DELFILE, $(LIBTEEC_ZIP))
5051
endif
5152

5253
include $(APPDIR)/Application.mk

0 commit comments

Comments
 (0)