diff options
Diffstat (limited to 'net/vblade/files')
-rw-r--r-- | net/vblade/files/patch-freebsd.c | 29 | ||||
-rw-r--r-- | net/vblade/files/patch-makefile | 29 |
2 files changed, 0 insertions, 58 deletions
diff --git a/net/vblade/files/patch-freebsd.c b/net/vblade/files/patch-freebsd.c deleted file mode 100644 index 4bc6d4b5319c..000000000000 --- a/net/vblade/files/patch-freebsd.c +++ /dev/null @@ -1,29 +0,0 @@ ---- freebsd.c.orig 2015-01-28 07:26:22.000000000 +0600 -+++ freebsd.c 2015-01-28 07:29:23.000000000 +0600 -@@ -25,7 +25,7 @@ - #include <sys/types.h> - #include <net/if.h> - #include <sys/stat.h> --#include <sys/disklabel.h> -+#include <sys/disk.h> - #include <sys/select.h> - #include <sys/sysctl.h> - -@@ -267,14 +267,14 @@ - vlong - getsize(int fd) - { -+ off_t media_size; - vlong size; - struct stat s; - int n; -- struct disklabel lab; - - // Try getting disklabel from block dev -- if ((n = ioctl(fd, DIOCGDINFO, lab)) != -1) { -- size = lab.d_secsize * lab.d_secperunit; -+ if ((n = ioctl(fd, DIOCGMEDIASIZE, &media_size)) != -1) { -+ size = media_size; - } else { - // must not be a block special dev - if (fstat(fd, &s) == -1) { diff --git a/net/vblade/files/patch-makefile b/net/vblade/files/patch-makefile deleted file mode 100644 index e02e101b136c..000000000000 --- a/net/vblade/files/patch-makefile +++ /dev/null @@ -1,29 +0,0 @@ ---- makefile.orig 2008-10-09 05:07:40.000000000 +0800 -+++ makefile 2014-06-24 15:09:56.936151781 +0800 -@@ -3,14 +3,12 @@ - # see README for others - PLATFORM=linux - --prefix = /usr -+prefix = ${PREFIX} - sbindir = ${prefix}/sbin --sharedir = ${prefix}/share --mandir = ${sharedir}/man -+mandir = ${prefix}/man - - O=aoe.o bpf.o ${PLATFORM}.o ata.o - CFLAGS += -Wall -g -O2 --CC = gcc - - vblade: $O - ${CC} -o vblade $O -@@ -38,6 +36,6 @@ clean : - rm -f $O vblade - - install : vblade vbladed -- install vblade ${sbindir}/ -- install vbladed ${sbindir}/ -- install vblade.8 ${mandir}/man8/ -+ ${INSTALL_PROGRAM} vblade $(DESTDIR)${sbindir}/ -+ ${INSTALL_SCRIPT} vbladed $(DESTDIR)${sbindir}/ -+ ${INSTALL_MAN} vblade.8 $(DESTDIR)${mandir}/man8/ |