From 24c5039411b95f61d14345fb48f5ae7fdcf1ecd1208f4669d31d6e054c166f5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=9F=E9=85=8C=20=E9=B5=AC=E5=85=84?= Date: Fri, 1 May 2026 20:30:38 +0800 Subject: [PATCH] Apply the prefetched fmc & fmlib for ASK --- docker/ask.Dockerfile | 40 +++++++++++++++++++++++++++++++++------- makefile | 8 ++++++-- 2 files changed, 39 insertions(+), 9 deletions(-) diff --git a/docker/ask.Dockerfile b/docker/ask.Dockerfile index e5635d0..8002d2b 100644 --- a/docker/ask.Dockerfile +++ b/docker/ask.Dockerfile @@ -23,11 +23,15 @@ ARG NXP_TAR ARG MONO_ASK_TAR ARG LIBNFNETLINK_TAR ARG LIBNFCT_TAR +ARG FMLIB_TAR +ARG FMC_TAR ARG NXP_VERSION ARG MONO_ASK_VERSION ARG LIBNFNETLINK_VERSION ARG LIBNFCT_VERSION +ARG FMLIB_VERSION +ARG FMC_VERSION # Linux kernel COPY "${NXP_TAR}" ./kernel.tar.gz @@ -36,6 +40,8 @@ COPY "${NXP_TAR}" ./kernel.tar.gz COPY "${MONO_ASK_TAR}" . 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 && \ @@ -47,13 +53,33 @@ RUN mkdir linux && tar zxf "kernel.tar.gz" -C "linux" --strip-components=1 WORKDIR /src/ASK -# 1. Build Kernel and Modules with the glibc cross-compiler -RUN make kernel KDIR=/src/linux CROSS_COMPILE=aarch64-linux-gnu- ARCH=arm64 +# Extract fmc & fmlib to prevent git fetching +RUN mkdir -p sources/fmc && \ + mkdir -p sources/fmlib && \ + tar zxf "/src/fmc.tar.gz" -C "sources/fmc" --strip-components=1 && \ + tar zxf "/src/fmlib.tar.gz" -C "sources/fmlib" --strip-components=1 + +# 1. Apply the NXP ASK kernel patch to your Linux source tree FIRST +RUN cd /src/linux && \ + patch -p1 < /src/ASK/patches/kernel/002-mono-gateway-ask-kernel_linux_6_12.patch + +# 2. Merge the NXP defconfig with your Kubernetes extra config +# Assuming you copy kernel-extra.config into the container at /src/kernel-extra.config +COPY kernel-extra.config /src/kernel-extra.config + +RUN cd /src/linux && \ + cp /src/ASK/config/kernel/defconfig .config && \ + ./scripts/kconfig/merge_config.sh -m .config /src/kernel-extra.config && \ + make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- olddefconfig + +# 3. Build the Kernel natively in the linux tree (Do NOT run 'make kernel' in the ASK folder) +RUN cd /src/linux && \ + make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- -j$(nproc) Image modules + +# 4. Now build the ASK out-of-tree modules RUN make modules KDIR=/src/linux CROSS_COMPILE=aarch64-linux-gnu- ARCH=arm64 -# 2. Build Userspace with the musl cross-compiler -# Overriding HOST forces the Netfilter./configure steps to use musl -# Setting CC and CXX with -static ensures portability in the Alpine rootfs +# 5. Build Userspace with the musl cross-compiler RUN make sources KDIR=/src/linux CROSS_COMPILE=aarch64-linux-musl- ARCH=arm64 HOST=aarch64-linux-musl RUN make userspace KDIR=/src/linux CROSS_COMPILE=aarch64-linux-musl- ARCH=arm64 \ HOST=aarch64-linux-musl \ @@ -63,7 +89,7 @@ RUN make userspace KDIR=/src/linux CROSS_COMPILE=aarch64-linux-musl- ARCH=arm64 # Stage the artifacts RUN make dist -# Export stage to isolate compiled artifacts for monok8s build-rootfs.sh +# Export stage FROM scratch AS export -COPY --from=build /src/ASK/dist/ /ASK/ +COPY --from=build /src/ASK/dist/ /ask/ COPY --from=build /src/linux/arch/arm64/boot/Image /kernel/Image diff --git a/makefile b/makefile index e3b704d..15b15d1 100644 --- a/makefile +++ b/makefile @@ -11,14 +11,14 @@ E2FSPROGS_TAR := $(PACKAGES_DIR)/e2fsprogs-$(E2FSPROGS_VERSION).tar.gz BUSYBOX_TAR := $(PACKAGES_DIR)/busybox-$(BUSYBOX_VERSION).tar.gz ALPINE_TAR := $(PACKAGES_DIR)/alpine-minirootfs-$(ALPINE_VER)-$(ALPINE_ARCH).tar.gz NXP_TAR := $(PACKAGES_DIR)/nxp/kernel/$(NXP_VERSION).tar.gz -FMLIB_TAR := $(PACKAGES_DIR)/nxp/fmlib/$(FMLIB_VERSION).tar.gz -FMC_TAR := $(PACKAGES_DIR)/nxp/fmc/$(FMC_VERSION).tar.gz VPP_TAR := $(PACKAGES_DIR)/nxp/vpp/$(VPP_VERSION).tar.gz DPDK_TAR := $(PACKAGES_DIR)/nxp/dpdk/$(DPDK_VERSION).tar.gz CRIO_TAR := $(PACKAGES_DIR)/$(CRIO_VERSION).tar.gz # ASK-specific MONO_ASK_TAR := $(PACKAGES_DIR)/ask/$(MONO_ASK_VERSION).tar.gz +FMLIB_TAR := $(PACKAGES_DIR)/nxp/fmlib/$(FMLIB_VERSION).tar.gz +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 @@ -209,6 +209,10 @@ ASK: $(ASK_TAR) $(LIBNFCT_TAR) $(LIBNFNETLINK_TAR) | $(OUT_DIR) --build-arg BUILD_BASE_TAG=$$build_base_tag \ --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) \