No -N. Ensure kernel patch is patched.

This commit is contained in:
2026-05-01 21:11:03 +08:00
parent d83a63aad5
commit 65e2673706

View File

@@ -13,8 +13,7 @@ MUSL_HOST?= aarch64-linux-musl
# 1. Patch the kernel and merge our custom Kubernetes configuration # 1. Patch the kernel and merge our custom Kubernetes configuration
prepare-kernel: prepare-kernel:
@echo "--> Patching the Linux kernel with NXP DPAA extensions..." @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 < $(ASK_DIR)/patches/kernel/002-mono-gateway-ask-kernel_linux_6_12.patch
cd $(KDIR) && patch -p1 -N < $(ASK_DIR)/patches/kernel/003-mono-gateway-ask-kernel_linux_6_12.patch | true
@echo "--> Merging NXP defconfig with Kubernetes extra config..." @echo "--> Merging NXP defconfig with Kubernetes extra config..."
cp $(ASK_DIR)/config/kernel/defconfig $(KDIR)/.config cp $(ASK_DIR)/config/kernel/defconfig $(KDIR)/.config
cd $(KDIR) && ./scripts/kconfig/merge_config.sh -m .config /src/kernel-extra.config cd $(KDIR) && ./scripts/kconfig/merge_config.sh -m .config /src/kernel-extra.config