- added usbip-nocommon patch (fix build with -fno-common)

diff --git a/kernel-tools-usbip-nocommon.patch b/kernel-tools-usbip-nocommon.patch
new file mode 100644 (file)
index 0000000..c8399df
--- /dev/null
+++ b/kernel-tools-usbip-nocommon.patch
@@ -0,0 +1,12 @@
+It seems that vhci_driver should use its own udev_context instance, not the one from usbip_host_common.c
+--- linux-5.7/tools/usb/usbip/libsrc/vhci_driver.c.orig        2020-06-01 01:49:15.000000000 +0200
++++ linux-5.7/tools/usb/usbip/libsrc/vhci_driver.c     2020-06-21 16:02:34.325318086 +0200
+@@ -15,7 +15,7 @@
+ #define PROGNAME "libusbip"
+ 
+ struct usbip_vhci_driver *vhci_driver;
+-struct udev *udev_context;
++static struct udev *udev_context = NULL;
+ 
+ static struct usbip_imported_device *
+ imported_device_init(struct usbip_imported_device *idev, char *busid)

diff --git a/kernel-tools.spec b/kernel-tools.spec
index 8d8f95114c54ea8f30392bfea7c9c6fa594e978d..4891c0c0d8a0ae48b75264ddf87568a93d3d0275 100644 (file)
--- a/kernel-tools.spec
+++ b/kernel-tools.spec
@@ -41,6 +41,7 @@ Patch2:               regex.patch
 Patch3:                %{name}-perf-update.patch
 Patch4:                %{name}-perf-gtk2.patch
 Patch5:                %{name}-bpf-hashmap.patch
 Patch3:                %{name}-perf-update.patch
 Patch4:                %{name}-perf-gtk2.patch
 Patch5:                %{name}-bpf-hashmap.patch

+Patch6:                %{name}-usbip-nocommon.patch

 URL:           https://www.kernel.org/
 BuildRequires: bison
 BuildRequires: docutils
 URL:           https://www.kernel.org/
 BuildRequires: bison
 BuildRequires: docutils


@@ -406,6 +407,7 @@ cd linux-%{basever}
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1

+%patch6 -p1

 
 %{__sed} -i -e '/^CFLAGS = /s/ -g / $(OPTFLAGS) /' tools/hv/Makefile
 %{__sed} -i -e '/^CFLAGS+=/s/ -O1 / $(OPTFLAGS) /' tools/thermal/tmon/Makefile
 
 %{__sed} -i -e '/^CFLAGS = /s/ -g / $(OPTFLAGS) /' tools/hv/Makefile
 %{__sed} -i -e '/^CFLAGS+=/s/ -O1 / $(OPTFLAGS) /' tools/thermal/tmon/Makefile