From: Lucas Stach <l.stach@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH 1/2] usbip: version bump 5.6 -> 5.8
Date: Mon, 28 Sep 2020 18:10:31 +0200 [thread overview]
Message-ID: <20200928161032.13579-1-l.stach@pengutronix.de> (raw)
- version bump
- add patch to fix compilation with GCC10
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
...-build-error-for-multiple-definition.patch | 32 +++++++++++++++++++
patches/{usbip-5.6 => usbip-5.8}/autogen.sh | 0
patches/usbip-5.8/series | 4 +++
rules/usbip.make | 4 +--
4 files changed, 38 insertions(+), 2 deletions(-)
create mode 100644 patches/usbip-5.8/0001-usbip-tools-fix-build-error-for-multiple-definition.patch
rename patches/{usbip-5.6 => usbip-5.8}/autogen.sh (100%)
create mode 100644 patches/usbip-5.8/series
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 000000000000..78753f26920d
--- /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.6/autogen.sh b/patches/usbip-5.8/autogen.sh
similarity index 100%
rename from patches/usbip-5.6/autogen.sh
rename to patches/usbip-5.8/autogen.sh
diff --git a/patches/usbip-5.8/series b/patches/usbip-5.8/series
new file mode 100644
index 000000000000..443ce0662e15
--- /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
diff --git a/rules/usbip.make b/rules/usbip.make
index ec0844776ee0..a85512147183 100644
--- a/rules/usbip.make
+++ b/rules/usbip.make
@@ -14,9 +14,9 @@ PACKAGES-$(PTXCONF_USBIP) += usbip
#
# Paths and names
#
-USBIP_VERSION := 5.6
+USBIP_VERSION := 5.8
USBIP := usbip-$(USBIP_VERSION)
-USBIP_MD5 := 7b9199ec5fa563ece9ed585ffb17798f
+USBIP_MD5 := 0e5c4c15266218ef26c50fac0016095b
USBIP_SUFFIX := tar.xz
USBIP_URL := https://www.kernel.org/pub/linux/kernel/v5.x/linux-$(USBIP_VERSION).$(USBIP_SUFFIX)
USBIP_SOURCE := $(SRCDIR)/linux-$(USBIP_VERSION).$(USBIP_SUFFIX)
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
next reply other threads:[~2020-09-28 16:10 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-28 16:10 Lucas Stach [this message]
2020-09-28 16:10 ` [ptxdist] [PATCH 2/2] mxt-app: fix compilation with gcc10 Lucas Stach
2020-10-14 10:30 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-10-14 10:30 ` [ptxdist] [APPLIED] usbip: version bump 5.6 -> 5.8 Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200928161032.13579-1-l.stach@pengutronix.de \
--to=l.stach@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox