From 55569ba9fff8108d924abd7bb94fcafb25f9fb15898a9426c2832da6e5e136c3 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: Mon, 4 May 2026 21:02:43 +0800 Subject: [PATCH] Stashed changes --- build.env | 12 +- devtools/create-join-token.sh | 1 - docker/ask.Dockerfile | 193 ++++++++++++++++++++++++++++ docker/download-packages.Dockerfile | 73 ++++++++++- kernel-extra.config | 6 + makefile | 57 +++++++- patches/mono-ask.mk | 87 +++++++++++++ 7 files changed, 423 insertions(+), 6 deletions(-) create mode 100644 docker/ask.Dockerfile create mode 100644 patches/mono-ask.mk diff --git a/build.env b/build.env index 970850f..ea7f3a0 100644 --- a/build.env +++ b/build.env @@ -11,7 +11,17 @@ FMC_VERSION=lf-$(LINUX_FACTORY) DPDK_VERSION=lf-$(LINUX_FACTORY) VPP_VERSION=lf-$(LINUX_FACTORY) VPP_UPSTREAM_VERSION=23.10 -MONO_ASK_VERSION=mt-$(LINUX_FACTORY) + +# ASK's deps +MONO_ASK_VERSION=mt-6.12.49-2.2.0 +LIBNFNETLINK_VERSION=1.0.2 +LIBMNL_VERSION=1.0.5 +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 +LIBPCAP_VERSION=1.10.4 CRIO_VERSION=cri-o.arm64.v1.35.2 KUBE_VERSION=v1.35.3 diff --git a/devtools/create-join-token.sh b/devtools/create-join-token.sh index 977435d..bf3ea93 100755 --- a/devtools/create-join-token.sh +++ b/devtools/create-join-token.sh @@ -188,7 +188,6 @@ make cluster-config \\ MKS_CNI_PLUGIN=none EOF - if [ "$signed" != "true" ]; then echo >&2 echo "warning: cluster-info was not signed within ${WAIT_SECONDS}s." >&2 diff --git a/docker/ask.Dockerfile b/docker/ask.Dockerfile new file mode 100644 index 0000000..16c79d8 --- /dev/null +++ b/docker/ask.Dockerfile @@ -0,0 +1,193 @@ +ARG BUILD_BASE_TAG=dev +ARG DOCKER_IMAGE_ROOT=monok8s + +FROM --platform=$BUILDPLATFORM ${DOCKER_IMAGE_ROOT}/build-base:${BUILD_BASE_TAG} AS build + +# Install glibc cross-compiler for kernel and standard build dependencies +RUN apt-get update && apt-get install -y pkg-config + +WORKDIR /src + +ARG AARCH64_MUSL_CC_TAR +ARG NXP_TAR +ARG MONO_ASK_TAR +ARG LIBNFNETLINK_TAR +ARG LIBMNL_TAR +ARG LIBNFCT_TAR +ARG FMLIB_TAR +ARG FMC_TAR +ARG LIBXML2_TAR +ARG LIBPCAP_TAR +ARG LIBCLI_TAR +ARG TCLAP_TAR + +# ASK's version pins (hardcoded wget) +ARG LIBNFNETLINK_VERSION +ARG LIBNFCT_VERSION + +# MUSL Cross Compiler +COPY "${AARCH64_MUSL_CC_TAR}" ./aarch64_musl_cc.tar.gz + +# Linux kernel +COPY "${NXP_TAR}" ./kernel.tar.gz + +# Copy the ASK deps +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 "${LIBPCAP_TAR}" ./libpcap.tar.xz +COPY "${TCLAP_TAR}" ./tclap.tar.gz +COPY "${LIBMNL_TAR}" ./libmnl.tar.bz2 +COPY "${LIBCLI_TAR}" ./libcli.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 + +# Provision the musl cross-compiler from musl.cc +RUN tar zxf "aarch64_musl_cc.tar.gz" -C /opt + +# Expose the musl compiler to the PATH +ENV PATH="/opt/aarch64-linux-musl-cross/bin:${PATH}" + +# Extract and build the dependency libraries +RUN mkdir -p ASK/sources/tarballs && \ + 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/ + +RUN mkdir linux && tar zxf "kernel.tar.gz" -C "linux" --strip-components=1 + +# tclap +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 + +# libxml2 +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 + +# libmnl +RUN mkdir -p libmnl && tar xjf "libmnl.tar.bz2" -C "libmnl" --strip-components=1 && \ + cd libmnl && \ + CC=aarch64-linux-musl-gcc ./configure --host=aarch64-linux-musl \ + --prefix=/opt/aarch64-linux-musl-cross/aarch64-linux-musl \ + --enable-static --disable-shared && \ + make -j$(nproc) && make install && \ + cd .. && rm -rf libmnl + +# libcli +RUN mkdir -p libcli && tar zxf "libcli.tar.gz" -C "libcli" --strip-components=1 && \ + cd libcli && \ + make CC=aarch64-linux-musl-gcc AR=aarch64-linux-musl-ar libcli.a && \ + cp libcli.h /opt/aarch64-linux-musl-cross/aarch64-linux-musl/include/ && \ + cp libcli.a /opt/aarch64-linux-musl-cross/aarch64-linux-musl/lib/ && \ + cd .. && rm -rf libcli + +# libpcap +RUN mkdir -p libpcap && tar xf "libpcap.tar.xz" -C "libpcap" --strip-components=1 && \ + cd libpcap && \ + CC=aarch64-linux-musl-gcc ./configure --host=aarch64-linux-musl \ + --prefix=/opt/aarch64-linux-musl-cross/aarch64-linux-musl \ + --with-pcap=linux --enable-static --disable-shared \ + --disable-usb --disable-netmap --disable-bluetooth --disable-dbus && \ + make -j$(nproc) && make install && \ + cd .. && rm -rf libpcap + +RUN git config --global user.email "monok8s@localhost" && \ + git config --global user.name "monok8s authors" && \ + git config --global --add safe.directory '*' + +# cd .. && \ +# mkdir -p fmc && \ +# tar zxf "fmc.tar.gz" -C "fmc" --strip-components=1 && \ +# # Handle fmc: Initialize dummy repo, patch, and build \ +# cd fmc && git init -q && git add -A && git commit -q -m "base" && \ +# git apply /src/ASK/patches/fmc/01-mono-ask-extensions.patch \ +# make CC="aarch64-linux-musl-gcc -static" CXX="aarch64-linux-musl-g++ -static" AR=aarch64-linux-musl-ar \ +# MACHINE=ls1046 \ +# FMD_USPACE_HEADER_PATH=../fmlib/include/fmd \ +# FMD_USPACE_LIB_PATH=../fmlib \ +# LIBXML2_HEADER_PATH=/opt/aarch64-linux-musl-cross/aarch64-linux-musl/include/libxml2 \ +# TCLAP_HEADER_PATH=/opt/aarch64-linux-musl-cross/aarch64-linux-musl/include + +# # -- libfci ---------------------------------------------------------------- +# +# $(S)/libfci: +# @echo "==> libfci: build" +# $(MAKE) -C $(LIBFCI_DIR) CC=$(CC) AR=$(AR) +# @touch $@ +# +# # -- libnfnetlink (patched) ------------------------------------------------ +# +# $(S)/libnfnetlink: +# @echo "==> libnfnetlink: fetch + patch + build" +# mkdir -p $(SRCDIR)/tarballs +# [ -f $(SRCDIR)/tarballs/libnfnetlink-$(LIBNFNETLINK_VER).tar.bz2 ] || \ +# wget -q -P $(SRCDIR)/tarballs $(LIBNFNETLINK_URL) +# rm -rf $(SRCDIR)/libnfnetlink-$(LIBNFNETLINK_VER) +# tar xf $(SRCDIR)/tarballs/libnfnetlink-$(LIBNFNETLINK_VER).tar.bz2 -C $(SRCDIR) +# cd $(SRCDIR)/libnfnetlink-$(LIBNFNETLINK_VER) && \ +# git init -q && git add -A && git commit -q -m "upstream" && \ +# git apply $(PATCHES)/libnfnetlink/01-nxp-ask-nonblocking-heap-buffer.patch && \ +# ./configure --host=$(HOST) --prefix=$(SYSROOT) --enable-static --disable-shared -q && \ +# $(MAKE) -j$$(nproc) -s && $(MAKE) install -s +# @touch $@ +# +# # -- libnetfilter_conntrack (patched) -------------------------------------- +# +# $(S)/libnfct: $(S)/libnfnetlink +# @echo "==> libnetfilter_conntrack: fetch + patch + build" +# mkdir -p $(SRCDIR)/tarballs +# [ -f $(SRCDIR)/tarballs/libnetfilter_conntrack-$(LIBNFCT_VER).tar.xz ] || \ +# wget -q -P $(SRCDIR)/tarballs $(LIBNFCT_URL) +# rm -rf $(SRCDIR)/libnetfilter_conntrack-$(LIBNFCT_VER) +# tar xf $(SRCDIR)/tarballs/libnetfilter_conntrack-$(LIBNFCT_VER).tar.xz -C $(SRCDIR) +# cd $(SRCDIR)/libnetfilter_conntrack-$(LIBNFCT_VER) && \ +# git init -q && git add -A && git commit -q -m "upstream" && \ +# git apply $(PATCHES)/libnetfilter-conntrack/01-nxp-ask-comcerto-fp-extensions.patch && \ +# PKG_CONFIG_PATH=$(SYSROOT)/lib/pkgconfig \ +# ./configure --host=$(HOST) --prefix=$(SYSROOT) --enable-static --disable-shared -q \ +# CFLAGS="-I$(SYSROOT)/include" LDFLAGS="-L$(SYSROOT)/lib" && \ +# $(MAKE) -j$$(nproc) -s && $(MAKE) install -s +# @touch $@ +# +# modules: cdx fci auto_bridge +# +# cdx: +# $(MAKE) -C cdx $(CDX_ARGS) modules +# +# fci: cdx +# $(MAKE) -C fci $(FCI_ARGS) modules +# +# auto_bridge: +# $(MAKE) -C auto_bridge $(ABM_ARGS) +# +# # ============================================================================ +# # Userspace binaries +# # ============================================================================ +# +# userspace: fmc cmm dpa_app +# +# fmc: $(S)/fmc +# @true +# +# cmm: $(S)/libfci $(S)/libnfct +# $(MAKE) -C cmm CC=$(CC) \ +# LIBFCI_DIR=$(LIBFCI_DIR) \ +# ABM_DIR=$(ABM_DIR) \ +# SYSROOT=$(SYSROOT) +# +# dpa_app: $(S)/fmc +# $(MAKE) -C dpa_app CC=$(CC) \ +# CFLAGS="-DDPAA_DEBUG_ENABLE -DNCSW_LINUX \ +# -I$(FMC_DIR) -I$(CURDIR)/cdx \ +# -I$(FMLIB_DIR)/include/fmd \ +# -I$(FMLIB_DIR)/include/fmd/Peripherals \ +# -I$(FMLIB_DIR)/include/fmd/integrations" \ +# LDFLAGS="-lpthread -lcli -L$(FMC_DIR) -lfmc -L$(FMLIB_DIR) -lfm -lstdc++ -lxml2 -lm" diff --git a/docker/download-packages.Dockerfile b/docker/download-packages.Dockerfile index d423894..94919b1 100644 --- a/docker/download-packages.Dockerfile +++ b/docker/download-packages.Dockerfile @@ -70,6 +70,68 @@ WORKDIR /out/nxp/vpp RUN curl -fL --retry 3 -o "${VPP_VERSION}.tar.gz" \ "https://github.com/nxp-qoriq/vpp/archive/refs/tags/${VPP_VERSION}.tar.gz" +# ---- MUSL CC ---- +FROM base AS aarch64_musl_cc +WORKDIR /out +RUN curl -fL --retry 3 -o "aarch64-linux-musl-cross.tgz" \ + "https://musl.cc/aarch64-linux-musl-cross.tgz" + +# ---- ASK ---- +FROM base AS mono_ask +ARG MONO_ASK_VERSION +WORKDIR /out/ask +RUN curl -fL --retry 3 -o "${MONO_ASK_VERSION}.tar.gz" \ + "https://github.com/we-are-mono/ASK/archive/refs/tags/${MONO_ASK_VERSION}.tar.gz" + +# ---- libnfnetlink ---- +FROM base AS libnfnetlink +ARG LIBNFNETLINK_VERSION +WORKDIR /out/ask/libnfnetlink +RUN curl -fL --retry 3 -o "${LIBNFNETLINK_VERSION}.tar.bz2" \ + "https://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-${LIBNFNETLINK_VERSION}.tar.bz2" + +# ---- libnfct ---- +FROM base AS libnfct +ARG LIBNFCT_VERSION +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" + +# ---- libmnl ---- +FROM base AS libmnl +ARG LIBMNL_VERSION +WORKDIR /out/ask/libmnl +RUN curl -fL --retry 3 -o "${LIBMNL_VERSION}.tar.bz2" \ + "https://www.netfilter.org/projects/libmnl/files/libmnl-${LIBMNL_VERSION}.tar.bz2" + +# ---- 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.11/libxml2-${LIBXML2_VERSION}.tar.xz" + +# ---- libcli ---- +FROM base AS libcli +ARG LIBCLI_VERSION +WORKDIR /out/ask/libcli +RUN curl -fL --retry 3 -o "${LIBCLI_VERSION}.tar.gz" \ + "https://github.com/dparrish/libcli/archive/refs/tags/V${LIBCLI_VERSION}.tar.gz" + +# ---- libpcap ---- +FROM base AS libpcap +ARG LIBPCAP_VERSION +WORKDIR /out/ask/libpcap +RUN curl -fL --retry 3 -o "${LIBPCAP_VERSION}.tar.xz" \ + "https://www.tcpdump.org/release/libpcap-${LIBPCAP_VERSION}.tar.xz" + # ---- alpine rootfs ---- FROM base AS alpine_rootfs ARG ALPINE_SERIES @@ -101,9 +163,18 @@ COPY --from=kubectl /out/ / COPY --from=busybox /out/ / COPY --from=e2fsprogs /out/ / COPY --from=dpdk /out/ / +COPY --from=aarch64_musl_cc /out/ / +COPY --from=mono_ask /out/ / +COPY --from=vpp /out/ / COPY --from=fmlib /out/ / COPY --from=fmc /out/ / -COPY --from=vpp /out/ / +COPY --from=libnfnetlink /out/ / +COPY --from=libnfct /out/ / +COPY --from=libmnl /out/ / +COPY --from=libcli /out/ / +COPY --from=libpcap /out/ / +COPY --from=libxml2 /out/ / +COPY --from=tclap /out/ / COPY --from=alpine_rootfs /out/ / COPY --from=nxp_linux /out/ / COPY --from=crio /out/ / diff --git a/kernel-extra.config b/kernel-extra.config index d9d7f04..e221d2c 100644 --- a/kernel-extra.config +++ b/kernel-extra.config @@ -247,3 +247,9 @@ CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_IO_ACCOUNTING=y CONFIG_TASKSTATS=y CONFIG_TASK_XACCT=y + +############################################################################### +# NXP +############################################################################### + +CONFIG_CDX_BUS=y diff --git a/makefile b/makefile index 7c7187e..064ebc9 100644 --- a/makefile +++ b/makefile @@ -11,12 +11,24 @@ 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 +AARCH64_MUSL_CC_TAR := $(PACKAGES_DIR)/aarch64-linux-musl-cross.tgz + +# 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 +LIBMNL_TAR := $(PACKAGES_DIR)/ask/libmnl/$(LIBMNL_VERSION).tar.bz2 +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 +LIBPCAP_TAR := $(PACKAGES_DIR)/ask/libpcap/$(LIBPCAP_VERSION).tar.xz + # Kubernetes components KUBELET_BIN := $(PACKAGES_DIR)/kubernetes/kubelet-$(KUBE_VERSION) KUBEADM_BIN := $(PACKAGES_DIR)/kubernetes/kubeadm-$(KUBE_VERSION) @@ -118,11 +130,20 @@ $(DOWNLOAD_PACKAGES_STAMP): docker/download-packages.Dockerfile build.env makefi --build-arg KUBE_VERSION=$(KUBE_VERSION) \ --build-arg ARCH=$(ARCH) \ --build-arg BUSYBOX_VERSION=$(BUSYBOX_VERSION) \ + --build-arg DEVICE_TREE_TARGET=$(DEVICE_TREE_TARGET) \ --build-arg E2FSPROGS_VERSION=$(E2FSPROGS_VERSION) \ --build-arg DPDK_VERSION=$(DPDK_VERSION) \ --build-arg FMLIB_VERSION=$(FMLIB_VERSION) \ --build-arg FMC_VERSION=$(FMC_VERSION) \ --build-arg VPP_VERSION=$(VPP_VERSION) \ + --build-arg MONO_ASK_VERSION=$(MONO_ASK_VERSION) \ + --build-arg LIBNFNETLINK_VERSION=$(LIBNFNETLINK_VERSION) \ + --build-arg LIBMNL_VERSION=$(LIBMNL_VERSION) \ + --build-arg LIBNFCT_VERSION=$(LIBNFCT_VERSION) \ + --build-arg LIBCLI_VERSION=$(LIBCLI_VERSION) \ + --build-arg LIBXML2_VERSION=$(LIBXML2_VERSION) \ + --build-arg LIBPCAP_VERSION=$(LIBPCAP_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) \ @@ -183,6 +204,36 @@ $(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) $(TCLAP_TAR) $(LIBXML2_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 AARCH64_MUSL_CC_TAR=$(AARCH64_MUSL_CC_TAR) \ + --build-arg NXP_TAR=$(NXP_TAR) \ + --build-arg FMLIB_TAR=$(FMLIB_TAR) \ + --build-arg FMC_TAR=$(FMC_TAR) \ + --build-arg LIBNFNETLINK_TAR=$(LIBNFNETLINK_TAR) \ + --build-arg LIBMNL_TAR=$(LIBMNL_TAR) \ + --build-arg LIBNFCT_TAR=$(LIBNFCT_TAR) \ + --build-arg LIBXML2_TAR=$(LIBXML2_TAR) \ + --build-arg LIBPCAP_TAR=$(LIBPCAP_TAR) \ + --build-arg TCLAP_TAR=$(TCLAP_TAR) \ + --build-arg LIBCLI_TAR=$(LIBCLI_TAR) \ + --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}}' \ @@ -339,5 +390,5 @@ pkgclean: rm -rf $(PACKAGES_DIR) .PHONY: release kernel initramfs itb build-base clitools clean distclean pkgclean \ - vpp \ + vpp ASK \ cluster-config cluster-defconfig cluster-print diff --git a/patches/mono-ask.mk b/patches/mono-ask.mk new file mode 100644 index 0000000..39ddb77 --- /dev/null +++ b/patches/mono-ask.mk @@ -0,0 +1,87 @@ +# mono-ask.mk +# Custom wrapper to build the NXP ASK for the monok8s Alpine/musl ecosystem + +# Define default paths and cross-compilers +KDIR?= /src/linux +ASK_DIR?= $(CURDIR) +ARCH?= arm64 +GNU_CROSS?= aarch64-linux-gnu- +MUSL_HOST?= aarch64-linux-musl + +STAMPS_DIR := $(ASK_DIR)/sources/.stamps +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: + @echo "--> Initializing dummy git repos and building preloaded fmlib/fmc..." + mkdir -p $(STAMPS_DIR) + + git config --global user.email "monok8s@localhost" + git config --global user.name "monok8s authors" + git config --global --add safe.directory '*' + + # Inject libmnl.pc into the vendor's isolated sysroot to satisfy pkg-config + mkdir -p $(ASK_DIR)/sources/sysroot/lib/pkgconfig + cp -a $(SYSROOT_PATH)/lib/pkgconfig/libmnl.pc $(ASK_DIR)/sources/sysroot/lib/pkgconfig/ + + # Handle fmlib: Initialize dummy repo, patch, and build + cd $(FMLIB_DIR) && git init -q && git add -A && git commit -q -m "base" + cd $(FMLIB_DIR) && git apply $(ASK_DIR)/patches/fmlib/01-mono-ask-extensions.patch + $(MAKE) -C $(FMLIB_DIR) CROSS_COMPILE=$(MUSL_HOST)- KERNEL_SRC=$(KDIR) libfm-arm.a + ln -sf libfm-arm.a $(FMLIB_DIR)/libfm.a + touch $(STAMPS_DIR)/fmlib + + # Handle fmc: Initialize dummy repo, patch, and build + cd $(FMC_BASE) && git init -q && git add -A && git commit -q -m "base" + cd $(FMC_BASE) && git apply $(ASK_DIR)/patches/fmc/01-mono-ask-extensions.patch + $(MAKE) -C $(FMC_DIR) CC="$(MUSL_HOST)-gcc -static" CXX="$(MUSL_HOST)-g++ -static" AR=$(MUSL_HOST)-ar \ + MACHINE=ls1046 \ + FMD_USPACE_HEADER_PATH=$(FMLIB_DIR)/include/fmd \ + FMD_USPACE_LIB_PATH=$(FMLIB_DIR) \ + 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 +prepare-kernel: + @echo "--> Patching the Linux kernel with NXP DPAA extensions..." + cd $(KDIR) && patch -p1 < $(ASK_DIR)/patches/kernel/002-mono-gateway-ask-kernel_linux_6_12.patch + @echo "--> Merging NXP defconfig with Kubernetes extra config..." + cp $(ASK_DIR)/config/kernel/defconfig $(KDIR)/.config + cd $(KDIR) && ./scripts/kconfig/merge_config.sh -m .config /src/kernel-extra.config + $(MAKE) -C $(KDIR) ARCH=$(ARCH) CROSS_COMPILE=$(GNU_CROSS) olddefconfig + /src/ensure-kconfig.sh $(KDIR)/.config /src/kernel-extra.config + +# 2. Build the kernel tree (mandatory before out-of-tree modules can be built) +build-kernel: prepare-kernel + @echo "--> Building the Linux kernel natively..." + # Replace "dtbs" with the exact path to your target dtb + $(MAKE) -C $(KDIR) ARCH=$(ARCH) CROSS_COMPILE=$(GNU_CROSS) -j$$(nproc) \ + Image modules freescale/mono-gateway-dk-sdk.dtb + +# 3. Build the ASK out-of-tree modules using the vendor Makefile +modules: build-kernel + @echo "--> Building ASK out-of-tree modules..." + $(MAKE) -f Makefile modules KDIR=$(KDIR) CROSS_COMPILE=$(GNU_CROSS) ARCH=$(ARCH) + +# 4. Build the ASK userspace daemons using the musl cross-compiler +userspace: prepare-preloaded-sources + @echo "--> Building ASK sources and libraries..." + $(MAKE) -f Makefile sources KDIR=$(KDIR) CROSS_COMPILE=$(MUSL_HOST)- ARCH=$(ARCH) HOST=$(MUSL_HOST) + + @echo "--> Stripping -Werror from vendor Makefiles for modern GCC compatibility..." + sed -i 's/-Werror//g' $(ASK_DIR)/cmm/Makefile + sed -i 's/-Werror//g' $(ASK_DIR)/dpa_app/Makefile + + @echo "--> Building ASK userspace executables statically..." + $(MAKE) -f Makefile userspace KDIR=$(KDIR) CROSS_COMPILE=$(MUSL_HOST)- ARCH=$(ARCH) HOST=$(MUSL_HOST) CC='"$(MUSL_HOST)-gcc -static"' CXX='"$(MUSL_HOST)-g++ -static"' + +# 5. Extract artifacts +dist: + @echo "--> Staging artifacts..." + $(MAKE) -f Makefile dist KDIR=$(KDIR) CROSS_COMPILE=$(GNU_CROSS) ARCH=$(ARCH)