preload tclap and xml2

build.env

@@ -17,6 +17,9 @@ MONO_ASK_VERSION=mt-$(LINUX_FACTORY)
 LIBNFNETLINK_VERSION=1.0.2
 LIBNFCT_VERSION=1.1.0
 LIBCLI_VERSION=1.10.7
+# Check the package version for Debian trixies (what ASK uses)
+LIBXML2_VERSION=2.11.7
+TCLAP_VERSION=1.2.5
 
 CRIO_VERSION=cri-o.arm64.v1.35.2
 KUBE_VERSION=v1.35.3

docker/ask.Dockerfile

@@ -25,27 +25,29 @@ ARG LIBNFNETLINK_TAR
 ARG LIBNFCT_TAR
 ARG FMLIB_TAR
 ARG FMC_TAR
+ARG LIBXML2_TAR
+ARG TCLAP_TAR
 
-ARG NXP_VERSION
-ARG MONO_ASK_VERSION
+# ASK's version pins (hardcoded wget)
 ARG LIBNFNETLINK_VERSION
 ARG LIBNFCT_VERSION
-ARG FMLIB_VERSION
-ARG FMC_VERSION
 
 # Linux kernel
-COPY "${NXP_TAR}" ./kernel.tar.gz
+COPY "${NXP_TAR}"          ./kernel.tar.gz
 
 # Copy the ASK and Netfilter tarballs 
-COPY "${MONO_ASK_TAR}" .
+COPY "${MONO_ASK_TAR}"     ./mono-ask.tar.gz
+COPY "${FMC_TAR}"          ./fmc.tar.gz
+COPY "${FMLIB_TAR}"        ./fmlib.tar.gz
+COPY "${LIBXML2_TAR}"      ./libxml2.tar.xz
+COPY "${TCLAP_TAR}"        ./tclap.tar.gz
+# Pinned version should keep version names
 COPY "${LIBNFNETLINK_TAR}" ./libnfnetlink-${LIBNFNETLINK_VERSION}.tar.bz2
 COPY "${LIBNFCT_TAR}" ./libnetfilter_conntrack-${LIBNFCT_VERSION}.tar.xz
-COPY "${FMC_TAR}" ./fmc.tar.gz
-COPY "${FMLIB_TAR}" ./fmlib.tar.gz
 
 # Extract ASK and place Netfilter dependencies where the Makefile expects them
 RUN mkdir -p ASK/sources/tarballs && \
-    tar zxf "${MONO_ASK_VERSION}.tar.gz" -C "ASK" --strip-components=1 && \
+    tar zxf "mono-ask.tar.gz" -C "ASK" --strip-components=1 && \
     mv libnfnetlink-${LIBNFNETLINK_VERSION}.tar.bz2 ASK/sources/tarballs/ && \
     mv libnetfilter_conntrack-${LIBNFCT_VERSION}.tar.xz ASK/sources/tarballs/
 
@@ -57,6 +59,18 @@ RUN mkdir -p ASK/sources/fmc && \
     tar zxf "fmc.tar.gz" -C "ASK/sources/fmc" --strip-components=1 && \
     tar zxf "fmlib.tar.gz" -C "ASK/sources/fmlib" --strip-components=1
 
+RUN mkdir -p tclap && tar zxf "tclap.tar.gz" -C "tclap" --strip-components=1 && \
+    cp -r tclap/include/tclap /opt/aarch64-linux-musl-cross/aarch64-linux-musl/include/ && \
+    rm -rf tclap
+
+RUN mkdir -p libxml2 && tar xf "libxml2.tar.xz" -C "libxml2" --strip-components=1 && \
+    cd libxml2 && \
+    CC=aarch64-linux-musl-gcc ./configure --host=aarch64-linux-musl \
+        --prefix=/opt/aarch64-linux-musl-cross/aarch64-linux-musl \
+        --enable-static --disable-shared --without-python --without-zlib --without-lzma && \
+    make -j$(nproc) && make install && \
+    cd .. && rm -rf libxml2
+
 WORKDIR /src/ASK
 
 COPY patches/mono-ask.mk .

docker/download-packages.Dockerfile

@@ -91,6 +91,20 @@ WORKDIR /out/ask/libnfct
 RUN curl -fL --retry 3 -o "${LIBNFCT_VERSION}.tar.xz" \
     "https://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-${LIBNFCT_VERSION}.tar.xz"
 
+# ---- tclap ----
+FROM base AS tclap
+ARG TCLAP_VERSION
+WORKDIR /out/ask/tclap
+RUN curl -fL --retry 3 -o "${TCLAP_VERSION}.tar.gz" \
+    "https://sourceforge.net/projects/tclap/files/tclap-${TCLAP_VERSION}.tar.gz"
+
+# ---- libxml2 ----
+FROM base AS libxml2
+ARG LIBXML2_VERSION
+WORKDIR /out/ask/libxml2
+RUN curl -fL --retry 3 -o "${LIBXML2_VERSION}.tar.xz" \
+    "https://download.gnome.org/sources/libxml2/2.12/libxml2-${LIBXML2_VERSION}.tar.xz"
+
 # ---- libcli ----
 FROM base AS libcli
 ARG LIBCLI_VERSION
