diff options
| author | Lucas Stach <l.stach@pengutronix.de> | 2020-09-28 18:10:31 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-10-14 12:30:02 +0200 |
| commit | 88dc1299a69ea2c404a3846130b8f1adb223917d (patch) | |
| tree | da25df13b0a66a378dc1a3ed6f0b2c4e0296e633 /patches/usbip-5.8 | |
| parent | 1968b9757b582686cf7bf2fb4297a78f2ae0ad12 (diff) | |
| download | ptxdist-88dc1299a69ea2c404a3846130b8f1adb223917d.tar.gz ptxdist-88dc1299a69ea2c404a3846130b8f1adb223917d.tar.xz | |
usbip: version bump 5.6 -> 5.8
- version bump
- add patch to fix compilation with GCC10
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Message-Id: <20200928161032.13579-1-l.stach@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/usbip-5.8')
| -rw-r--r-- | patches/usbip-5.8/0001-usbip-tools-fix-build-error-for-multiple-definition.patch | 32 | ||||
| l--------- | patches/usbip-5.8/autogen.sh | 1 | ||||
| -rw-r--r-- | patches/usbip-5.8/series | 4 |
3 files changed, 37 insertions, 0 deletions
diff --git a/patches/usbip-5.8/0001-usbip-tools-fix-build-error-for-multiple-definition.patch b/patches/usbip-5.8/0001-usbip-tools-fix-build-error-for-multiple-definition.patch new file mode 100644 index 000000000..78753f269 --- /dev/null +++ b/patches/usbip-5.8/0001-usbip-tools-fix-build-error-for-multiple-definition.patch @@ -0,0 +1,32 @@ +From: Antonio Borneo <borneo.antonio@gmail.com> +Date: Thu, 18 Jun 2020 02:08:44 +0200 +Subject: [PATCH] usbip: tools: fix build error for multiple definition + +With GCC 10, building usbip triggers error for multiple definition +of 'udev_context', in: +- libsrc/vhci_driver.c:18 and +- libsrc/usbip_host_common.c:27. + +Declare as extern the definition in libsrc/usbip_host_common.c. + +Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com> +Acked-by: Shuah Khan <skhan@linuxfoundation.org> +Link: https://lore.kernel.org/r/20200618000844.1048309-1-borneo.antonio@gmail.com +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + tools/usb/usbip/libsrc/usbip_host_common.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/usb/usbip/libsrc/usbip_host_common.c b/tools/usb/usbip/libsrc/usbip_host_common.c +index d1d8ba2a4a40..ca78aa368476 100644 +--- a/tools/usb/usbip/libsrc/usbip_host_common.c ++++ b/tools/usb/usbip/libsrc/usbip_host_common.c +@@ -23,7 +23,7 @@ + #include "list.h" + #include "sysfs_utils.h" + +-struct udev *udev_context; ++extern struct udev *udev_context; + + static int32_t read_attr_usbip_status(struct usbip_usb_device *udev) + { diff --git a/patches/usbip-5.8/autogen.sh b/patches/usbip-5.8/autogen.sh new file mode 120000 index 000000000..9f8a4cb7d --- /dev/null +++ b/patches/usbip-5.8/autogen.sh @@ -0,0 +1 @@ +../autogen.sh
\ No newline at end of file diff --git a/patches/usbip-5.8/series b/patches/usbip-5.8/series new file mode 100644 index 000000000..443ce0662 --- /dev/null +++ b/patches/usbip-5.8/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-usbip-tools-fix-build-error-for-multiple-definition.patch +# 5b4960ef0ac36205db410bf8605f689a - git-ptx-patches magic |