From 65e2673706a54a7c2756aff4b7415c3f3295c0abc6d986c45ca6336d8763df7f 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 21:11:03 +0800 Subject: [PATCH] No -N. Ensure kernel patch is patched. --- patches/mono-ask.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/patches/mono-ask.mk b/patches/mono-ask.mk index 905c1db..52d1b70 100644 --- a/patches/mono-ask.mk +++ b/patches/mono-ask.mk @@ -13,8 +13,7 @@ MUSL_HOST?= aarch64-linux-musl # 1. Patch the kernel and merge our custom Kubernetes configuration prepare-kernel: @echo "--> Patching the Linux kernel with NXP DPAA extensions..." - # The -N flag and | true prevents failure if the patch is already applied - cd $(KDIR) && patch -p1 -N < $(ASK_DIR)/patches/kernel/003-mono-gateway-ask-kernel_linux_6_12.patch | true + 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