diff options
author | zangrc <zangrc.fnst@cn.fujitsu.com> | 2020-12-19 03:20:28 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-12-18 08:23:14 -0800 |
commit | 4e5e5479c07010fb51d0c77d0eda8b3b2221db66 (patch) | |
tree | 5a054e2650e26591238c317c12d95531ea8ba954 /meta-networking/recipes-daemons | |
parent | 4a3e3f2d2d0f84b2d5190e97c9bb08717e56f639 (diff) | |
download | meta-openembedded-4e5e5479c07010fb51d0c77d0eda8b3b2221db66.tar.gz |
vblade: upgrade 24 -> 25
gcc-10.patch
Removed since this is included in 25.
Refresh the following patch:
cross.patch
makefile-add-ldflags.patch
Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-daemons')
-rw-r--r-- | meta-networking/recipes-daemons/vblade/files/cross.patch | 4 | ||||
-rw-r--r-- | meta-networking/recipes-daemons/vblade/files/gcc-10.patch | 85 | ||||
-rw-r--r-- | meta-networking/recipes-daemons/vblade/files/makefile-add-ldflags.patch | 2 | ||||
-rw-r--r-- | meta-networking/recipes-daemons/vblade/vblade_25.bb (renamed from meta-networking/recipes-daemons/vblade/vblade_24.bb) | 3 |
4 files changed, 4 insertions, 90 deletions
diff --git a/meta-networking/recipes-daemons/vblade/files/cross.patch b/meta-networking/recipes-daemons/vblade/files/cross.patch index d2eb15614..f3dc31c93 100644 --- a/meta-networking/recipes-daemons/vblade/files/cross.patch +++ b/meta-networking/recipes-daemons/vblade/files/cross.patch | |||
@@ -8,8 +8,8 @@ diff -urN vblade-19.old//makefile vblade-19//makefile | |||
8 | @@ -9,8 +9,6 @@ | 8 | @@ -9,8 +9,6 @@ |
9 | mandir = ${sharedir}/man | 9 | mandir = ${sharedir}/man |
10 | 10 | ||
11 | O=aoe.o bpf.o ${PLATFORM}.o ata.o | 11 | O=aoe.o bpf.o ${PLATFORM}.o ata.o dat.o |
12 | -CFLAGS += -Wall -g -O2 | 12 | -CFLAGS += -Wall -g -O2 -fno-common |
13 | -CC = gcc | 13 | -CC = gcc |
14 | 14 | ||
15 | vblade: $O | 15 | vblade: $O |
diff --git a/meta-networking/recipes-daemons/vblade/files/gcc-10.patch b/meta-networking/recipes-daemons/vblade/files/gcc-10.patch deleted file mode 100644 index 9a42aa369..000000000 --- a/meta-networking/recipes-daemons/vblade/files/gcc-10.patch +++ /dev/null | |||
@@ -1,85 +0,0 @@ | |||
1 | From af17efc862b9acfd63ce2ecb21f75ed890a93a5d Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20K=C3=B6lbl?= <koelblandreas@freenet.de> | ||
3 | Date: Thu, 9 Jul 2020 14:29:18 +0200 | ||
4 | Subject: [PATCH] Fix linkage of global identifiers | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Align the code to the standard and modern compilers. | ||
10 | |||
11 | Upstream-Status: Submitted [https://github.com/OpenAoE/vblade/pull/15] | ||
12 | Signed-off-by: Andreas Kölbl <koelblandreas@freenet.de> | ||
13 | --- | ||
14 | dat.c | 12 ++++++++++++ | ||
15 | dat.h | 19 ++++++++++--------- | ||
16 | makefile | 7 +++++-- | ||
17 | 3 files changed, 27 insertions(+), 11 deletions(-) | ||
18 | create mode 100644 dat.c | ||
19 | |||
20 | --- /dev/null | ||
21 | +++ b/dat.c | ||
22 | @@ -0,0 +1,12 @@ | ||
23 | +/* dat.c: Global memory for vblade AoE target */ | ||
24 | +#include "dat.h" | ||
25 | + | ||
26 | +int shelf, slot; | ||
27 | +ulong aoetag; | ||
28 | +uchar mac[6]; | ||
29 | +int bfd; // block file descriptor | ||
30 | +int sfd; // socket file descriptor | ||
31 | +vlong size; // size of vblade | ||
32 | +vlong offset; | ||
33 | +char *progname; | ||
34 | +char serial[Nserial+1]; | ||
35 | --- a/dat.h | ||
36 | +++ b/dat.h | ||
37 | @@ -1,4 +1,5 @@ | ||
38 | /* dat.h: include file for vblade AoE target */ | ||
39 | +#include <sys/types.h> | ||
40 | |||
41 | #define nil ((void *)0) | ||
42 | /* | ||
43 | @@ -163,12 +164,12 @@ enum { | ||
44 | Nserial= 20, | ||
45 | }; | ||
46 | |||
47 | -int shelf, slot; | ||
48 | -ulong aoetag; | ||
49 | -uchar mac[6]; | ||
50 | -int bfd; // block file descriptor | ||
51 | -int sfd; // socket file descriptor | ||
52 | -vlong size; // size of vblade | ||
53 | -vlong offset; | ||
54 | -char *progname; | ||
55 | -char serial[Nserial+1]; | ||
56 | +extern int shelf, slot; | ||
57 | +extern ulong aoetag; | ||
58 | +extern uchar mac[6]; | ||
59 | +extern int bfd; // block file descriptor | ||
60 | +extern int sfd; // socket file descriptor | ||
61 | +extern vlong size; // size of vblade | ||
62 | +extern vlong offset; | ||
63 | +extern char *progname; | ||
64 | +extern char serial[Nserial+1]; | ||
65 | --- a/makefile | ||
66 | +++ b/makefile | ||
67 | @@ -8,7 +8,7 @@ sbindir = ${prefix}/sbin | ||
68 | sharedir = ${prefix}/share | ||
69 | mandir = ${sharedir}/man | ||
70 | |||
71 | -O=aoe.o bpf.o ${PLATFORM}.o ata.o | ||
72 | +O=aoe.o bpf.o ${PLATFORM}.o ata.o dat.o | ||
73 | |||
74 | vblade: $O | ||
75 | ${CC} ${LDFLAGS} -o vblade $O | ||
76 | @@ -25,6 +25,9 @@ ata.o : ata.c config.h dat.h fns.h makef | ||
77 | bpf.o : bpf.c | ||
78 | ${CC} ${CFLAGS} -c $< | ||
79 | |||
80 | +dat.o : dat.c | ||
81 | + ${CC} ${CFLAGS} -c $< | ||
82 | + | ||
83 | config.h : config/config.h.in makefile | ||
84 | @if ${CC} ${CFLAGS} config/u64.c > /dev/null 2>&1; then \ | ||
85 | sh -xc "cp config/config.h.in config.h"; \ | ||
diff --git a/meta-networking/recipes-daemons/vblade/files/makefile-add-ldflags.patch b/meta-networking/recipes-daemons/vblade/files/makefile-add-ldflags.patch index a74452db6..71af47ac7 100644 --- a/meta-networking/recipes-daemons/vblade/files/makefile-add-ldflags.patch +++ b/meta-networking/recipes-daemons/vblade/files/makefile-add-ldflags.patch | |||
@@ -9,7 +9,7 @@ index 98008da..c328ba7 100644 | |||
9 | --- a/makefile | 9 | --- a/makefile |
10 | +++ b/makefile | 10 | +++ b/makefile |
11 | @@ -11,7 +11,7 @@ mandir = ${sharedir}/man | 11 | @@ -11,7 +11,7 @@ mandir = ${sharedir}/man |
12 | O=aoe.o bpf.o ${PLATFORM}.o ata.o | 12 | O=aoe.o bpf.o ${PLATFORM}.o ata.o dat.o |
13 | 13 | ||
14 | vblade: $O | 14 | vblade: $O |
15 | - ${CC} -o vblade $O | 15 | - ${CC} -o vblade $O |
diff --git a/meta-networking/recipes-daemons/vblade/vblade_24.bb b/meta-networking/recipes-daemons/vblade/vblade_25.bb index 09ba8cfd9..647abbfd2 100644 --- a/meta-networking/recipes-daemons/vblade/vblade_24.bb +++ b/meta-networking/recipes-daemons/vblade/vblade_25.bb | |||
@@ -6,11 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | |||
6 | 6 | ||
7 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/aoetools/files/vblade/" | 7 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/aoetools/files/vblade/" |
8 | 8 | ||
9 | SRCREV = "a7f48bda5bf1646f6450601049bf4b74053adbb3" | 9 | SRCREV = "5f1a0ba8b9815e3f08a3e2635a17f78bbf2a5b10" |
10 | SRC_URI = "git://github.com/OpenAoE/vblade \ | 10 | SRC_URI = "git://github.com/OpenAoE/vblade \ |
11 | file://cross.patch \ | 11 | file://cross.patch \ |
12 | file://makefile-add-ldflags.patch \ | 12 | file://makefile-add-ldflags.patch \ |
13 | file://gcc-10.patch \ | ||
14 | file://${BPN}.conf \ | 13 | file://${BPN}.conf \ |
15 | file://${BPN}.init \ | 14 | file://${BPN}.init \ |
16 | file://${BPN}.service \ | 15 | file://${BPN}.service \ |