Skip to content

Commit 7b0f569

Browse files
authored
Merge pull request #3732 from AkihiroSuda/fix-3639
Remove Kconfig and config.mk
2 parents 52a86b1 + 6272782 commit 7b0f569

File tree

3 files changed

+10
-82
lines changed

3 files changed

+10
-82
lines changed

Kconfig

Lines changed: 0 additions & 52 deletions
This file was deleted.

Makefile

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@ TAR ?= tar
99
ZIP ?= zip
1010
PLANTUML ?= plantuml # may also be "java -jar plantuml.jar" if installed elsewhere
1111

12-
# The KCONFIG programs are only needed for re-generating the ".config" file.
13-
# You can install the python "kconfiglib", if you don't have kconfig/kbuild.
14-
KCONFIG_CONF ?= $(shell command -v kconfig-conf || command -v kbuild-conf || echo oldconfig)
15-
KCONFIG_MCONF ?= $(shell command -v kconfig-mconf || command -v kbuild-mconf || echo menuconfig)
16-
1712
GOARCH ?= $(shell $(GO) env GOARCH)
1813
GOHOSTARCH := $(shell $(GO) env GOHOSTARCH)
1914
GOHOSTOS := $(shell $(GO) env GOHOSTOS)
@@ -95,7 +90,7 @@ help-targets:
9590
@echo '- helpers : Copy nerdctl.lima, apptainer.lima, docker.lima, podman.lima, and kubectl.lima'
9691
@echo
9792
@echo 'Targets for files in _output/share/lima/:'
98-
@echo '- guestagents : Build guestagents for archs enabled by CONFIG_GUESTAGENT_ARCH_*'
93+
@echo '- guestagents : Build guestagents'
9994
@echo '- native-guestagent : Build guestagent for native arch'
10095
@echo '- additional-guestagents : Build guestagents for archs other than native arch'
10196
@echo '- <arch>-guestagent : Build guestagent for <arch>: $(sort $(LINUX_GUESTAGENT_ARCHS))'
@@ -143,22 +138,15 @@ minimal: clean limactl native-guestagent default_template
143138
native: clean limactl helpers native-guestagent templates template_experimentals
144139

145140
################################################################################
146-
# Kconfig
147-
config: Kconfig
148-
$(warning Kconfig is deprecated since Lima v1.2 and will be removed in Lima v2.0.)
149-
$(KCONFIG_CONF) $<
150-
151-
menuconfig: Kconfig
152-
$(warning Kconfig is deprecated since Lima v1.2 and will be removed in Lima v2.0.)
153-
MENUCONFIG_STYLE=aquatic \
154-
$(KCONFIG_MCONF) $<
155-
156-
# Copy the default config, if not overridden locally
157-
# This is done to avoid a dependency on KCONFIG tools
158-
.config: config.mk
159-
cp $^ $@
160-
161-
-include .config
141+
# These configs were once customizable but should no longer be changed.
142+
CONFIG_GUESTAGENT_OS_LINUX=y
143+
CONFIG_GUESTAGENT_ARCH_X8664=y
144+
CONFIG_GUESTAGENT_ARCH_AARCH64=y
145+
CONFIG_GUESTAGENT_ARCH_ARMV7L=y
146+
CONFIG_GUESTAGENT_ARCH_PPC64LE=y
147+
CONFIG_GUESTAGENT_ARCH_RISCV64=y
148+
CONFIG_GUESTAGENT_ARCH_S390X=y
149+
CONFIG_GUESTAGENT_COMPRESS=y
162150

163151
################################################################################
164152
.PHONY: binaries

config.mk

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)