31786f0fda
The new iscsiuio code sets CFLAGS in configure.ac, wiping out the environment setup by rpm. Patch that out. Run configure for iscsiuio and open-isns from rpm, otherwise the toplevel makefile will configure them without any arguments. Also fix local build when iscsi-initiator-utils is installed, but having the check to prevent overwriting configuration files during install look in DESTDIR.
26 lines
732 B
Diff
26 lines
732 B
Diff
From 1483a176fdbb22bbfecf06eea57d1aa200f30561 Mon Sep 17 00:00:00 2001
|
|
From: Chris Leech <cleech@redhat.com>
|
|
Date: Mon, 21 Jan 2013 15:43:36 -0800
|
|
Subject: use Red Hat version string to match RPM package version
|
|
|
|
---
|
|
usr/version.h | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/usr/version.h b/usr/version.h
|
|
index a090522..aef0c3d 100644
|
|
--- a/usr/version.h
|
|
+++ b/usr/version.h
|
|
@@ -6,7 +6,7 @@
|
|
* This may not be the same value as the kernel versions because
|
|
* some other maintainer could merge a patch without going through us
|
|
*/
|
|
-#define ISCSI_VERSION_STR "2.0-873"
|
|
+#define ISCSI_VERSION_STR "6.2.0.873-14"
|
|
#define ISCSI_VERSION_FILE "/sys/module/scsi_transport_iscsi/version"
|
|
|
|
#endif
|
|
--
|
|
1.7.11.7
|
|
|