openharmony/kernel_linux_build
1
0
Fork 0
mirror of https://github.com/openharmony/kernel_linux_build.git synced 2026-08-25 12:50:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

!233 merge dev/20260530 into master

Browse Source 
fix: add md_stop_writes patch reference to kernel.mk

Created-by: chenjinxiang3
Commit-by: chenjinxiang3;openharmony_ci
Merged-by: ohci1
Description: https://gitcode.com/openharmony/kernel_linux_build/issues/126

Add MD_STOP_WRITES_PATCH_FILE variable and patch application block to kernel.mk for linux-6.6 builds, ensuring the md_stop_writes.patch is applied during kernel compilation.

See merge request: openharmony/kernel_linux_build!233
This commit is contained in:
ohci1
2026-06-02 16:54:05 +08:00
parent a6f436c604 bddfc11772
commit f807afc8a9
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel.mk
+10
View File
@@ -97,6 +97,8 @@ HIDEADDR_PATCH_FILE := ${OHOS_BUILD_HOME}/kernel/linux/common_modules/memory_sec
OHOE_HEADERS_FILE := ${OHOS_BUILD_HOME}/kernel/linux/common_modules/ohoe_headers/apply_ohoe_headers.sh
WATCHDOG_PATCH_FILE := ${DEVICE_PATCH_DIR}/watchdog.patch
OH_HEADERS_PATCH_FILE := ${DEVICE_PATCH_DIR}/oh_headers.patch
MD_STOP_WRITES_PATCH_FILE := ${DEVICE_PATCH_DIR}/md_stop_writes.patch
KVM_FIX_PATCH_FILE := ${DEVICE_PATCH_DIR}/kvm_fix.patch
endif
export KBUILD_OUTPUT=$(KERNEL_OBJ_TMP_PATH)
@@ -148,6 +150,14 @@ endif
ifeq ($(WATCHDOG_PATCH_FILE), $(wildcard $(WATCHDOG_PATCH_FILE)))
$(hide) cd $(KERNEL_SRC_TMP_PATH) && patch -p1 < $(WATCHDOG_PATCH_FILE)
endif
# Apply MD stop writes fix patch (required for linux-6.6)
ifeq ($(MD_STOP_WRITES_PATCH_FILE), $(wildcard $(MD_STOP_WRITES_PATCH_FILE)))
$(hide) cd $(KERNEL_SRC_TMP_PATH) && patch -p1 < $(MD_STOP_WRITES_PATCH_FILE)
endif
# Apply KVM fix patch (fixes kvm_iodevice_destructor visibility issue)
ifeq ($(KVM_FIX_PATCH_FILE), $(wildcard $(KVM_FIX_PATCH_FILE)))
$(hide) cd $(KERNEL_SRC_TMP_PATH) && patch -p1 < $(KVM_FIX_PATCH_FILE)
endif
endif
$(hide) cp -rf $(KERNEL_CONFIG_PATH)/. $(KERNEL_SRC_TMP_PATH)/
$(hide) $(KERNEL_MAKE) -C $(KERNEL_SRC_TMP_PATH) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) distclean