diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2023-05-24 09:53:17 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-05-25 12:36:00 +0100 |
commit | 38c8b079808327ae6bc91484f19e32acf796a2d5 (patch) | |
tree | 066e8fc52787de4c0cd556213da607914d5d785c /meta/recipes-extended/minicom | |
parent | 829580b5545e31eb126d402d9f7fcfdb9f69e5e3 (diff) | |
download | poky-38c8b079808327ae6bc91484f19e32acf796a2d5.tar.gz |
minicom: remove unused patch files
* they were removed from SRC_URI in:
https://git.openembedded.org/openembedded-core/commit/?id=41f8760dd8a8ac388389bc17dbc5e0ae0f64bf57
(From OE-Core rev: a0f28cd8d01f4faeedc1089e5d1e2dacc5b046f9)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/minicom')
3 files changed, 0 insertions, 114 deletions
diff --git a/meta/recipes-extended/minicom/minicom/0001-Drop-superfluous-global-variable-definitions.patch b/meta/recipes-extended/minicom/minicom/0001-Drop-superfluous-global-variable-definitions.patch deleted file mode 100644 index 01b23898e7..0000000000 --- a/meta/recipes-extended/minicom/minicom/0001-Drop-superfluous-global-variable-definitions.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From b65152ebc03832972115e6d98e50cb6190d01793 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com> | ||
3 | Date: Mon, 3 Feb 2020 13:18:13 +0100 | ||
4 | Subject: [PATCH 1/3] Drop superfluous global variable definitions | ||
5 | |||
6 | The file minicom.c, by including the minicom.h header, already defines | ||
7 | the global variables 'dial_user' and 'dial_pass'. The object file | ||
8 | minicom.o is always linked to dial.o. Thus the definitions in dial.c | ||
9 | can be dropped. | ||
10 | |||
11 | This fixes linking with gcc 10 which uses -fno-common by default, | ||
12 | disallowing multiple global variable definitions. | ||
13 | |||
14 | Upstream-Status: Backport [https://salsa.debian.org/minicom-team/minicom/-/commit/db269bba2a68fde03f5df45ac8372a8f1248ca96] | ||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
16 | --- | ||
17 | src/dial.c | 2 -- | ||
18 | 1 file changed, 2 deletions(-) | ||
19 | |||
20 | diff --git a/src/dial.c b/src/dial.c | ||
21 | index eada5ee..d9d481f 100644 | ||
22 | --- a/src/dial.c | ||
23 | +++ b/src/dial.c | ||
24 | @@ -146,8 +146,6 @@ static int newtype; | ||
25 | /* Access to ".dialdir" denied? */ | ||
26 | static int dendd = 0; | ||
27 | static char *tagged; | ||
28 | -char *dial_user; | ||
29 | -char *dial_pass; | ||
30 | |||
31 | /* Change the baud rate. Treat all characters in the given array as if | ||
32 | * they were key presses within the comm parameters dialog (C-A P) and | ||
33 | -- | ||
34 | 2.24.1 | ||
35 | |||
diff --git a/meta/recipes-extended/minicom/minicom/0002-Drop-superfluous-global-variable-definitions.patch b/meta/recipes-extended/minicom/minicom/0002-Drop-superfluous-global-variable-definitions.patch deleted file mode 100644 index e86b470b7e..0000000000 --- a/meta/recipes-extended/minicom/minicom/0002-Drop-superfluous-global-variable-definitions.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From 924bd2da3a00e030e29d82b74ef82900bd50b475 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com> | ||
3 | Date: Mon, 3 Feb 2020 13:18:33 +0100 | ||
4 | Subject: [PATCH 2/3] Drop superfluous global variable definitions | ||
5 | |||
6 | The only place where the EXTERN macro mechanism is used to define the | ||
7 | global variables 'vt_outmap' and 'vt_inmap' is minicom.c (by defining | ||
8 | an empty EXTERN macro and including the minicom.h header). The file | ||
9 | vt100.c already defines these variables. The vt100.o object file is | ||
10 | always linked to minicom.o. Thus it is safe not to define the | ||
11 | variables in minicom.c and only declare them in the minicom.h header. | ||
12 | |||
13 | This fixes linking with gcc 10 which uses -fno-common by default, | ||
14 | disallowing multiple global variable definitions. | ||
15 | |||
16 | Upstream-Status: Backport [https://salsa.debian.org/minicom-team/minicom/-/commit/c69cad5b5dda85d361a3a0c1fddc65e933f26d11] | ||
17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
18 | --- | ||
19 | src/minicom.h | 2 +- | ||
20 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
21 | |||
22 | diff --git a/src/minicom.h b/src/minicom.h | ||
23 | index 061c013..0f9693b 100644 | ||
24 | --- a/src/minicom.h | ||
25 | +++ b/src/minicom.h | ||
26 | @@ -141,7 +141,7 @@ EXTERN int sbcolor; /* Status Bar Background Color */ | ||
27 | EXTERN int st_attr; /* Status Bar attributes. */ | ||
28 | |||
29 | /* jl 04.09.97 conversion tables */ | ||
30 | -EXTERN unsigned char vt_outmap[256], vt_inmap[256]; | ||
31 | +extern unsigned char vt_outmap[256], vt_inmap[256]; | ||
32 | |||
33 | /* MARK updated 02/17/95 - history buffer */ | ||
34 | EXTERN int num_hist_lines; /* History buffer size */ | ||
35 | -- | ||
36 | 2.24.1 | ||
37 | |||
diff --git a/meta/recipes-extended/minicom/minicom/0003-Drop-superfluous-global-variable-definitions.patch b/meta/recipes-extended/minicom/minicom/0003-Drop-superfluous-global-variable-definitions.patch deleted file mode 100644 index 3225a0c32a..0000000000 --- a/meta/recipes-extended/minicom/minicom/0003-Drop-superfluous-global-variable-definitions.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | From a4fc603b3641d2efe31479116eb7ba66932901c7 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com> | ||
3 | Date: Mon, 3 Feb 2020 13:21:41 +0100 | ||
4 | Subject: [PATCH 3/3] Drop superfluous global variable definitions | ||
5 | |||
6 | The only place where the EXTERN macro mechanism is used to define the | ||
7 | global variables 'portfd_is_socket', 'portfd_is_connected' and | ||
8 | 'portfd_sock_addr' is minicom.c (by defining an empty EXTERN macro and | ||
9 | including the minicom.h header). The source file sysdep1_s.c already | ||
10 | defines these variables. The sysdep1_s.o object file is always linked | ||
11 | to minicom.o. Thus it is safe to drop the definitions from minicom.c | ||
12 | and only declare the variables in the minicom.h header. | ||
13 | |||
14 | This fixes linking with gcc 10 which uses -fno-common by default, | ||
15 | disallowing multiple global variable definitions. | ||
16 | |||
17 | Upstream-Status: Backport [https://salsa.debian.org/minicom-team/minicom/-/commit/c8382374c5d340aa4115d527aed76e876ee5456b] | ||
18 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
19 | --- | ||
20 | src/minicom.h | 6 +++--- | ||
21 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
22 | |||
23 | diff --git a/src/minicom.h b/src/minicom.h | ||
24 | index 0f9693b..1e7cb8c 100644 | ||
25 | --- a/src/minicom.h | ||
26 | +++ b/src/minicom.h | ||
27 | @@ -113,9 +113,9 @@ EXTERN char *dial_user; /* Our username there */ | ||
28 | EXTERN char *dial_pass; /* Our password */ | ||
29 | |||
30 | #ifdef USE_SOCKET | ||
31 | -EXTERN int portfd_is_socket; /* File descriptor is a unix socket */ | ||
32 | -EXTERN int portfd_is_connected; /* 1 if the socket is connected */ | ||
33 | -EXTERN struct sockaddr_un portfd_sock_addr; /* the unix socket address */ | ||
34 | +extern int portfd_is_socket; /* File descriptor is a unix socket */ | ||
35 | +extern int portfd_is_connected; /* 1 if the socket is connected */ | ||
36 | +extern struct sockaddr_un portfd_sock_addr; /* the unix socket address */ | ||
37 | #define portfd_connected ((portfd_is_socket && !portfd_is_connected) \ | ||
38 | ? -1 : portfd) | ||
39 | #else | ||
40 | -- | ||
41 | 2.24.1 | ||
42 | |||