diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2020-01-29 00:55:59 +0100 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2020-01-29 00:55:59 +0100 |
| commit | 1eb911922a7e818a6f314a68c0561bba008e6efd (patch) | |
| tree | 9b647e44195a0a0876b40cbf5fa42dca0641179f /main/open-iscsi | |
| parent | d420552f02af2ad6a15cf3a70b76bf86b222c07e (diff) | |
| download | aports-1eb911922a7e818a6f314a68c0561bba008e6efd.tar.bz2 aports-1eb911922a7e818a6f314a68c0561bba008e6efd.tar.xz | |
Remove stale patches in main/
Diffstat (limited to 'main/open-iscsi')
| -rw-r--r-- | main/open-iscsi/ldflags.patch | 35 | ||||
| -rw-r--r-- | main/open-iscsi/open-iscsi-include-sysmacros.patch | 20 | ||||
| -rw-r--r-- | main/open-iscsi/static-inline.patch | 13 |
3 files changed, 0 insertions, 68 deletions
diff --git a/main/open-iscsi/ldflags.patch b/main/open-iscsi/ldflags.patch deleted file mode 100644 index f039f99284..0000000000 --- a/main/open-iscsi/ldflags.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/usr/Makefile b/usr/Makefile -index f9445ad..6d8ff62 100644 ---- a/usr/Makefile -+++ b/usr/Makefile -@@ -60,14 +60,14 @@ all: $(PROGRAMS) - - iscsid: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(DISCOVERY_SRCS) \ - iscsid.o session_mgmt.o discoveryd.o mntcheck.o -- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lisns -lcrypto -lrt -lmount $(ISCSI_LIB) -+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lisns -lcrypto -lrt -lmount $(ISCSI_LIB) $(LDFLAGS) - - iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o mntcheck.o -- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lisns -lcrypto -lmount $(ISCSI_LIB) -+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lisns -lcrypto -lmount $(ISCSI_LIB) $(LDFLAGS) - - iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ - iscsistart.o statics.o -- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lrt $(ISCSI_LIB) -+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lrt $(ISCSI_LIB) $(LDFLAGS) - clean: - rm -f *.o $(PROGRAMS) .depend $(LIBSYS) - -diff --git a/utils/Makefile b/utils/Makefile -index f65f1e7..472a1b4 100644 ---- a/utils/Makefile -+++ b/utils/Makefile -@@ -7,7 +7,7 @@ PROGRAMS = iscsi-iname - all: $(PROGRAMS) - - iscsi-iname: md5.o iscsi-iname.o -- $(CC) $(CFLAGS) $(LDFLAGS) $^ $(DBM_LIB) -o $@ -+ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(DBM_LIB) -o $@ $(LDFLAGS) - - clean: - rm -f *.o $(PROGRAMS) .depend diff --git a/main/open-iscsi/open-iscsi-include-sysmacros.patch b/main/open-iscsi/open-iscsi-include-sysmacros.patch deleted file mode 100644 index 42d60201e3..0000000000 --- a/main/open-iscsi/open-iscsi-include-sysmacros.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/iscsiuio/src/unix/libs/bnx2x.c -+++ b/iscsiuio/src/unix/libs/bnx2x.c -@@ -47,6 +47,7 @@ - #include <sys/mman.h> - #include <sys/ioctl.h> - #include <sys/types.h> -+#include <sys/sysmacros.h> - #include <sys/stat.h> - #include <sys/user.h> - #include <fcntl.h> ---- a/iscsiuio/src/unix/libs/bnx2.c -+++ b/iscsiuio/src/unix/libs/bnx2.c -@@ -42,6 +42,7 @@ - #include <arpa/inet.h> - #include <sys/mman.h> - #include <sys/types.h> -+#include <sys/sysmacros.h> - #include <sys/stat.h> - #include <sys/user.h> - #include <fcntl.h> diff --git a/main/open-iscsi/static-inline.patch b/main/open-iscsi/static-inline.patch deleted file mode 100644 index 3be54b6a31..0000000000 --- a/main/open-iscsi/static-inline.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/iscsiuio/src/uip/ipv6.c b/iscsiuio/src/uip/ipv6.c -index ced98a6..05efa73 100644 ---- a/iscsiuio/src/uip/ipv6.c -+++ b/iscsiuio/src/uip/ipv6.c -@@ -49,7 +49,7 @@ - #include "dhcpv6.h" - #include "ping.h" - --inline int best_match_bufcmp(u8_t *a, u8_t *b, int len) -+static inline int best_match_bufcmp(u8_t *a, u8_t *b, int len) - { - int i; - |