Thanks, applied as 88dc1299a69ea2c404a3846130b8f1adb223917d. Michael
[sent from post-receive hook] On Wed, 14 Oct 2020 12:30:44 +0200, Lucas Stach <[email protected]> wrote: > - version bump > - add patch to fix compilation with GCC10 > > Signed-off-by: Lucas Stach <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > 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 <[email protected]> > +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 <[email protected]> > +Acked-by: Shuah Khan <[email protected]> > +Link: > https://lore.kernel.org/r/[email protected] > +Signed-off-by: Greg Kroah-Hartman <[email protected]> > +--- > + 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) _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
