Got cmm working

2026-05-11 07:01:39 +08:00
parent 35f2edc0b5
commit 7411e1994b
23 changed files with 213 additions and 40 deletions
--- a/docker/ask.Dockerfile
+++ b/docker/ask.Dockerfile
@@ -51,8 +51,16 @@ 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}"
+# Common paths / flags for the remaining ASK build.
+# Keep userspace fully static against the musl sysroot.
+ENV PATH="/opt/aarch64-linux-musl-cross/bin:${PATH}" \
+	ASK_DIR=/src/ASK \
+	KERNEL_DIR=/src/linux \
+	SYSROOT=/opt/aarch64-linux-musl-cross/aarch64-linux-musl \
+	HOST=aarch64-linux-musl \
+	CROSS_COMPILE=aarch64-linux-musl- \
+	ARCH=arm64 \
+	PLATFORM=LS1043A

 # Extract and build the dependency libraries
 RUN mkdir -p ASK/sources/tarballs && \
@@ -65,7 +73,7 @@ RUN mkdir linux && tar zxf "kernel.tar.gz" -C "linux" --strip-components=1 && \

 # ASK's Kernel patches
 COPY patches/ask/split-kernel-patch.sh /src/split-kernel-patch.sh
-COPY patches/ask/kernel/*.patch /src/ASK/patches/kernel/updated-patch/
+COPY patches/ask/upstream/kernel/*.patch /src/ASK/patches/kernel/updated-patch/

 RUN chmod +x /src/split-kernel-patch.sh && \
 	PATCH_FILE="/src/ASK/patches/kernel/002-mono-gateway-ask-kernel_linux_6_12.patch" \
@@ -74,6 +82,17 @@ RUN chmod +x /src/split-kernel-patch.sh && \
 	/src/split-kernel-patch.sh split && \
 	/src/split-kernel-patch.sh apply

+# Build the kernel first, without the custom DTS
+COPY kernel-extra.config /src/kernel-extra.config
+COPY kernel-build/ensure-kconfig.sh /src/
+
+RUN cd /src/linux \
+ && make ARCH="${ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" defconfig lsdk.config \
+ && ./scripts/kconfig/merge_config.sh -m .config "${ASK_DIR}/config/kernel/defconfig" /src/kernel-extra.config \
+ && make ARCH="${ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" olddefconfig \
+ && /src/ensure-kconfig.sh .config /src/kernel-extra.config \
+ && make ARCH="${ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" -j"$(nproc)"
+
 # 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/ && \
@@ -135,15 +154,18 @@ RUN mkdir 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

-# Common paths / flags for the remaining ASK build.
-# Keep userspace fully static against the musl sysroot.
-ENV ASK_DIR=/src/ASK \
-	KERNEL_DIR=/src/linux \
-	SYSROOT=/opt/aarch64-linux-musl-cross/aarch64-linux-musl \
-	HOST=aarch64-linux-musl \
-	CROSS_COMPILE=aarch64-linux-musl- \
-	ARCH=arm64 \
-	PLATFORM=LS1043A
+# Patch verdor's modules
+RUN mkdir -p /src/patches/ask
+COPY patches/ask/ /src/patches/ask/
+
+RUN cd /src/ASK && \
+	git init -q && git add -A && git commit -q -m "base" && \
+	find /src/patches/ask \
+		-path /src/patches/ask/upstream -prune -o \
+		-name '*.patch' -print \
+		| sort > /tmp/ask-module-patches.list && \
+	test ! -s /tmp/ask-module-patches.list || xargs -a /tmp/ask-module-patches.list git apply --check && \
+	test ! -s /tmp/ask-module-patches.list || xargs -a /tmp/ask-module-patches.list git apply

 # Build patched libnfnetlink + libnetfilter_conntrack into the musl sysroot.
 # These are needed by cmm through pkg-config.
@@ -163,8 +185,15 @@ RUN mkdir -p "${ASK_DIR}/sources" && \
 	tar xf "${ASK_DIR}/sources/tarballs/libnetfilter_conntrack-${LIBNFCT_VERSION}.tar.xz" \
 		-C libnetfilter_conntrack --strip-components=1 && \
 	cd libnetfilter_conntrack && \
+	cp /src/patches/ask/upstream/libnetfilter-conntrack/* "${ASK_DIR}/patches/libnetfilter-conntrack/" && \
 	git init -q && git add -A && git commit -q -m "upstream" && \
-	git apply "${ASK_DIR}/patches/libnetfilter-conntrack/01-nxp-ask-comcerto-fp-extensions.patch" && \
+	find "${ASK_DIR}/patches/libnetfilter-conntrack/" \
+		-name '*.patch' -exec sha256sum {} \; && \
+	find "${ASK_DIR}/patches/libnetfilter-conntrack/" \
+		-name '*.patch' -print \
+		| sort > /tmp/libnfct-patches.list && \
+	test ! -s /tmp/libnfct-patches.list || xargs -a /tmp/libnfct-patches.list git apply --check && \
+	test ! -s /tmp/libnfct-patches.list || xargs -a /tmp/libnfct-patches.list git apply && \
 	PKG_CONFIG_PATH="${SYSROOT}/lib/pkgconfig" \
 	CC=aarch64-linux-musl-gcc AR=aarch64-linux-musl-ar RANLIB=aarch64-linux-musl-ranlib \
 	./configure --host="${HOST}" --prefix="${SYSROOT}" \
@@ -179,17 +208,6 @@ RUN make -C "${ASK_DIR}/fci/lib" \
 	CC=aarch64-linux-musl-gcc \
 	AR=aarch64-linux-musl-ar

-# Build the kernel first, without the custom DTS
-COPY kernel-extra.config /src/kernel-extra.config
-COPY kernel-build/ensure-kconfig.sh /src/
-
-RUN cd /src/linux \
- && make ARCH="${ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" defconfig lsdk.config \
- && ./scripts/kconfig/merge_config.sh -m .config "${ASK_DIR}/config/kernel/defconfig" /src/kernel-extra.config \
- && make ARCH="${ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" olddefconfig \
- && /src/ensure-kconfig.sh .config /src/kernel-extra.config \
- && make ARCH="${ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" -j"$(nproc)"
-
 # DTS changes happen after the expensive kernel build layer
 COPY kernel-build/dts/*.dts /src/linux/arch/arm64/boot/dts/freescale/

@@ -203,19 +221,6 @@ RUN cd /src/linux \
 && make ARCH="${ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" \
 	  "freescale/${DEVICE_TREE_TARGET}.dtb"

-# Patch verdor's modules
-RUN mkdir -p /src/patches/ask
-COPY patches/ask/ /src/patches/ask/
-
-RUN cd /src/ASK && \
-	git init -q && git add -A && git commit -q -m "base" && \
-	find /src/patches/ask \
-		-path /src/patches/ask/kernel -prune -o \
-		-name '*.patch' -print \
-		| sort > /tmp/ask-module-patches.list && \
-	test ! -s /tmp/ask-module-patches.list || xargs -a /tmp/ask-module-patches.list git apply --check && \
-	test ! -s /tmp/ask-module-patches.list || xargs -a /tmp/ask-module-patches.list git apply
-
 # Build out-of-tree ASK kernel modules: cdx -> fci, plus auto_bridge.
 RUN make -C "${ASK_DIR}/cdx" \
 		CROSS_COMPILE="${CROSS_COMPILE}" \
@@ -286,7 +291,6 @@ RUN mkdir -p /out/rootfs-cfg/etc/dpa && \
 	mkdir -p /out/rootfs-cfg/etc/cmm && \
 	cp "${ASK_DIR}/config/fastforward" /out/rootfs-cfg/etc/cmm/fastforward.vendor.orig

-
 FROM scratch AS export

 ARG DEVICE_TREE_TARGET