[ptxdist] [PATCH 1/2] ifplugd: Updated current patch set using git ptx-patches

[ptxdist] [PATCH 1/2] ifplugd: Updated current patch set using git ptx-patches

[Felix Mellmann]

Updated the current set of patches of the ifplugd package.
This is required to allow adding further patches to
the package by using git ptx-patches.

Signed-off-by: Felix Mellmann <flix.ptxdist@benfm.de>
---
 ...n-fails-because-of-kernel-header-inclusion.patch} | 12 +++++++++---
 patches/ifplugd-0.28/series                          |  5 ++++-
 2 files changed, 13 insertions(+), 4 deletions(-)
 rename patches/ifplugd-0.28/{ifplugd-fix-include.diff => 0001-Compilation-fails-because-of-kernel-header-inclusion.patch} (70%)

diff --git a/patches/ifplugd-0.28/ifplugd-fix-include.diff b/patches/ifplugd-0.28/0001-Compilation-fails-because-of-kernel-header-inclusion.patch
similarity index 70%
rename from patches/ifplugd-0.28/ifplugd-fix-include.diff
rename to patches/ifplugd-0.28/0001-Compilation-fails-because-of-kernel-header-inclusion.patch
index 4e305ee77..be69d8050 100644
--- a/patches/ifplugd-0.28/ifplugd-fix-include.diff
+++ b/patches/ifplugd-0.28/0001-Compilation-fails-because-of-kernel-header-inclusion.patch
@@ -1,5 +1,6 @@
 From: Ladislav Michl <ladis@linux-mips.org>
-Subject: Compilation fails because of kernel header inclusion
+Date: Mon, 31 May 2021 15:00:21 +0200
+Subject: [PATCH] Compilation fails because of kernel header inclusion
 
 Fixes the following error:
 
@@ -9,8 +10,13 @@ In file included from interface.c:27:
 
 Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
 ---
---- ifplugd-0.28/src/interface.c	2005-01-05 01:25:31.000000000 +0100
-+++ ifplugd-0.28/src/interface.c	2007-07-15 21:04:54.000000000 +0200
+ src/interface.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/interface.c b/src/interface.c
+index e5038f41ba52..352b4799ef4b 100644
+--- a/src/interface.c
++++ b/src/interface.c
 @@ -23,11 +23,9 @@
  #endif
  
diff --git a/patches/ifplugd-0.28/series b/patches/ifplugd-0.28/series
index f093c5e62..a564ff7dd 100644
--- a/patches/ifplugd-0.28/series
+++ b/patches/ifplugd-0.28/series
@@ -1 +1,4 @@
-ifplugd-fix-include.diff
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-Compilation-fails-because-of-kernel-header-inclusion.patch
+# bbf895f48ef5cf6b103f60be48b437c9  - git-ptx-patches magic
-- 
2.25.1


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

[ptxdist] [PATCH 2/2] ifplugd: Added new patch to fix a linker error with GCC10

[Felix Mellmann]

Added a new patch to the ifplugd package which resolves a
linker error when using GCC10.

Signed-off-by: Felix Mellmann <flix.ptxdist@benfm.de>
---
 ...02-Fix-linker-error-when-using-GCC10.patch | 28 +++++++++++++++++++
 patches/ifplugd-0.28/series                   |  3 +-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 patches/ifplugd-0.28/0002-Fix-linker-error-when-using-GCC10.patch

diff --git a/patches/ifplugd-0.28/0002-Fix-linker-error-when-using-GCC10.patch b/patches/ifplugd-0.28/0002-Fix-linker-error-when-using-GCC10.patch
new file mode 100644
index 000000000..b1800d7c6
--- /dev/null
+++ b/patches/ifplugd-0.28/0002-Fix-linker-error-when-using-GCC10.patch
@@ -0,0 +1,28 @@
+From: Felix Mellmann <flix.ptxdist@benfm.de>
+Date: Mon, 31 May 2021 15:05:14 +0200
+Subject: [PATCH] Fix linker error when using GCC10
+
+This patch fixes a linker error when using GCC10. Two
+variables need to be marked as external to avoid multiple
+definition.
+
+Signed-off-by: Felix Mellmann <flix.ptxdist@benfm.de>
+---
+ src/interface.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/interface.h b/src/interface.h
+index d223b1f5fabc..fd4a5f4cea63 100644
+--- a/src/interface.h
++++ b/src/interface.h
+@@ -21,8 +21,8 @@
+  * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+  */
+ 
+-int interface_auto_up;
+-int interface_do_message;
++extern int interface_auto_up;
++extern int interface_do_message;
+ 
+ typedef enum { IFSTATUS_UP, IFSTATUS_DOWN, IFSTATUS_ERR } interface_status_t;
+ 
diff --git a/patches/ifplugd-0.28/series b/patches/ifplugd-0.28/series
index a564ff7dd..1f8bb67d0 100644
--- a/patches/ifplugd-0.28/series
+++ b/patches/ifplugd-0.28/series
@@ -1,4 +1,5 @@
 # generated by git-ptx-patches
 #tag:base --start-number 1
 0001-Compilation-fails-because-of-kernel-header-inclusion.patch
-# bbf895f48ef5cf6b103f60be48b437c9  - git-ptx-patches magic
+0002-Fix-linker-error-when-using-GCC10.patch
+# 5f6a3e3cf4117f7c3e207f9b9c45eb10  - git-ptx-patches magic
-- 
2.25.1


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

