Skip to content

Commit db9a27c

Browse files
authored
Toolkit: Fix readdirent toolchain errors for reusable chroots (#10222)
1 parent 9db64ba commit db9a27c

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

toolkit/scripts/toolchain.mk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,11 @@ clean-toolchain-rpms:
8989
9090
# We need to clear the toolchain if we are using a daily build, or we change validation state. The filenames will all be
9191
# the same, but the actual .rpm files may be fundamentally different.
92+
# We leave the directory structure in place since docker based builds using re-usable chroots will have mounted the
93+
# toolchain subdirectories into the chroots. Removing the directories would break the mounts.
9294
$(STATUS_FLAGS_DIR)/toolchain_auto_cleanup.flag: $(STATUS_FLAGS_DIR)/daily_build_id.flag $(depend_VALIDATE_TOOLCHAIN_GPG)
9395
@echo "Daily build ID or validation mode changed, sanitizing toolchain"
94-
rm -rf $(TOOLCHAIN_RPMS_DIR)
96+
find $(TOOLCHAIN_RPMS_DIR) -type f -name '*.rpm' -exec rm -f {} +
9597
touch $@
9698
9799
copy-toolchain-rpms:

0 commit comments

Comments
 (0)