Makefile: Use IDF_PATH to replace the path to esp-idf.

Signed-off-by: lbuque <[email protected]>
m5stack · Aug 1, 2024 · 77b654b · 77b654b
1 parent e969ebd
commit 77b654b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/m5stack/Makefile b/m5stack/Makefile
@@ -279,16 +279,16 @@ submodules:
 patch:
 	$(call Package/patche,$(abspath ./components/lv_bindings),$(abspath ./patches/0002_avoid_lv_bindings_compile_error.patch))
 	$(call Package/patche,$(abspath ./../micropython),$(abspath ./patches/0003-modtime-Add-timezone.patch))
-	$(call Package/patche,$(abspath ../esp-idf/),$(abspath ./patches/1000-WIP-Compatible-with-esp-adf-v2.6.patch))
+	$(call Package/patche,$(abspath $(IDF_PATH)),$(abspath ./patches/1000-WIP-Compatible-with-esp-adf-v2.6.patch))
 	$(call Package/patche,$(abspath ./components/M5Unified/M5Unified),$(abspath ./patches/2003-Support-LTR553.patch))
-	$(call Package/patche,$(abspath ../esp-adf/),$(abspath ./patches/3000-commponents-audio_board-Add-ESP32_S3_BOX_3-board.patch))
-	$(call Package/patche,$(abspath ../esp-adf/),$(abspath ./patches/3001-commponents-audio_board-Add-M5STACK-CoreS3-board.patch))
+	$(call Package/patche,$(abspath $(ADF_PATH)),$(abspath ./patches/3000-commponents-audio_board-Add-ESP32_S3_BOX_3-board.patch))
+	$(call Package/patche,$(abspath $(ADF_PATH)),$(abspath ./patches/3001-commponents-audio_board-Add-M5STACK-CoreS3-board.patch))
 
 # Unapply patches
 unpatch:
 	$(call Package/unpatche,$(abspath ./components/lv_bindings),$(abspath ./patches/0002_avoid_lv_bindings_compile_error.patch))
 	$(call Package/unpatche,$(abspath ./../micropython),$(abspath ./patches/0003-modtime-Add-timezone.patch))
-	$(call Package/unpatche,$(abspath ../esp-idf/),$(abspath ./patches/1000-WIP-Compatible-with-esp-adf-v2.6.patch))
+	$(call Package/unpatche,$(abspath $(IDF_PATH)),$(abspath ./patches/1000-WIP-Compatible-with-esp-adf-v2.6.patch))
 	$(call Package/unpatche,$(abspath ./components/M5Unified/M5Unified),$(abspath ./patches/2003-Support-LTR553.patch))
-	$(call Package/unpatche,$(abspath ../esp-adf/),$(abspath ./patches/3001-commponents-audio_board-Add-M5STACK-CoreS3-board.patch))
-	$(call Package/unpatche,$(abspath ../esp-adf/),$(abspath ./patches/3000-commponents-audio_board-Add-ESP32_S3_BOX_3-board.patch))
+	$(call Package/unpatche,$(abspath $(ADF_PATH)),$(abspath ./patches/3001-commponents-audio_board-Add-M5STACK-CoreS3-board.patch))
+	$(call Package/unpatche,$(abspath $(ADF_PATH)),$(abspath ./patches/3000-commponents-audio_board-Add-ESP32_S3_BOX_3-board.patch))
diff --git a/third-party/Makefile b/third-party/Makefile
@@ -225,16 +225,16 @@ submodules:
 patch:
 	$(call Package/patche,$(abspath ../m5stack/components/lv_bindings),$(abspath ../m5stack/patches/0002_avoid_lv_bindings_compile_error.patch))
 	$(call Package/patche,$(abspath ./../micropython),$(abspath ../m5stack/patches/0003-modtime-Add-timezone.patch))
-	$(call Package/patche,$(abspath ../esp-idf/),$(abspath ../m5stack/patches/1000-WIP-Compatible-with-esp-adf-v2.6.patch))
+	$(call Package/patche,$(abspath $(IDF_PATH)),$(abspath ../m5stack/patches/1000-WIP-Compatible-with-esp-adf-v2.6.patch))
 	$(call Package/patche,$(abspath ../m5stack/components/M5Unified/M5Unified),$(abspath ../m5stack/patches/2003-Support-LTR553.patch))
-	$(call Package/patche,$(abspath ../esp-adf/),$(abspath ../m5stack/patches/3000-commponents-audio_board-Add-ESP32_S3_BOX_3-board.patch))
-	$(call Package/patche,$(abspath ../esp-adf/),$(abspath ../m5stack/patches/3001-commponents-audio_board-Add-M5STACK-CoreS3-board.patch))
+	$(call Package/patche,$(abspath $(ADF_PATH)),$(abspath ../m5stack/patches/3000-commponents-audio_board-Add-ESP32_S3_BOX_3-board.patch))
+	$(call Package/patche,$(abspath $(ADF_PATH)),$(abspath ../m5stack/patches/3001-commponents-audio_board-Add-M5STACK-CoreS3-board.patch))
 
 # Unapply patches
 unpatch:
 	$(call Package/unpatche,$(abspath ../m5stack/components/lv_bindings),$(abspath ../m5stack/patches/0002_avoid_lv_bindings_compile_error.patch))
 	$(call Package/unpatche,$(abspath ./../micropython),$(abspath ../m5stack/patches/0003-modtime-Add-timezone.patch))
-	$(call Package/unpatche,$(abspath ../esp-idf/),$(abspath ../m5stack/patches/1000-WIP-Compatible-with-esp-adf-v2.6.patch))
+	$(call Package/unpatche,$(abspath $(IDF_PATH)),$(abspath ../m5stack/patches/1000-WIP-Compatible-with-esp-adf-v2.6.patch))
 	$(call Package/unpatche,$(abspath ../m5stack/components/M5Unified/M5Unified),$(abspath ../m5stack/patches/2003-Support-LTR553.patch))
-	$(call Package/unpatche,$(abspath ../esp-adf/),$(abspath ../m5stack/patches/3001-commponents-audio_board-Add-M5STACK-CoreS3-board.patch))
-	$(call Package/unpatche,$(abspath ../esp-adf/),$(abspath ../m5stack/patches/3000-commponents-audio_board-Add-ESP32_S3_BOX_3-board.patch))
+	$(call Package/unpatche,$(abspath $(ADF_PATH)),$(abspath ../m5stack/patches/3001-commponents-audio_board-Add-M5STACK-CoreS3-board.patch))
+	$(call Package/unpatche,$(abspath $(ADF_PATH)),$(abspath ../m5stack/patches/3000-commponents-audio_board-Add-ESP32_S3_BOX_3-board.patch))