Skip to content

Commit 6898a15

Browse files
committed
dynamic-cloud-kconfig.Makefile: Add individual provider make targets
Utilize the new command-line argument to generate_cloud_configs.py to enable users and scripts to generate only one provider's Kconfig menus. This appears to have been the intent for Lambda Labs, but was never implemented fully. Generated-by: Claude AI Signed-off-by: Chuck Lever <[email protected]>
1 parent 418ddf1 commit 6898a15

File tree

1 file changed

+29
-8
lines changed

1 file changed

+29
-8
lines changed

scripts/dynamic-cloud-kconfig.Makefile

Lines changed: 29 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,30 +12,51 @@ LAMBDALABS_KCONFIG_IMAGES := $(LAMBDALABS_KCONFIG_DIR)/Kconfig.images.generated
1212

1313
LAMBDALABS_KCONFIGS := $(LAMBDALABS_KCONFIG_COMPUTE) $(LAMBDALABS_KCONFIG_LOCATION) $(LAMBDALABS_KCONFIG_IMAGES)
1414

15-
# Add Lambda Labs generated files to mrproper clean list
16-
KDEVOPS_MRPROPER += $(LAMBDALABS_KCONFIGS)
15+
# AWS dynamic configuration
16+
AWS_KCONFIG_DIR := terraform/aws/kconfigs
17+
AWS_KCONFIG_AMI := $(AWS_KCONFIG_DIR)/Kconfig.ami
18+
AWS_KCONFIG_INSTANCE := $(AWS_KCONFIG_DIR)/Kconfig.instance
19+
AWS_KCONFIG_LOCATION := $(AWS_KCONFIG_DIR)/Kconfig.location
20+
21+
AWS_KCONFIGS := $(AWS_KCONFIG_AMI) $(AWS_KCONFIG_INSTANCE) $(AWS_KCONFIG_LOCATION)
22+
23+
# Add generated files to mrproper clean list
24+
KDEVOPS_MRPROPER += $(LAMBDALABS_KCONFIGS) $(AWS_KCONFIGS)
1725

1826
# Touch Lambda Labs generated files so Kconfig can source them
1927
# This ensures the files exist (even if empty) before Kconfig runs
2028
dynamic_lambdalabs_kconfig_touch:
2129
$(Q)touch $(LAMBDALABS_KCONFIGS)
2230

23-
DYNAMIC_KCONFIG += dynamic_lambdalabs_kconfig_touch
31+
# Touch AWS generated files so Kconfig can source them
32+
dynamic_aws_kconfig_touch:
33+
$(Q)touch $(AWS_KCONFIGS)
34+
35+
DYNAMIC_KCONFIG += dynamic_lambdalabs_kconfig_touch dynamic_aws_kconfig_touch
2436

25-
# Individual Lambda Labs targets are now handled by generate_cloud_configs.py
37+
# Lambda Labs targets use --provider argument for efficiency
2638
cloud-config-lambdalabs:
27-
$(Q)python3 scripts/generate_cloud_configs.py
39+
$(Q)python3 scripts/generate_cloud_configs.py --provider lambdalabs
40+
41+
# AWS targets use --provider argument for efficiency
42+
cloud-config-aws:
43+
$(Q)python3 scripts/generate_cloud_configs.py --provider aws
2844

2945
# Clean Lambda Labs generated files
3046
clean-cloud-config-lambdalabs:
3147
$(Q)rm -f $(LAMBDALABS_KCONFIGS)
3248

33-
DYNAMIC_CLOUD_KCONFIG += cloud-config-lambdalabs
49+
# Clean AWS generated files
50+
clean-cloud-config-aws:
51+
$(Q)rm -f $(AWS_KCONFIGS)
52+
53+
DYNAMIC_CLOUD_KCONFIG += cloud-config-lambdalabs cloud-config-aws
3454

3555
cloud-config-help:
3656
@echo "Cloud-specific dynamic kconfig targets:"
3757
@echo "cloud-config - generates all cloud provider dynamic kconfig content"
3858
@echo "cloud-config-lambdalabs - generates Lambda Labs dynamic kconfig content"
59+
@echo "cloud-config-aws - generates AWS dynamic kconfig content"
3960
@echo "clean-cloud-config - removes all generated cloud kconfig files"
4061
@echo "cloud-list-all - list all cloud instances for configured provider"
4162

@@ -44,11 +65,11 @@ HELP_TARGETS += cloud-config-help
4465
cloud-config:
4566
$(Q)python3 scripts/generate_cloud_configs.py
4667

47-
clean-cloud-config: clean-cloud-config-lambdalabs
68+
clean-cloud-config: clean-cloud-config-lambdalabs clean-cloud-config-aws
4869
$(Q)echo "Cleaned all cloud provider dynamic Kconfig files."
4970

5071
cloud-list-all:
5172
$(Q)chmod +x scripts/cloud_list_all.sh
5273
$(Q)scripts/cloud_list_all.sh
5374

54-
PHONY += cloud-config cloud-config-lambdalabs clean-cloud-config clean-cloud-config-lambdalabs cloud-config-help cloud-list-all
75+
PHONY += cloud-config cloud-config-lambdalabs cloud-config-aws clean-cloud-config clean-cloud-config-lambdalabs clean-cloud-config-aws cloud-config-help cloud-list-all

0 commit comments

Comments
 (0)