From 470dd78b28df12a5e5e120b38b5cc4cc10f37f1e Mon Sep 17 00:00:00 2001 From: yaymalaga Date: Wed, 18 Oct 2023 14:53:36 +0200 Subject: [PATCH] Include submodules when using vcs import If the ENABLE_RECURSIVE_VCS_IMPORT flag is set to false, then the repository set in .repos is not recursively imported, which is necessary when working with submodules. --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 92e8f21..ea79fa3 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -66,7 +66,7 @@ ARG ENABLE_RECURSIVE_VCS_IMPORT="true" RUN if [[ $ENABLE_RECURSIVE_VCS_IMPORT == 'true' ]]; then \ /usr/local/bin/recursive_vcs_import.py src src/upstream ; \ else \ - [[ -f src/target/${VCS_IMPORT_FILE} ]] && vcs import src/upstream < src/target/${VCS_IMPORT_FILE} ; \ + [[ -f src/target/${VCS_IMPORT_FILE} ]] && vcs import --recursive src/upstream < src/target/${VCS_IMPORT_FILE} ; \ fi # remove blacklisted packages from workspace