[ptxdist] [PATCH 1/2] usbip: version bump 5.6 -> 5.8

[ptxdist] [PATCH 1/2] usbip: version bump 5.6 -> 5.8

[Lucas Stach]

- 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

[ptxdist] [PATCH 2/2] mxt-app: fix compilation with gcc10

[Lucas Stach]

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 ...-mxt_sigint_rx-extern-in-header-file.patch | 29 +++++++++++++++++++
 patches/mxt-app-1.28/series                   |  4 +++
 2 files changed, 33 insertions(+)
 create mode 100644 patches/mxt-app-1.28/0001-Make-mxt_sigint_rx-extern-in-header-file.patch
 create mode 100644 patches/mxt-app-1.28/series

diff --git a/patches/mxt-app-1.28/0001-Make-mxt_sigint_rx-extern-in-header-file.patch b/patches/mxt-app-1.28/0001-Make-mxt_sigint_rx-extern-in-header-file.patch
new file mode 100644
index 000000000000..a14f9df4fc0f
--- /dev/null
+++ b/patches/mxt-app-1.28/0001-Make-mxt_sigint_rx-extern-in-header-file.patch
@@ -0,0 +1,29 @@
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 11 Aug 2020 18:21:47 -0700
+Subject: [PATCH] Make mxt_sigint_rx extern in header file
+
+Its defined in src/mxt-app/signal.c like
+
+volatile sig_atomic_t mxt_sigint_rx = 0;
+
+Therefore we do not need another definition in header file, this fixes
+the build with -fno-common ( which is default with gcc 10+)
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/mxt-app/mxt_app.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/mxt-app/mxt_app.h b/src/mxt-app/mxt_app.h
+index daa1519ce10d..a326a9d49b50 100644
+--- a/src/mxt-app/mxt_app.h
++++ b/src/mxt-app/mxt_app.h
+@@ -103,7 +103,7 @@ typedef enum mxt_app_cmd_t {
+ 
+ //******************************************************************************
+ /// \brief Signal handler semaphore
+-volatile sig_atomic_t mxt_sigint_rx;
++extern volatile sig_atomic_t mxt_sigint_rx;
+ 
+ struct t37_diagnostic_data;
+ struct mxt_conn_info;
diff --git a/patches/mxt-app-1.28/series b/patches/mxt-app-1.28/series
new file mode 100644
index 000000000000..133b77ee1312
--- /dev/null
+++ b/patches/mxt-app-1.28/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-Make-mxt_sigint_rx-extern-in-header-file.patch
+# 6096d6b079bf36345ab6e22b1ec90c28  - git-ptx-patches magic
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] mxt-app: fix compilation with gcc10

[Michael Olbrich]

Thanks, applied as e79956d2b909bd40fdc5e1cfad2086e70728030e.

Michael

[sent from post-receive hook]

On Wed, 14 Oct 2020 12:30:45 +0200, Lucas Stach <l.stach@pengutronix.de> wrote:
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20200928161032.13579-2-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/mxt-app-1.28/0001-Make-mxt_sigint_rx-extern-in-header-file.patch b/patches/mxt-app-1.28/0001-Make-mxt_sigint_rx-extern-in-header-file.patch
> new file mode 100644
> index 000000000000..a14f9df4fc0f
> --- /dev/null
> +++ b/patches/mxt-app-1.28/0001-Make-mxt_sigint_rx-extern-in-header-file.patch
> @@ -0,0 +1,29 @@
> +From: Khem Raj <raj.khem@gmail.com>
> +Date: Tue, 11 Aug 2020 18:21:47 -0700
> +Subject: [PATCH] Make mxt_sigint_rx extern in header file
> +
> +Its defined in src/mxt-app/signal.c like
> +
> +volatile sig_atomic_t mxt_sigint_rx = 0;
> +
> +Therefore we do not need another definition in header file, this fixes
> +the build with -fno-common ( which is default with gcc 10+)
> +
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> +---
> + src/mxt-app/mxt_app.h | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/src/mxt-app/mxt_app.h b/src/mxt-app/mxt_app.h
> +index daa1519ce10d..a326a9d49b50 100644
> +--- a/src/mxt-app/mxt_app.h
> ++++ b/src/mxt-app/mxt_app.h
> +@@ -103,7 +103,7 @@ typedef enum mxt_app_cmd_t {
> + 
> + //******************************************************************************
> + /// \brief Signal handler semaphore
> +-volatile sig_atomic_t mxt_sigint_rx;
> ++extern volatile sig_atomic_t mxt_sigint_rx;
> + 
> + struct t37_diagnostic_data;
> + struct mxt_conn_info;
> diff --git a/patches/mxt-app-1.28/series b/patches/mxt-app-1.28/series
> new file mode 100644
> index 000000000000..133b77ee1312
> --- /dev/null
> +++ b/patches/mxt-app-1.28/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-Make-mxt_sigint_rx-extern-in-header-file.patch
> +# 6096d6b079bf36345ab6e22b1ec90c28  - git-ptx-patches magic

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] usbip: version bump 5.6 -> 5.8

[Michael Olbrich]

Thanks, applied as 88dc1299a69ea2c404a3846130b8f1adb223917d.

Michael

[sent from post-receive hook]

On Wed, 14 Oct 2020 12:30:44 +0200, Lucas Stach <l.stach@pengutronix.de> wrote:
> - 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>
> 
> 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)

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de