Skip to content

Commit d8a3c54

Browse files
authored
Copy rebuilt toolchain RPMs to rpm_cache folder (#445)
Rebuilt toolchain RPMs should be used in stead of downloading from repo
1 parent fae3f91 commit d8a3c54

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

toolkit/scripts/toolchain.mk

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ $(call create_folder,$(TOOLCHAIN_RPMS_DIR))
1414
toolchain_build_dir = $(BUILD_DIR)/toolchain
1515
toolchain_local_temp = $(toolchain_build_dir)/extract_dir
1616
toolchain_from_repos = $(toolchain_build_dir)/repo_rpms
17+
toolchain_build_rpms = $(BUILD_DIR)/toolchain_rpms
18+
rpmcache_build_dir = $(BUILD_DIR)/rpm_cache/cache
1719
toolchain_logs_dir = $(LOGS_DIR)/toolchain
1820
toolchain_downloads_logs_dir = $(toolchain_logs_dir)/downloads
1921
toolchain_rehydrate_logs_dir = $(toolchain_logs_dir)/rehydrate
@@ -47,7 +49,7 @@ $(call create_folder,$(toolchain_downloads_logs_dir))
4749
$(call create_folder,$(toolchain_from_repos))
4850
$(call create_folder,$(populated_toolchain_chroot))
4951
50-
.PHONY: raw-toolchain toolchain clean-toolchain clean-toolchain-containers check-manifests check-aarch64-manifests check-x86_64-manifests
52+
.PHONY: raw-toolchain prepare_rpmcache toolchain clean-toolchain clean-toolchain-containers check-manifests check-aarch64-manifests check-x86_64-manifests
5153
##help:target:raw-toolchain=Build the initial toolchain bootstrap stage.
5254
raw-toolchain: $(raw_toolchain)
5355
##help:target:toolchain=Ensure all toolchain RPMs are present.
@@ -298,7 +300,11 @@ $(toolchain_rpms): $(TOOLCHAIN_MANIFEST) $(STATUS_FLAGS_DIR)/toolchain_local_tem
298300

299301
# No archive was selected, so download from online package server instead. All packages must be available for this step to succeed.
300302
else
301-
$(toolchain_rpms): $(TOOLCHAIN_MANIFEST) $(STATUS_FLAGS_DIR)/toolchain_auto_cleanup.flag $(depend_REBUILD_TOOLCHAIN) $(go-downloader) $(SCRIPTS_DIR)/toolchain/download_toolchain_rpm.sh $(TOOLCHAIN_GPG_VALIDATION_KEYS)
303+
prepare_rpmcache:
304+
@echo "Preparing rpmcache copy toolchain RPMs to rpmcache $(rpmcache_build_dir)"
305+
@cp $(toolchain_build_rpms)/noarch/* $(rpmcache_build_dir) || true
306+
@cp $(toolchain_build_rpms)/x86_64/* $(rpmcache_build_dir) || true
307+
$(toolchain_rpms): prepare_rpmcache $(TOOLCHAIN_MANIFEST) $(STATUS_FLAGS_DIR)/toolchain_auto_cleanup.flag $(depend_REBUILD_TOOLCHAIN) $(go-downloader) $(SCRIPTS_DIR)/toolchain/download_toolchain_rpm.sh $(TOOLCHAIN_GPG_VALIDATION_KEYS)
302308
@log_file="$(toolchain_downloads_logs_dir)/$(notdir $@).log" && \
303309
rm -f "$$log_file" && \
304310
$(SCRIPTS_DIR)/toolchain/download_toolchain_rpm.sh \

0 commit comments

Comments
 (0)