diff mbox series

[meta-oe,37/38] usb-modeswitch: upgrade 2.6.1 -> 2.6.2

Message ID 20251209095552.690-37-wangmy@fujitsu.com
State New
Headers show
Series [meta-oe,01/38] boost-sml: upgrade 1.1.12 -> 1.1.13 | expand

Commit Message

Wang Mingyu Dec. 9, 2025, 9:55 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

0001-Fix-build-with-gcc-15.patch
removed since it's included in 2.6.2

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 .../0001-Fix-build-with-gcc-15.patch          | 51 -------------------
 ...witch_2.6.1.bb => usb-modeswitch_2.6.2.bb} |  6 +--
 2 files changed, 2 insertions(+), 55 deletions(-)
 delete mode 100644 meta-oe/recipes-support/usb-modeswitch/usb-modeswitch/0001-Fix-build-with-gcc-15.patch
 rename meta-oe/recipes-support/usb-modeswitch/{usb-modeswitch_2.6.1.bb => usb-modeswitch_2.6.2.bb} (86%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch/0001-Fix-build-with-gcc-15.patch b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch/0001-Fix-build-with-gcc-15.patch
deleted file mode 100644
index eb65beb686..0000000000
--- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch/0001-Fix-build-with-gcc-15.patch
+++ /dev/null
@@ -1,51 +0,0 @@ 
-From f497eef1f38bd79a96a13269f251f1413c54b790 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <martin.jansa@gmail.com>
-Date: Tue, 25 Mar 2025 12:36:32 +0100
-Subject: [PATCH] Fix build with gcc-15
-
-* fixes:
-  http://errors.yoctoproject.org/Errors/Details/848747/
-
-usb_modeswitch.c: In function 'main':
-usb_modeswitch.c:573:28: error: too many arguments to function 'get_current_config_value'; expected 0, have 1
-  573 |         currentConfigVal = get_current_config_value(dev);
-      |                            ^~~~~~~~~~~~~~~~~~~~~~~~ ~~~
-In file included from usb_modeswitch.c:59:
-usb_modeswitch.h:55:5: note: declared here
-   55 | int get_current_config_value();
-      |     ^~~~~~~~~~~~~~~~~~~~~~~~
-usb_modeswitch.c:775:52: error: too many arguments to function 'get_current_config_value'; expected 0, have 1
-  775 |                                 currentConfigVal = get_current_config_value(dev);
-      |                                                    ^~~~~~~~~~~~~~~~~~~~~~~~ ~~~
-usb_modeswitch.h:55:5: note: declared here
-   55 | int get_current_config_value();
-      |     ^~~~~~~~~~~~~~~~~~~~~~~~
-
-Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
-Upstream-Status: Submitted [https://www.draisberghof.de/usb_modeswitch/bb/viewtopic.php?t=3122]
----
- usb_modeswitch.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/usb_modeswitch.c b/usb_modeswitch.c
-index 2d4c0aa..bfbcbfb 100644
---- a/usb_modeswitch.c
-+++ b/usb_modeswitch.c
-@@ -570,7 +570,7 @@ int main(int argc, char **argv)
- 	/* Get current configuration of default device, note value if Configuration
- 	 * parameter is set. Also sets active_config
- 	 */
--	currentConfigVal = get_current_config_value(dev);
-+	currentConfigVal = get_current_config_value();
- 	if (Configuration > -1) {
- 		SHOW_PROGRESS(output,"Current configuration number is %d\n", currentConfigVal);
- 	} else
-@@ -772,7 +772,7 @@ int main(int argc, char **argv)
- 	if (Configuration > 0) {
- 		if (currentConfigVal != Configuration) {
- 			if (switchConfiguration()) {
--				currentConfigVal = get_current_config_value(dev);
-+				currentConfigVal = get_current_config_value();
- 				if (currentConfigVal == Configuration) {
- 					SHOW_PROGRESS(output,"The configuration was set successfully\n");
- 				} else {
diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.1.bb b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.2.bb
similarity index 86%
rename from meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.1.bb
rename to meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.2.bb
index b6b720fe1e..af2b5b6491 100644
--- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.1.bb
+++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.2.bb
@@ -4,10 +4,8 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=091556bd6d0154cd4c2d17a1bfc7380a"
 
 DEPENDS = "libusb1"
 
-SRC_URI = "http://www.draisberghof.de/usb_modeswitch/${BP}.tar.bz2 \
-    file://0001-Fix-build-with-gcc-15.patch \
-"
-SRC_URI[sha256sum] = "5195d9e136e52f658f19e9f93e4f982b1b67bffac197d0a455cd8c2cd245fa34"
+SRC_URI = "http://www.draisberghof.de/usb_modeswitch/${BP}.tar.bz2"
+SRC_URI[sha256sum] = "f7abd337784a9d1bd39cb8a587518aff6f2a43d916145eafd80b1b8b7146db66"
 
 inherit pkgconfig systemd