general cleanup

.gitignore

@@ -28,6 +28,7 @@ _testmain.go
 
 /deploy/iso/minikube-iso/board/minikube/x86_64/rootfs-overlay/usr/bin/auto-pause
 /deploy/iso/minikube-iso/board/minikube/aarch64/rootfs-overlay/usr/bin/auto-pause
+/deploy/iso/minikube-iso/Config.in
 /deploy/kicbase/auto-pause
 /deploy/addons/auto-pause/auto-pause-hook
 /out

Makefile

@@ -288,7 +288,7 @@ minikube-iso-arm64: minikube-iso-aarch64
 minikube-iso-%: deploy/iso/minikube-iso/board/minikube/%/rootfs-overlay/usr/bin/auto-pause # build minikube iso
 	echo $(ISO_VERSION) > deploy/iso/minikube-iso/board/minikube/$*/rootfs-overlay/etc/VERSION
 	echo $(shell git log --no-merges --pretty='format:%H %s' | head -1) >> deploy/iso/minikube-iso/board/minikube/$*/rootfs-overlay/etc/CHANGELOG
-	echo 'source "$$BR2_EXTERNAL_MINIKUBE_PATH/arch/$*/package/Config.in"' >> deploy/iso/minikube-iso/Config.in
+	cp deploy/iso/minikube-iso/arch/$*/Config.in.tmpl deploy/iso/minikube-iso/Config.in
 	if [ ! -d $(BUILD_DIR)/buildroot ]; then \
 		mkdir -p $(BUILD_DIR); \
 		git clone --depth=1 --branch=$(BUILDROOT_BRANCH) https://github.com/buildroot/buildroot $(BUILD_DIR)/buildroot; \

deploy/iso/minikube-iso/Config.in

@@ -1 +0,0 @@
-source "$BR2_EXTERNAL_MINIKUBE_PATH/package/Config.in"

deploy/iso/minikube-iso/arch/aarch64/Config.in.tmpl

@@ -0,0 +1,2 @@
+source "$BR2_EXTERNAL_MINIKUBE_PATH/package/Config.in"
+source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/Config.in" 

deploy/iso/minikube-iso/arch/x86_64/Config.in.tmpl

@@ -0,0 +1,2 @@
+source "$BR2_EXTERNAL_MINIKUBE_PATH/package/Config.in"
+source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/Config.in"

deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk

@@ -44,7 +44,7 @@ endef
 
 define DOCKER_BIN_INSTALL_INIT_SYSTEMD
 	$(INSTALL) -D -m 644 \
-		$(BR2_EXTERNAL)/package/docker-bin/docker.socket \
+		$(DOCKER_BIN_PKGDIR)/docker.socket \
 		$(TARGET_DIR)/usr/lib/systemd/system/docker.socket
 
 	$(INSTALL) -D -m 644 \