rpm/qemu
SHA256
1
0
Fork 0
forked from pool/qemu
Code Pull Requests Activity
9dd3bf90ea
qemu/0031-Switch-order-of-libraries-for-mpath.patch

37 lines
1.1 KiB
Diff
Raw Normal View History

Accepting request 556837 from Virtualization:Staging Update to v2.11.0. Additional changes related to SLE-15. OBS-URL: https://build.opensuse.org/request/show/556837 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=378
2017-12-14 01:53:24 +01:00
From: Bruce Rogers <brogers@suse.com>
Date: Fri, 3 Nov 2017 11:12:40 -0600
Accepting request 662931 from home:bfrogers:branches:Virtualization 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
2019-01-04 22:08:16 +01:00
Subject: Switch order of libraries for mpath support
Accepting request 556837 from Virtualization:Staging Update to v2.11.0. Additional changes related to SLE-15. OBS-URL: https://build.opensuse.org/request/show/556837 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=378
2017-12-14 01:53:24 +01:00
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
Accepting request 655897 from Virtualization:Staging Update to qemu 3.1.0-rc5. Is almost certainly the last rc, so should be same as 3.1.0 final. Putting into devel project 'early' because of SLE and Leap needs, not to get into Factory early. Look for the final 3.1 within a week. OBS-URL: https://build.opensuse.org/request/show/655897 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=433
2018-12-06 22:20:59 +01:00
index f2947186a4..ea30cd3fb6 100644
Accepting request 556837 from Virtualization:Staging Update to v2.11.0. Additional changes related to SLE-15. OBS-URL: https://build.opensuse.org/request/show/556837 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=378
2017-12-14 01:53:24 +01:00
--- a/Makefile
+++ b/Makefile
Accepting request 655897 from Virtualization:Staging Update to qemu 3.1.0-rc5. Is almost certainly the last rc, so should be same as 3.1.0 final. Putting into devel project 'early' because of SLE and Leap needs, not to get into Factory early. Look for the final 3.1 within a week. OBS-URL: https://build.opensuse.org/request/show/655897 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=433
2018-12-06 22:20:59 +01:00
@@ -551,7 +551,7 @@ fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap
Accepting request 556837 from Virtualization:Staging Update to v2.11.0. Additional changes related to SLE-15. OBS-URL: https://build.opensuse.org/request/show/556837 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=378
2017-12-14 01:53:24 +01:00
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
Accepting request 655897 from Virtualization:Staging Update to qemu 3.1.0-rc5. Is almost certainly the last rc, so should be same as 3.1.0 final. Putting into devel project 'early' because of SLE and Leap needs, not to get into Factory early. Look for the final 3.1 within a week. OBS-URL: https://build.opensuse.org/request/show/655897 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=433
2018-12-06 22:20:59 +01:00
index 0a3c6a72c3..84cd35c1b9 100755
Accepting request 556837 from Virtualization:Staging Update to v2.11.0. Additional changes related to SLE-15. OBS-URL: https://build.opensuse.org/request/show/556837 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=378
2017-12-14 01:53:24 +01:00
--- a/configure
+++ b/configure
Accepting request 655897 from Virtualization:Staging Update to qemu 3.1.0-rc5. Is almost certainly the last rc, so should be same as 3.1.0 final. Putting into devel project 'early' because of SLE and Leap needs, not to get into Factory early. Look for the final 3.1 within a week. OBS-URL: https://build.opensuse.org/request/show/655897 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=433
2018-12-06 22:20:59 +01:00
@@ -3594,7 +3594,7 @@ int main(void) {
Accepting request 556837 from Virtualization:Staging Update to v2.11.0. Additional changes related to SLE-15. OBS-URL: https://build.opensuse.org/request/show/556837 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=378
2017-12-14 01:53:24 +01:00
return 0;
}
EOF
- if compile_prog "" "-ludev -lmultipath -lmpathpersist" ; then
+ if compile_prog "" "-ludev -lmpathpersist -lmultipath" ; then
mpathpersist=yes
Accepting request 655897 from Virtualization:Staging Update to qemu 3.1.0-rc5. Is almost certainly the last rc, so should be same as 3.1.0 final. Putting into devel project 'early' because of SLE and Leap needs, not to get into Factory early. Look for the final 3.1 within a week. OBS-URL: https://build.opensuse.org/request/show/655897 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=433
2018-12-06 22:20:59 +01:00
mpathpersist_new_api=yes
Accepting request 556837 from Virtualization:Staging Update to v2.11.0. Additional changes related to SLE-15. OBS-URL: https://build.opensuse.org/request/show/556837 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=378
2017-12-14 01:53:24 +01:00
else
Copy Permalink