|
|
@@ -0,0 +1,49 @@
|
|
|
+Subject: Fix build breakage with gcc-10 / -fno-common
|
|
|
+Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
|
|
|
+Date: 2020-04-19
|
|
|
+Bug-Debian: https://bugs.debian.org/957908
|
|
|
+Forwarded: https://sourceforge.net/p/aoetools/mailman/message/36986207/
|
|
|
+
|
|
|
+--- a/dat.h
|
|
|
++++ b/dat.h
|
|
|
+@@ -163,12 +163,12 @@
|
|
|
+ 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];
|
|
|
+--- a/aoe.c
|
|
|
++++ b/aoe.c
|
|
|
+@@ -28,6 +28,16 @@
|
|
|
+ char *ifname;
|
|
|
+ int bufcnt = Bufcount;
|
|
|
+
|
|
|
++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];
|
|
|
++
|
|
|
+ void
|
|
|
+ aoead(int fd) // advertise the virtual blade
|
|
|
+ {
|
Christoph Biedl