diff options
Diffstat (limited to 'sys-block/vblade/files')
| -rw-r--r-- | sys-block/vblade/files/vblade-24-fno-common.patch | 48 | ||||
| -rw-r--r-- | sys-block/vblade/files/vblade-24-makefile.patch | 35 |
2 files changed, 0 insertions, 83 deletions
diff --git a/sys-block/vblade/files/vblade-24-fno-common.patch b/sys-block/vblade/files/vblade-24-fno-common.patch deleted file mode 100644 index 2a51ddea4708..000000000000 --- a/sys-block/vblade/files/vblade-24-fno-common.patch +++ /dev/null @@ -1,48 +0,0 @@ -Taken from: https://github.com/OpenAoE/vblade/pull/15 -Author: Andreas Kölbl <koelblandreas@freenet.de> - ---- /dev/null -+++ b/dat.c -@@ -0,0 +1,12 @@ -+/* dat.c: Global memory for vblade AoE target */ -+#include "dat.h" -+ -+int shelf, slot; -+ulong aoetag; -+uchar mac[6]; -+int bfd; // block file descriptor -+int sfd; // socket file descriptor -+vlong size; // size of vblade -+vlong offset; -+char *progname; -+char serial[Nserial+1]; ---- a/dat.h -+++ b/dat.h -@@ -1,4 +1,5 @@ - /* dat.h: include file for vblade AoE target */ -+#include <sys/types.h> - - #define nil ((void *)0) - /* -@@ -163,12 +164,12 @@ enum { - Nserial= 20, - }; - --int shelf, slot; --ulong aoetag; --uchar mac[6]; --int bfd; // block file descriptor --int sfd; // socket file descriptor --vlong size; // size of vblade --vlong offset; --char *progname; --char serial[Nserial+1]; -+extern int shelf, slot; -+extern ulong aoetag; -+extern uchar mac[6]; -+extern int bfd; // block file descriptor -+extern int sfd; // socket file descriptor -+extern vlong size; // size of vblade -+extern vlong offset; -+extern char *progname; -+extern char serial[Nserial+1]; diff --git a/sys-block/vblade/files/vblade-24-makefile.patch b/sys-block/vblade/files/vblade-24-makefile.patch deleted file mode 100644 index ed5efb2c2e23..000000000000 --- a/sys-block/vblade/files/vblade-24-makefile.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- a/makefile -+++ b/makefile -@@ -8,27 +8,22 @@ - sharedir = ${prefix}/share - mandir = ${sharedir}/man - --O=aoe.o bpf.o ${PLATFORM}.o ata.o --CFLAGS += -Wall -g -O2 --CC = gcc -+O=aoe.o bpf.o ${PLATFORM}.o ata.o dat.o -+CFLAGS += -Wall - - vblade: $O -- ${CC} -o vblade $O -+ ${CC} ${LDFLAGS} -o vblade $O ${LIBS} - - aoe.o : aoe.c config.h dat.h fns.h makefile -- ${CC} ${CFLAGS} -c $< - - ${PLATFORM}.o : ${PLATFORM}.c config.h dat.h fns.h makefile -- ${CC} ${CFLAGS} -c $< - - ata.o : ata.c config.h dat.h fns.h makefile -- ${CC} ${CFLAGS} -c $< - --bpf.o : bpf.c -- ${CC} ${CFLAGS} -c $< -+dat.o : dat.c - - config.h : config/config.h.in makefile -- @if ${CC} ${CFLAGS} config/u64.c > /dev/null 2>&1; then \ -+ @if ${CC} ${CFLAGS} ${CPPFLAGS} config/u64.c > /dev/null 2>&1; then \ - sh -xc "cp config/config.h.in config.h"; \ - else \ - sh -xc "sed 's!^//u64 !!' config/config.h.in > config.h"; \ |