|
 |
2c41582 |
From d4758b0d347e4adccf4d39e6bd29ba68c53a92b8 Mon Sep 17 00:00:00 2001
|
|
|
2c41582 |
From: rpm-build <rpm-build>
|
|
|
2c41582 |
Date: Tue, 3 Mar 2020 10:35:40 -0800
|
|
|
2c41582 |
Subject: [PATCH 1/1] stop using Werror for now
|
|
|
2c41582 |
|
|
|
2c41582 |
need to work through these warning that only appear on s390x
|
|
|
2c41582 |
Werror seems bad for release, makes packaging a nightmare when new
|
|
|
2c41582 |
compilers come around
|
|
|
2c41582 |
---
|
|
|
2c41582 |
Makefile | 2 +-
|
|
|
2c41582 |
usr/Makefile | 2 +-
|
|
|
2c41582 |
usr/initiator.c | 2 +-
|
|
|
2c41582 |
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
2c41582 |
|
|
|
2c41582 |
diff --git a/Makefile b/Makefile
|
|
|
2c41582 |
index 7e6b734..0069e75 100644
|
|
|
2c41582 |
--- a/Makefile
|
|
|
2c41582 |
+++ b/Makefile
|
|
|
2c41582 |
@@ -7,7 +7,7 @@
|
|
|
2c41582 |
DESTDIR ?=
|
|
|
2c41582 |
|
|
|
2c41582 |
prefix = /usr
|
|
|
2c41582 |
-exec_prefix = /
|
|
|
2c41582 |
+exec_prefix = /usr
|
|
|
2c41582 |
sbindir = $(exec_prefix)/sbin
|
|
|
2c41582 |
bindir = $(exec_prefix)/bin
|
|
|
2c41582 |
mandir = $(prefix)/share/man
|
|
|
2c41582 |
diff --git a/usr/Makefile b/usr/Makefile
|
|
|
2c41582 |
index 885243a..1a743d1 100644
|
|
|
2c41582 |
--- a/usr/Makefile
|
|
|
2c41582 |
+++ b/usr/Makefile
|
|
|
2c41582 |
@@ -35,7 +35,7 @@ endif
|
|
|
2c41582 |
PKG_CONFIG = /usr/bin/pkg-config
|
|
|
2c41582 |
|
|
|
2c41582 |
CFLAGS ?= -O2 -g
|
|
|
2c41582 |
-WARNFLAGS ?= -Wall -Wextra -Werror -Wstrict-prototypes -fno-common
|
|
|
2c41582 |
+WARNFLAGS ?= -Wall -Wextra -Wstrict-prototypes -fno-common
|
|
|
2c41582 |
CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \
|
|
|
2c41582 |
-I$(TOPDIR)/libopeniscsiusr -DISNS_ENABLE
|
|
|
2c41582 |
CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod)
|
|
|
2c41582 |
diff --git a/usr/initiator.c b/usr/initiator.c
|
|
|
2c41582 |
index a07f9aa..a06760c 100644
|
|
|
2c41582 |
--- a/usr/initiator.c
|
|
|
2c41582 |
+++ b/usr/initiator.c
|
|
|
2c41582 |
@@ -580,7 +580,7 @@ __session_conn_reopen(iscsi_conn_t *conn, queue_task_t *qtask, int do_stop,
|
|
|
2c41582 |
int redirected)
|
|
|
2c41582 |
{
|
|
|
2c41582 |
iscsi_session_t *session = conn->session;
|
|
|
2c41582 |
- uint32_t delay;
|
|
|
2c41582 |
+ uint32_t delay = 0;
|
|
|
2c41582 |
|
|
|
2c41582 |
log_debug(1, "re-opening session %d (reopen_cnt %d)", session->id,
|
|
|
2c41582 |
session->reopen_cnt);
|
|
|
2c41582 |
--
|
|
|
2c41582 |
2.21.1
|
|
|
2c41582 |
|