Merge branch 'fix/ci_failed_with_bootloader_plus' into 'master'

ustccw · ustccw · commit abf415ba74de · 2025-02-26T14:18:25.000+08:00
fix(bootloader_plus): Fix a compilation error caused by the xz version upgrade

See merge request ae_group/esp-iot-solution!1231
diff --git a/components/bootloader_support_plus/CHANGELOG.md b/components/bootloader_support_plus/CHANGELOG.md
@@ -1,5 +1,11 @@
 # ChangeLog
 
+## v0.2.7 - 2025-2-26
+
+### Fix:
+
+* Fix the issue of a `-Wincompatible-pointer-types` compilation error.
+
 ## v0.2.6 - 2024-07-01
 
 ### Feature:
diff --git a/components/bootloader_support_plus/idf_component.yml b/components/bootloader_support_plus/idf_component.yml
@@ -1,4 +1,4 @@
-version: "0.2.6"
+version: "0.2.7"
 targets:
   - esp32c2
   - esp32c3
diff --git a/components/bootloader_support_plus/src/bootloader_decompressor_xz.c b/components/bootloader_support_plus/src/bootloader_decompressor_xz.c
@@ -16,7 +16,7 @@
 
 static const char *TAG = "boot_xz";
 
-static void bootloader_decompressor_xz_error(char *msg)
+static void bootloader_decompressor_xz_error(const char *msg)
 {
     ESP_LOGE(TAG, "%s", msg);
 }

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`
`17`	`17`	`static const char *TAG = "boot_xz";`
`18`	`18`
`19`		`-static void bootloader_decompressor_xz_error(char *msg)`
	`19`	`+static void bootloader_decompressor_xz_error(const char *msg)`
`20`	`20`	`{`
`21`	`21`	`ESP_LOGE(TAG, "%s", msg);`
`22`	`22`	`}`