Re: [ptxdist] [APPLIED] ifplugd: Updated current patch set using git ptx-patches

[Michael Olbrich]

Thanks, applied as b82b12975306f5f7da93dfee8290ff40791947e2.

Michael

[sent from post-receive hook]

On Wed, 16 Jun 2021 12:35:01 +0200, Felix Mellmann <flix.ptxdist@benfm.de> wrote:
> Updated the current set of patches of the ifplugd package.
> This is required to allow adding further patches to
> the package by using git ptx-patches.
> 
> Signed-off-by: Felix Mellmann <flix.ptxdist@benfm.de>
> Message-Id: <20210531132947.220277-1-flix.ptxdist@benfm.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/ifplugd-0.28/ifplugd-fix-include.diff b/patches/ifplugd-0.28/0001-Compilation-fails-because-of-kernel-header-inclusion.patch
> similarity index 70%
> rename from patches/ifplugd-0.28/ifplugd-fix-include.diff
> rename to patches/ifplugd-0.28/0001-Compilation-fails-because-of-kernel-header-inclusion.patch
> index 4e305ee77c35..be69d8050f0c 100644
> --- a/patches/ifplugd-0.28/ifplugd-fix-include.diff
> +++ b/patches/ifplugd-0.28/0001-Compilation-fails-because-of-kernel-header-inclusion.patch
> @@ -1,5 +1,6 @@
>  From: Ladislav Michl <ladis@linux-mips.org>
> -Subject: Compilation fails because of kernel header inclusion
> +Date: Mon, 31 May 2021 15:00:21 +0200
> +Subject: [PATCH] Compilation fails because of kernel header inclusion
>  
>  Fixes the following error:
>  
> @@ -9,8 +10,13 @@ In file included from interface.c:27:
>  
>  Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
>  ---
> ---- ifplugd-0.28/src/interface.c	2005-01-05 01:25:31.000000000 +0100
> -+++ ifplugd-0.28/src/interface.c	2007-07-15 21:04:54.000000000 +0200
> + src/interface.c | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/src/interface.c b/src/interface.c
> +index e5038f41ba52..352b4799ef4b 100644
> +--- a/src/interface.c
> ++++ b/src/interface.c
>  @@ -23,11 +23,9 @@
>   #endif
>   
> diff --git a/patches/ifplugd-0.28/series b/patches/ifplugd-0.28/series
> index f093c5e628fd..a564ff7ddc85 100644
> --- a/patches/ifplugd-0.28/series
> +++ b/patches/ifplugd-0.28/series
> @@ -1 +1,4 @@
> -ifplugd-fix-include.diff
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-Compilation-fails-because-of-kernel-header-inclusion.patch
> +# bbf895f48ef5cf6b103f60be48b437c9  - 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] ifplugd: Added new patch to fix a linker error with GCC10

[Michael Olbrich]

Thanks, applied as 1e5fab0e2e79dd79d16385abcd3c9e6ec22a7917.

Michael

[sent from post-receive hook]

On Wed, 16 Jun 2021 12:35:03 +0200, Felix Mellmann <flix.ptxdist@benfm.de> wrote:
> Added a new patch to the ifplugd package which resolves a
> linker error when using GCC10.
> 
> Signed-off-by: Felix Mellmann <flix.ptxdist@benfm.de>
> Message-Id: <20210531132947.220277-2-flix.ptxdist@benfm.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/ifplugd-0.28/0002-Fix-linker-error-when-using-GCC10.patch b/patches/ifplugd-0.28/0002-Fix-linker-error-when-using-GCC10.patch
> new file mode 100644
> index 000000000000..b1800d7c6517
> --- /dev/null
> +++ b/patches/ifplugd-0.28/0002-Fix-linker-error-when-using-GCC10.patch
> @@ -0,0 +1,28 @@
> +From: Felix Mellmann <flix.ptxdist@benfm.de>
> +Date: Mon, 31 May 2021 15:05:14 +0200
> +Subject: [PATCH] Fix linker error when using GCC10
> +
> +This patch fixes a linker error when using GCC10. Two
> +variables need to be marked as external to avoid multiple
> +definition.
> +
> +Signed-off-by: Felix Mellmann <flix.ptxdist@benfm.de>
> +---
> + src/interface.h | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/src/interface.h b/src/interface.h
> +index d223b1f5fabc..fd4a5f4cea63 100644
> +--- a/src/interface.h
> ++++ b/src/interface.h
> +@@ -21,8 +21,8 @@
> +  * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
> +  */
> + 
> +-int interface_auto_up;
> +-int interface_do_message;
> ++extern int interface_auto_up;
> ++extern int interface_do_message;
> + 
> + typedef enum { IFSTATUS_UP, IFSTATUS_DOWN, IFSTATUS_ERR } interface_status_t;
> + 
> diff --git a/patches/ifplugd-0.28/series b/patches/ifplugd-0.28/series
> index a564ff7ddc85..1f8bb67d00ed 100644
> --- a/patches/ifplugd-0.28/series
> +++ b/patches/ifplugd-0.28/series
> @@ -1,4 +1,5 @@
>  # generated by git-ptx-patches
>  #tag:base --start-number 1
>  0001-Compilation-fails-because-of-kernel-header-inclusion.patch
> -# bbf895f48ef5cf6b103f60be48b437c9  - git-ptx-patches magic
> +0002-Fix-linker-error-when-using-GCC10.patch
> +# 5f6a3e3cf4117f7c3e207f9b9c45eb10  - git-ptx-patches magic

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