Matches ctl version to upstream

makefile

@@ -13,9 +13,9 @@ NXP_TAR       := $(PACKAGES_DIR)/$(NXP_VERSION).tar.gz
 CRIO_TAR      := $(PACKAGES_DIR)/$(CRIO_VERSION).tar.gz
 
 # Kubernetes components
-KUBELET_BIN := $(PACKAGES_DIR)/kubernetes/kubelet
-KUBEADM_BIN := $(PACKAGES_DIR)/kubernetes/kubeadm
-KUBECTL_BIN := $(PACKAGES_DIR)/kubernetes/kubectl
+KUBELET_BIN := $(PACKAGES_DIR)/kubernetes/kubelet-$(KUBE_VERSION)
+KUBEADM_BIN := $(PACKAGES_DIR)/kubernetes/kubeadm-$(KUBE_VERSION)
+KUBECTL_BIN := $(PACKAGES_DIR)/kubernetes/kubectl-$(KUBE_VERSION)
 
 CONFIGS_DIR          := configs
 SCRIPTS_DIR          := scripts
@@ -31,6 +31,7 @@ RELEASE_IMAGE := $(OUT_DIR)/monok8s-$(TAG).img.gz
 KERNEL_IMAGE  := $(OUT_DIR)/Image.gz
 
 BUILD_BASE_STAMP := $(OUT_DIR)/.build-base-$(TAG).stamp
+CLITOOLS_BIN := bin/ctl-linux-$(ARCH)-$(TAG)
 
 ALPINE_SERIES := $(word 1,$(subst ., ,$(ALPINE_VER))).$(word 2,$(subst ., ,$(ALPINE_VER)))
 
@@ -46,6 +47,8 @@ ALPINE_SRCS    := $(shell find alpine -type f 2>/dev/null)
 INITRAMFS_SRCS := $(shell find initramfs -type f 2>/dev/null)
 KERNEL_SRCS    := $(shell find kernel-build -type f 2>/dev/null)
 
+CLITOOLS_SRCS  := $(shell find clitools -type f 2>/dev/null)
+
 BUILD_BASE_DEPS := \
 	docker/build-base.Dockerfile \
 	build.env \
@@ -77,11 +80,15 @@ ITB_DEPS := \
 	build.env \
 	makefile
 
+CLITOOLS := \
+	$(CLITOOLS_SRCS)
+
 RELEASE_DEPS := \
 	$(BUILD_BASE_STAMP) \
 	$(BUILD_INFO_FILE) \
 	$(BOARD_ITB) \
 	$(ALPINE_TAR) \
+	$(CLITOOLS_BIN) \
 	$(CRIO_TAR) \
 	$(KUBELET_BIN) \
 	$(KUBEADM_BIN) \
@@ -91,12 +98,6 @@ RELEASE_DEPS := \
 	build.env \
 	makefile
 
-CLITOOLS := \
-	clitools/pkg \
-	clitools/cmd \
-	clitools/go.mod \
-	clitools/go.sum
-
 # ---- Directory creation ------------------------------------------------------
 
 $(PACKAGES_DIR):
@@ -174,6 +175,9 @@ $(INITRAMFS): $(INITRAMFS_DEPS) | $(OUT_DIR)
 		--output type=local,dest=./$(OUT_DIR) .
 	test -f $@
 
+$(CLITOOLS_BIN): $(CLITOOLS_SRCS)
+	$(MAKE) -C clitools
+
 $(BOARD_ITB): $(ITB_DEPS) | $(OUT_DIR)
 	docker build \
 		-f docker/itb.Dockerfile \
@@ -191,6 +195,7 @@ $(RELEASE_IMAGE): $(RELEASE_DEPS) | $(OUT_DIR)
 		--build-arg TAG=$(TAG) \
 		--build-arg ALPINE_ARCH=$(ALPINE_ARCH) \
 		--build-arg ALPINE_VER=$(ALPINE_VER) \
+		--build-arg KUBE_VERSION=$(KUBE_VERSION) \
 		--build-arg CRIO_VERSION=$(CRIO_VERSION) \
 		--build-arg DEVICE_TREE_TARGET=$(DEVICE_TREE_TARGET) \
 		-t $(DOCKER_IMAGE_ROOT)/buildenv-alpine:$(TAG) .
@@ -263,9 +268,7 @@ kernel: $(KERNEL_IMAGE)
 initramfs: $(INITRAMFS)
 itb: $(BOARD_ITB)
 build-base: $(BUILD_BASE_STAMP)
-
-clitools: $(CLITOOLS)
-	$(MAKE) -C clitools
+clitools: $(CLITOOLS_BIN)
 
 clean:
 	rm -f \
@@ -274,7 +277,7 @@ clean:
 		$(INITRAMFS) \
 		$(BOARD_ITB) \
 		$(RELEASE_IMAGE) \
-		$(CLITOOLS)
+		$(CLITOOLS_BIN)
 
 distclean: clean
 	rm -rf $(OUT_DIR)