Fixed incorrect naming

This commit is contained in:
2026-05-01 17:57:17 +08:00
parent 682f42d62d
commit 1cf6e5a55c
3 changed files with 105 additions and 12 deletions

View File

@@ -19,9 +19,9 @@ CRIO_TAR := $(PACKAGES_DIR)/$(CRIO_VERSION).tar.gz
# ASK-specific
MONO_ASK_TAR := $(PACKAGES_DIR)/ask/$(MONO_ASK_VERSION).tar.gz
LIBNFNETLINK_TAR := $(PACKAGES_DIR)/ask/libnfnetlink/libnfnetlink-$(LIBNFNETLINK_VERSION).tar.bz2
LIBNFCT_TAR := $(PACKAGES_DIR)/ask/libnetfilter/libnetfilter_conntrack-$(LIBNFCT_VERSION).tar.xz
LIBCLI_TAR := $(PACKAGES_DIR)/ask/libcli/libcli-$(LIBCLI_VERSION).tar.gz
LIBNFNETLINK_TAR := $(PACKAGES_DIR)/ask/libnfnetlink/$(LIBNFNETLINK_VERSION).tar.bz2
LIBNFCT_TAR := $(PACKAGES_DIR)/ask/libnfct/$(LIBNFCT_VERSION).tar.xz
LIBCLI_TAR := $(PACKAGES_DIR)/ask/libcli/$(LIBCLI_VERSION).tar.gz
# Kubernetes components
KUBELET_BIN := $(PACKAGES_DIR)/kubernetes/kubelet-$(KUBE_VERSION)
@@ -193,6 +193,30 @@ $(INITRAMFS): $(INITRAMFS_DEPS) $(DOWNLOAD_PACKAGES_STAMP) | $(OUT_DIR)
$(CLITOOLS_BIN): $(CLITOOLS_SRCS)
$(MAKE) -C clitools build-local VERSION="$(TAG)"
ASK: $(ASK_TAR) $(LIBNFCT_TAR) $(LIBNFNETLINK_TAR) | $(OUT_DIR)
@echo "Building NXP ASK components and Kernel..."
rm -rf "$(OUT_DIR)/ASK"
mkdir -p "$(OUT_DIR)/ASK"
@build_base_tag=$$(docker image inspect \
--format '{{.Id}}' \
$(DOCKER_IMAGE_ROOT)/build-base:$(TAG) \
| cut -d':' -f2 \
| cut -c -8); \
docker build \
-f docker/ask.Dockerfile \
--platform linux/amd64 \
--build-arg DOCKER_IMAGE_ROOT=$(DOCKER_IMAGE_ROOT) \
--build-arg BUILD_BASE_TAG=$$build_base_tag \
--build-arg MONO_ASK_TAR=$(MONO_ASK_TAR) \
--build-arg NXP_TAR=$(NXP_TAR) \
--build-arg LIBNFNETLINK_TAR=$(LIBNFNETLINK_TAR) \
--build-arg LIBNFCT_TAR=$(LIBNFCT_TAR) \
--build-arg MONO_ASK_VERSION=$(MONO_ASK_VERSION) \
--build-arg NXP_VERSION=$(NXP_VERSION) \
--build-arg LIBNFNETLINK_VERSION=$(LIBNFNETLINK_VERSION) \
--build-arg LIBNFCT_VERSION=$(LIBNFCT_VERSION) \
--output type=local,dest=./$(OUT_DIR)/ASK .
vpp: $(BUILD_BASE_STAMP) $(VPP_TAR) $(DPDK_TAR) $(FMLIB_TAR) $(FMC_TAR) $(NXP_TAR)
@build_base_tag=$$(docker image inspect \
--format '{{.Id}}' \