3977e7cae6
Follow up on ideas prompted by last change: clean up the patches generated by git workflow. There is no value to the first line (mbox From line), or [PATCH] on subject line. Get rid of those. Other minor fixes and improvements to update_git.sh OBS-URL: https://build.opensuse.org/request/show/662931 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=443
37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
From: Bruce Rogers <brogers@suse.com>
|
|
Date: Fri, 3 Nov 2017 11:12:40 -0600
|
|
Subject: Switch order of libraries for mpath support
|
|
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
Makefile | 2 +-
|
|
configure | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index f2947186a4..ea30cd3fb6 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -551,7 +551,7 @@ fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap
|
|
|
|
scsi/qemu-pr-helper$(EXESUF): scsi/qemu-pr-helper.o scsi/utils.o $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS)
|
|
ifdef CONFIG_MPATH
|
|
-scsi/qemu-pr-helper$(EXESUF): LIBS += -ludev -lmultipath -lmpathpersist
|
|
+scsi/qemu-pr-helper$(EXESUF): LIBS += -ludev -lmpathpersist -lmultipath
|
|
endif
|
|
|
|
qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool
|
|
diff --git a/configure b/configure
|
|
index 0a3c6a72c3..84cd35c1b9 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -3594,7 +3594,7 @@ int main(void) {
|
|
return 0;
|
|
}
|
|
EOF
|
|
- if compile_prog "" "-ludev -lmultipath -lmpathpersist" ; then
|
|
+ if compile_prog "" "-ludev -lmpathpersist -lmultipath" ; then
|
|
mpathpersist=yes
|
|
mpathpersist_new_api=yes
|
|
else
|