From 5c2de3daedd3f65171b9debf938683ce6e7746ea Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 5 Jun 2020 15:31:28 -0400 Subject: Revert "libvirt: fix patch fuzz warning" This reverts commit 237879d59e11187a49216a88b73a057408e4b3f7. --- .../0001-build-drop-unnecessary-libgnu.la-reference.patch | 6 ++++-- ...1-ptest-Remove-Windows-1252-check-from-esxutilstest.patch | 2 +- .../libvirt/libvirt/0001-to-fix-build-error.patch | 12 ++++++------ .../configure.ac-search-for-rpc-rpc.h-in-the-sysroot.patch | 2 +- recipes-extended/libvirt/libvirt/install-missing-file.patch | 10 +++++----- .../libvirt/libvirt-use-pkg-config-to-locate-libcap.patch | 2 +- recipes-extended/libvirt/libvirt/runptest.patch | 8 ++++---- ...ools-add-libvirt-net-rpc-to-virt-host-validate-when.patch | 2 +- 8 files changed, 23 insertions(+), 21 deletions(-) diff --git a/recipes-extended/libvirt/libvirt/0001-build-drop-unnecessary-libgnu.la-reference.patch b/recipes-extended/libvirt/libvirt/0001-build-drop-unnecessary-libgnu.la-reference.patch index f02a5d64..952e8eb0 100644 --- a/recipes-extended/libvirt/libvirt/0001-build-drop-unnecessary-libgnu.la-reference.patch +++ b/recipes-extended/libvirt/libvirt/0001-build-drop-unnecessary-libgnu.la-reference.patch @@ -1,10 +1,9 @@ -From 30a056069cb35804434fb036e51ae97f33c02025 Mon Sep 17 00:00:00 2001 +From 4945576d6c5c7cc9a21a58aaa312829567af13db Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Sat, 7 Mar 2020 21:36:27 -0500 Subject: [PATCH] build: drop unnecessary libgnu.la reference Signed-off-by: Bruce Ashfield - --- tools/Makefile.am | 2 -- 1 file changed, 2 deletions(-) @@ -29,3 +28,6 @@ index 2a0a989..93fe283 100644 $(NULL) endif +-- +2.19.1 + diff --git a/recipes-extended/libvirt/libvirt/0001-ptest-Remove-Windows-1252-check-from-esxutilstest.patch b/recipes-extended/libvirt/libvirt/0001-ptest-Remove-Windows-1252-check-from-esxutilstest.patch index abb0b1af..02e99ecd 100644 --- a/recipes-extended/libvirt/libvirt/0001-ptest-Remove-Windows-1252-check-from-esxutilstest.patch +++ b/recipes-extended/libvirt/libvirt/0001-ptest-Remove-Windows-1252-check-from-esxutilstest.patch @@ -1,4 +1,4 @@ -From 7b265b06ca432c8d90df1af8e89f4b919b748ac2 Mon Sep 17 00:00:00 2001 +From 1601c21b653bf2bea2547e5efcf1f3cbb8b73f65 Mon Sep 17 00:00:00 2001 From: He Zhe Date: Tue, 23 Aug 2016 02:28:47 -0400 Subject: [PATCH] ptest: Remove Windows-1252 check from esxutilstest diff --git a/recipes-extended/libvirt/libvirt/0001-to-fix-build-error.patch b/recipes-extended/libvirt/libvirt/0001-to-fix-build-error.patch index b0148e5c..33231960 100644 --- a/recipes-extended/libvirt/libvirt/0001-to-fix-build-error.patch +++ b/recipes-extended/libvirt/libvirt/0001-to-fix-build-error.patch @@ -1,4 +1,4 @@ -From 3566bcacaa6408fb8f655d1749a20b2f30e0c765 Mon Sep 17 00:00:00 2001 +From 7cf1d66c4b01c40b45b8a38370c7ffee46dfb10a Mon Sep 17 00:00:00 2001 From: Lei Maohui Date: Fri, 31 Jul 2015 03:17:07 +0900 Subject: [PATCH] to fix build error @@ -23,10 +23,10 @@ Signed-off-by: Mark Asselstine 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am -index ce3d296..2c8180f 100644 +index 61862c4..c259535 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am -@@ -366,7 +366,7 @@ EXTRA_DIST= \ +@@ -360,7 +360,7 @@ EXTRA_DIST= \ aclperms.htmlinc \ $(schema_DATA) @@ -35,7 +35,7 @@ index ce3d296..2c8180f 100644 aclperms.htmlinc: $(top_srcdir)/src/access/viraccessperm.h \ $(top_srcdir)/scripts/genaclperms.py Makefile.am -@@ -432,8 +432,7 @@ manpages/%.html.in: manpages/%.rst +@@ -426,8 +426,7 @@ manpages/%.html.in: manpages/%.rst $(AM_V_GEN)$(MKDIR_P) `dirname $@` && \ $(RST2HTML) --strict $< > $@ || { rm $@ && exit 1; } @@ -43,5 +43,5 @@ index ce3d296..2c8180f 100644 - $(acl_generated) +%.html.tmp: %.html.in site.xsl subsite.xsl page.xsl $(AM_V_GEN)name=`echo $@ | sed -e 's/.tmp//'`; \ - genhtmlin=`echo $@ | sed -e 's/.tmp/.in/'`; \ - rst=`echo $@ | sed -e 's/.html.tmp/.rst/'`; \ + dir=`dirname $@` ; \ + if test "$$dir" = "."; \ diff --git a/recipes-extended/libvirt/libvirt/configure.ac-search-for-rpc-rpc.h-in-the-sysroot.patch b/recipes-extended/libvirt/libvirt/configure.ac-search-for-rpc-rpc.h-in-the-sysroot.patch index 395d5610..eb75b5a4 100644 --- a/recipes-extended/libvirt/libvirt/configure.ac-search-for-rpc-rpc.h-in-the-sysroot.patch +++ b/recipes-extended/libvirt/libvirt/configure.ac-search-for-rpc-rpc.h-in-the-sysroot.patch @@ -1,4 +1,4 @@ -From 79f5975db01af0599860ccca7ef44b0e27105a04 Mon Sep 17 00:00:00 2001 +From d074f34dd0fc671ab05367eda9cc7a965708fbed Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Thu, 10 May 2018 12:05:04 -0400 Subject: [PATCH] configure.ac: search for rpc/rpc.h in the sysroot diff --git a/recipes-extended/libvirt/libvirt/install-missing-file.patch b/recipes-extended/libvirt/libvirt/install-missing-file.patch index 6aa36df8..f9341491 100644 --- a/recipes-extended/libvirt/libvirt/install-missing-file.patch +++ b/recipes-extended/libvirt/libvirt/install-missing-file.patch @@ -1,4 +1,4 @@ -From aa75f5136066d239d48a21373b3d96ee12378e8d Mon Sep 17 00:00:00 2001 +From 75c974d28133ff85d299b7a53427653c47513a45 Mon Sep 17 00:00:00 2001 From: Dengke Du Date: Wed, 8 May 2019 17:24:17 +0800 Subject: [PATCH] Install missing conf file @@ -20,10 +20,10 @@ Signed-off-by: Dengke Du 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am -index 4a808dd..0c3e799 100644 +index 7a0aee3..380637d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -173,6 +173,7 @@ EXTRA_DIST = \ +@@ -172,6 +172,7 @@ EXTRA_DIST = \ $(NULL) test_helpers = commandhelper ssh @@ -31,7 +31,7 @@ index 4a808dd..0c3e799 100644 test_programs = virshtest sockettest \ virhostcputest virbuftest \ commandtest seclabeltest \ -@@ -311,6 +312,7 @@ endif WITH_LXC +@@ -310,6 +311,7 @@ endif WITH_LXC if WITH_OPENVZ test_programs += openvzutilstest @@ -39,7 +39,7 @@ index 4a808dd..0c3e799 100644 endif WITH_OPENVZ if WITH_ESX -@@ -1551,7 +1553,7 @@ endif ! WITH_LINUX +@@ -1553,7 +1555,7 @@ endif ! WITH_LINUX buildtest-TESTS: $(TESTS) $(test_libraries) $(test_helpers) diff --git a/recipes-extended/libvirt/libvirt/libvirt-use-pkg-config-to-locate-libcap.patch b/recipes-extended/libvirt/libvirt/libvirt-use-pkg-config-to-locate-libcap.patch index 87b55915..e6c7cae5 100644 --- a/recipes-extended/libvirt/libvirt/libvirt-use-pkg-config-to-locate-libcap.patch +++ b/recipes-extended/libvirt/libvirt/libvirt-use-pkg-config-to-locate-libcap.patch @@ -1,4 +1,4 @@ -From 94bd514e1b6e602a48285db94e65050f8f0c2585 Mon Sep 17 00:00:00 2001 +From 57b645c6db405bf2e22f4589ea5560a14975058f Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 8 Apr 2015 13:03:03 -0400 Subject: [PATCH] libvirt: use pkg-config to locate libcap diff --git a/recipes-extended/libvirt/libvirt/runptest.patch b/recipes-extended/libvirt/libvirt/runptest.patch index f6bc7736..9f3ad678 100644 --- a/recipes-extended/libvirt/libvirt/runptest.patch +++ b/recipes-extended/libvirt/libvirt/runptest.patch @@ -1,4 +1,4 @@ -From d210838a4433dd254c1a11b08b804ebe9ff5f378 Mon Sep 17 00:00:00 2001 +From 9d6bfb4a5e9b44c080ddf3bad4c364ffb0e9d84a Mon Sep 17 00:00:00 2001 From: Dengke Du Date: Wed, 8 May 2019 10:20:47 +0800 Subject: [PATCH] Add 'install-ptest' rule @@ -23,7 +23,7 @@ Signed-off-by: Dengke Du 1 file changed, 60 insertions(+), 8 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am -index ada5b8f..4a808dd 100644 +index 83326db..7a0aee3 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -28,11 +28,13 @@ AM_CPPFLAGS = \ @@ -44,7 +44,7 @@ index ada5b8f..4a808dd 100644 $(LIBXML_CFLAGS) \ $(GLIB_CFLAGS) \ $(LIBNL_CFLAGS) \ -@@ -474,10 +476,10 @@ TESTS = $(test_programs) \ +@@ -472,10 +474,10 @@ TESTS = $(test_programs) \ VIR_TEST_EXPENSIVE ?= $(VIR_TEST_EXPENSIVE_DEFAULT) TESTS_ENVIRONMENT = \ @@ -59,7 +59,7 @@ index ada5b8f..4a808dd 100644 LIBVIRT_AUTOSTART=0 \ LC_ALL=C \ VIR_TEST_EXPENSIVE=$(VIR_TEST_EXPENSIVE) \ -@@ -1547,4 +1549,54 @@ else ! WITH_LINUX +@@ -1549,4 +1551,54 @@ else ! WITH_LINUX EXTRA_DIST += virscsitest.c endif ! WITH_LINUX diff --git a/recipes-extended/libvirt/libvirt/tools-add-libvirt-net-rpc-to-virt-host-validate-when.patch b/recipes-extended/libvirt/libvirt/tools-add-libvirt-net-rpc-to-virt-host-validate-when.patch index bb500fde..f03cc890 100644 --- a/recipes-extended/libvirt/libvirt/tools-add-libvirt-net-rpc-to-virt-host-validate-when.patch +++ b/recipes-extended/libvirt/libvirt/tools-add-libvirt-net-rpc-to-virt-host-validate-when.patch @@ -1,4 +1,4 @@ -From 7dc21edd851b260485b432c096f8e90f6fa07778 Mon Sep 17 00:00:00 2001 +From a1696741375c6faca0d09ae6b271a2c56fc2b6fe Mon Sep 17 00:00:00 2001 From: Dengke Du Date: Tue, 7 May 2019 15:26:32 +0800 Subject: [PATCH] tools: add libvirt-net-rpc to virt-host-validate when TLS is -- cgit v1.2.3-54-g00ecf