@@ -136,6 +150,8 @@ COPY --from=vpp /out/ /
 COPY --from=libnfnetlink /out/ /
 COPY --from=libnfct /out/ /
 COPY --from=libcli /out/ /
+COPY --from=libxml2 /out/ /
+COPY --from=tclap /out/ /
 COPY --from=alpine_rootfs /out/ /
 COPY --from=nxp_linux /out/ /
 COPY --from=crio /out/ /

makefile

@@ -22,6 +22,8 @@ FMC_TAR          := $(PACKAGES_DIR)/nxp/fmc/$(FMC_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
+TCLAP_TAR        := $(PACKAGES_DIR)/ask/tclap/$(TCLAP_VERSION).tar.gz
+LIBXML2_TAR      := $(PACKAGES_DIR)/ask/libxml2/$(LIBXML2_VERSION).tar.xz
 
 # Kubernetes components
 KUBELET_BIN := $(PACKAGES_DIR)/kubernetes/kubelet-$(KUBE_VERSION)
@@ -133,6 +135,8 @@ $(DOWNLOAD_PACKAGES_STAMP): docker/download-packages.Dockerfile build.env makefi
 		--build-arg LIBNFNETLINK_VERSION=$(LIBNFNETLINK_VERSION) \
 		--build-arg LIBNFCT_VERSION=$(LIBNFCT_VERSION) \
 		--build-arg LIBCLI_VERSION=$(LIBCLI_VERSION) \
+		--build-arg LIBXML2_VERSION=$(LIBXML2_VERSION) \
+		--build-arg TCLAP_VERSION=$(TCLAP_VERSION) \
 		--build-arg ALPINE_SERIES=$(ALPINE_SERIES) \
 		--build-arg ALPINE_ARCH=$(ALPINE_ARCH) \
 		--build-arg ALPINE_VER=$(ALPINE_VER) \
@@ -193,7 +197,7 @@ $(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)
+ASK: $(ASK_TAR) $(LIBNFCT_TAR) $(LIBNFNETLINK_TAR) $(TCLAP_TAR) $(LIBXML2_TAR) | $(OUT_DIR)
 	@echo "Building NXP ASK components and Kernel..."
 	rm -rf "$(OUT_DIR)/ASK"
 	mkdir -p "$(OUT_DIR)/ASK"
@@ -210,13 +214,11 @@ ASK: $(ASK_TAR) $(LIBNFCT_TAR) $(LIBNFNETLINK_TAR) | $(OUT_DIR)
 		--build-arg MONO_ASK_TAR=$(MONO_ASK_TAR) \
 		--build-arg NXP_TAR=$(NXP_TAR) \
 		--build-arg FMLIB_TAR=$(FMLIB_TAR) \
-		--build-arg FMLIB_VERSION=$(FMLIB_VERSION) \
 		--build-arg FMC_TAR=$(FMC_TAR) \
-		--build-arg FMC_VERSION=$(FMC_VERSION) \
 		--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 LIBXML2_TAR=$(LIBXML2_TAR) \
+		--build-arg TCLAP_TAR=$(TCLAP_TAR) \
 		--build-arg LIBNFNETLINK_VERSION=$(LIBNFNETLINK_VERSION) \
 		--build-arg LIBNFCT_VERSION=$(LIBNFCT_VERSION) \
 		--output type=local,dest=./$(OUT_DIR)/ASK .

patches/mono-ask.mk

@@ -13,6 +13,8 @@ FMLIB_DIR  := $(ASK_DIR)/sources/fmlib
 FMC_BASE   := $(ASK_DIR)/sources/fmc
 FMC_DIR    := $(FMC_BASE)/source
 
+SYSROOT_PATH := /opt/aarch64-linux-musl-cross/aarch64-linux-musl
+
 .PHONY: prepare-kernel build-kernel modules userspace dist
 
 prepare-preloaded-sources:
@@ -36,8 +38,8 @@ prepare-preloaded-sources:
 		MACHINE=ls1046 \
 		FMD_USPACE_HEADER_PATH=$(FMLIB_DIR)/include/fmd \
 		FMD_USPACE_LIB_PATH=$(FMLIB_DIR) \
-		LIBXML2_HEADER_PATH=/usr/include/libxml2 \
-		TCLAP_HEADER_PATH=/usr/include
+		LIBXML2_HEADER_PATH=$(SYSROOT_PATH)/include/libxml2 \
+		TCLAP_HEADER_PATH=$(SYSROOT_PATH)/include
 	touch $(STAMPS_DIR)/fmc
 
 # 1. Patch the kernel and merge our custom Kubernetes configuration