From d51dacf60a90612b5a414aaede5386b351c4cf88 Mon Sep 17 00:00:00 2001 From: Daniel P. Berrangé Date: Feb 07 2018 14:52:07 +0000 Subject: Initial import Signed-off-by: Daniel P. Berrangé --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0e9263d --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +*~ +*src.rpm +*tar.xz +*spec \ No newline at end of file diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..afdb100 --- /dev/null +++ b/Makefile @@ -0,0 +1,55 @@ + +VERSION = 2.9.0 +APP = qemu +DOWNLOAD_URL = https://download.qemu.org + +RPM_TEMPLATE = $(APP)-ark.spec.in + +RELEASE = $(shell grep Release: $(RPM_TEMPLATE) | sed -e 's/Release: //' -e 's/%{?dist}//') + +VERSION_TAG = $(shell echo $(VERSION) | sed -e 's/\./_/g') + +BASEDIR = $(APP)-$(VERSION) + +ARCHIVE = $(BASEDIR).tar.xz + +PATCH_DIR = patches/$(APP)-$(VERSION) + +RPM_BASE = $(APP)-ark-$(VERSION_TAG) + +RPM_SPEC = $(RPM_BASE).spec +RPM_SRC = $(RPM_BASE)-$(VERSION)-$(RELEASE).fc27.src.rpm + +PATCH_FILES = $(shell test -d $(PATCH_DIR) && ls $(PATCH_DIR) | awk '{print "Patch" NR ": " $$s }') +PATCH_APPLY = $(shell test -d $(PATCH_DIR) && ls $(PATCH_DIR) | awk '{print "%patch" NR " -p1"}') + +all: + @echo $(PATCH_FILES) + +$(ARCHIVE): + wget $(DOWNLOAD_URL)/$(ARCHIVE) + +$(RPM_SPEC): $(RPM_TEMPLATE) + sed \ + -e "s/::VERSION::/$(VERSION)/" \ + -e "s/::VERSION_TAG::/$(VERSION_TAG)/" \ + -e "s/::PATCH_FILES::/$(PATCH_FILES)/" \ + -e "s/::PATCH_APPLY::/$(PATCH_APPLY)/" \ + -e "s//\n/g" \ + < $< > $@ + +$(RPM_SRC): $(ARCHIVE) $(RPM_SPEC) + rm -rf build + mkdir -p build + cp $(ARCHIVE) build + test -d $(PATCH_DIR) && cp $(PATCH_DIR)/* build/ || : + rpmbuild -bs --define "_srcrpmdir `pwd`" --define "_sourcedir `pwd`/build" $(RPM_SPEC) + rm -rf build + +srcrpm: $(RPM_SRC) + +mock: $(RPM_SRC) + mock -r fedora-27-x86_64 $(RPM_SRC) + +copr: $(RPM_SRC) + copr-cli build virt-ark $(RPM_SRC) diff --git a/patches/qemu-1.0/0001-scripts-text2pod.pl-Escape-left-brace.patch b/patches/qemu-1.0/0001-scripts-text2pod.pl-Escape-left-brace.patch new file mode 100644 index 0000000..0502a75 --- /dev/null +++ b/patches/qemu-1.0/0001-scripts-text2pod.pl-Escape-left-brace.patch @@ -0,0 +1,33 @@ +From aa5ccadcca3e6018ebd9d2e8b0a0604f7cb0cd59 Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 20 Oct 2015 15:38:46 +0800 +Subject: [PATCH] scripts/text2pod.pl: Escape left brace + +Latest perl now deprecates "{" literal in regex and print warnings like +"unescaped left brace in regex is deprecated". Add escapes to keep it +happy. + +Signed-off-by: Fam Zheng + +Message-Id: <1445326726-16031-1-git-send-email-famz@redhat.com> +Signed-off-by: Paolo Bonzini +--- + scripts/texi2pod.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/texi2pod.pl b/scripts/texi2pod.pl +index 94097fb065..8767662d30 100755 +--- a/scripts/texi2pod.pl ++++ b/scripts/texi2pod.pl +@@ -317,7 +317,7 @@ while(<$inf>) { + @columns = (); + for $column (split (/\s*\@tab\s*/, $1)) { + # @strong{...} is used a @headitem work-alike +- $column =~ s/^\@strong{(.*)}$/$1/; ++ $column =~ s/^\@strong\{(.*)\}$/$1/; + push @columns, $column; + } + $_ = "\n=item ".join (" : ", @columns)."\n"; +-- +2.14.3 + diff --git a/patches/qemu-1.0/0002-sheepdog-options.patch b/patches/qemu-1.0/0002-sheepdog-options.patch new file mode 100644 index 0000000..c077c27 --- /dev/null +++ b/patches/qemu-1.0/0002-sheepdog-options.patch @@ -0,0 +1,30 @@ +diff --git a/qemu-options.hx b/qemu-options.hx +index 9d7131aa0f..dc5c8341fc 100644 +--- a/qemu-options.hx ++++ b/qemu-options.hx +@@ -2075,18 +2075,18 @@ QEMU supports using either local sheepdog devices or remote networked + devices. + + Syntax for specifying a sheepdog device +-@table @list +-``sheepdog:'' ++@table @code ++@item ``sheepdog:'' + +-``sheepdog::'' ++@item ``sheepdog::'' + +-``sheepdog::'' ++@item ``sheepdog::'' + +-``sheepdog:::'' ++@item ``sheepdog:::'' + +-``sheepdog::::'' ++@item ``sheepdog::::'' + +-``sheepdog::::'' ++@item ``sheepdog::::'' + @end table + + Example diff --git a/patches/qemu-1.1.0/0001-scripts-text2pod.pl-Escape-left-brace.patch b/patches/qemu-1.1.0/0001-scripts-text2pod.pl-Escape-left-brace.patch new file mode 100644 index 0000000..0502a75 --- /dev/null +++ b/patches/qemu-1.1.0/0001-scripts-text2pod.pl-Escape-left-brace.patch @@ -0,0 +1,33 @@ +From aa5ccadcca3e6018ebd9d2e8b0a0604f7cb0cd59 Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 20 Oct 2015 15:38:46 +0800 +Subject: [PATCH] scripts/text2pod.pl: Escape left brace + +Latest perl now deprecates "{" literal in regex and print warnings like +"unescaped left brace in regex is deprecated". Add escapes to keep it +happy. + +Signed-off-by: Fam Zheng + +Message-Id: <1445326726-16031-1-git-send-email-famz@redhat.com> +Signed-off-by: Paolo Bonzini +--- + scripts/texi2pod.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/texi2pod.pl b/scripts/texi2pod.pl +index 94097fb065..8767662d30 100755 +--- a/scripts/texi2pod.pl ++++ b/scripts/texi2pod.pl +@@ -317,7 +317,7 @@ while(<$inf>) { + @columns = (); + for $column (split (/\s*\@tab\s*/, $1)) { + # @strong{...} is used a @headitem work-alike +- $column =~ s/^\@strong{(.*)}$/$1/; ++ $column =~ s/^\@strong\{(.*)\}$/$1/; + push @columns, $column; + } + $_ = "\n=item ".join (" : ", @columns)."\n"; +-- +2.14.3 + diff --git a/patches/qemu-1.1.0/0002-sheepdog-options.patch b/patches/qemu-1.1.0/0002-sheepdog-options.patch new file mode 100644 index 0000000..c077c27 --- /dev/null +++ b/patches/qemu-1.1.0/0002-sheepdog-options.patch @@ -0,0 +1,30 @@ +diff --git a/qemu-options.hx b/qemu-options.hx +index 9d7131aa0f..dc5c8341fc 100644 +--- a/qemu-options.hx ++++ b/qemu-options.hx +@@ -2075,18 +2075,18 @@ QEMU supports using either local sheepdog devices or remote networked + devices. + + Syntax for specifying a sheepdog device +-@table @list +-``sheepdog:'' ++@table @code ++@item ``sheepdog:'' + +-``sheepdog::'' ++@item ``sheepdog::'' + +-``sheepdog::'' ++@item ``sheepdog::'' + +-``sheepdog:::'' ++@item ``sheepdog:::'' + +-``sheepdog::::'' ++@item ``sheepdog::::'' + +-``sheepdog::::'' ++@item ``sheepdog::::'' + @end table + + Example diff --git a/patches/qemu-1.2.0/0001-scripts-text2pod.pl-Escape-left-brace.patch b/patches/qemu-1.2.0/0001-scripts-text2pod.pl-Escape-left-brace.patch new file mode 100644 index 0000000..0502a75 --- /dev/null +++ b/patches/qemu-1.2.0/0001-scripts-text2pod.pl-Escape-left-brace.patch @@ -0,0 +1,33 @@ +From aa5ccadcca3e6018ebd9d2e8b0a0604f7cb0cd59 Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 20 Oct 2015 15:38:46 +0800 +Subject: [PATCH] scripts/text2pod.pl: Escape left brace + +Latest perl now deprecates "{" literal in regex and print warnings like +"unescaped left brace in regex is deprecated". Add escapes to keep it +happy. + +Signed-off-by: Fam Zheng + +Message-Id: <1445326726-16031-1-git-send-email-famz@redhat.com> +Signed-off-by: Paolo Bonzini +--- + scripts/texi2pod.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/texi2pod.pl b/scripts/texi2pod.pl +index 94097fb065..8767662d30 100755 +--- a/scripts/texi2pod.pl ++++ b/scripts/texi2pod.pl +@@ -317,7 +317,7 @@ while(<$inf>) { + @columns = (); + for $column (split (/\s*\@tab\s*/, $1)) { + # @strong{...} is used a @headitem work-alike +- $column =~ s/^\@strong{(.*)}$/$1/; ++ $column =~ s/^\@strong\{(.*)\}$/$1/; + push @columns, $column; + } + $_ = "\n=item ".join (" : ", @columns)."\n"; +-- +2.14.3 + diff --git a/patches/qemu-1.2.0/0002-sheepdog-options.patch b/patches/qemu-1.2.0/0002-sheepdog-options.patch new file mode 100644 index 0000000..c077c27 --- /dev/null +++ b/patches/qemu-1.2.0/0002-sheepdog-options.patch @@ -0,0 +1,30 @@ +diff --git a/qemu-options.hx b/qemu-options.hx +index 9d7131aa0f..dc5c8341fc 100644 +--- a/qemu-options.hx ++++ b/qemu-options.hx +@@ -2075,18 +2075,18 @@ QEMU supports using either local sheepdog devices or remote networked + devices. + + Syntax for specifying a sheepdog device +-@table @list +-``sheepdog:'' ++@table @code ++@item ``sheepdog:'' + +-``sheepdog::'' ++@item ``sheepdog::'' + +-``sheepdog::'' ++@item ``sheepdog::'' + +-``sheepdog:::'' ++@item ``sheepdog:::'' + +-``sheepdog::::'' ++@item ``sheepdog::::'' + +-``sheepdog::::'' ++@item ``sheepdog::::'' + @end table + + Example diff --git a/patches/qemu-1.3.0/0001-scripts-text2pod.pl-Escape-left-brace.patch b/patches/qemu-1.3.0/0001-scripts-text2pod.pl-Escape-left-brace.patch new file mode 100644 index 0000000..0502a75 --- /dev/null +++ b/patches/qemu-1.3.0/0001-scripts-text2pod.pl-Escape-left-brace.patch @@ -0,0 +1,33 @@ +From aa5ccadcca3e6018ebd9d2e8b0a0604f7cb0cd59 Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 20 Oct 2015 15:38:46 +0800 +Subject: [PATCH] scripts/text2pod.pl: Escape left brace + +Latest perl now deprecates "{" literal in regex and print warnings like +"unescaped left brace in regex is deprecated". Add escapes to keep it +happy. + +Signed-off-by: Fam Zheng + +Message-Id: <1445326726-16031-1-git-send-email-famz@redhat.com> +Signed-off-by: Paolo Bonzini +--- + scripts/texi2pod.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/texi2pod.pl b/scripts/texi2pod.pl +index 94097fb065..8767662d30 100755 +--- a/scripts/texi2pod.pl ++++ b/scripts/texi2pod.pl +@@ -317,7 +317,7 @@ while(<$inf>) { + @columns = (); + for $column (split (/\s*\@tab\s*/, $1)) { + # @strong{...} is used a @headitem work-alike +- $column =~ s/^\@strong{(.*)}$/$1/; ++ $column =~ s/^\@strong\{(.*)\}$/$1/; + push @columns, $column; + } + $_ = "\n=item ".join (" : ", @columns)."\n"; +-- +2.14.3 + diff --git a/patches/qemu-1.3.0/0002-sheepdog-options.patch b/patches/qemu-1.3.0/0002-sheepdog-options.patch new file mode 100644 index 0000000..c077c27 --- /dev/null +++ b/patches/qemu-1.3.0/0002-sheepdog-options.patch @@ -0,0 +1,30 @@ +diff --git a/qemu-options.hx b/qemu-options.hx +index 9d7131aa0f..dc5c8341fc 100644 +--- a/qemu-options.hx ++++ b/qemu-options.hx +@@ -2075,18 +2075,18 @@ QEMU supports using either local sheepdog devices or remote networked + devices. + + Syntax for specifying a sheepdog device +-@table @list +-``sheepdog:'' ++@table @code ++@item ``sheepdog:'' + +-``sheepdog::'' ++@item ``sheepdog::'' + +-``sheepdog::'' ++@item ``sheepdog::'' + +-``sheepdog:::'' ++@item ``sheepdog:::'' + +-``sheepdog::::'' ++@item ``sheepdog::::'' + +-``sheepdog::::'' ++@item ``sheepdog::::'' + @end table + + Example diff --git a/patches/qemu-1.4.0/0001-scripts-text2pod.pl-Escape-left-brace.patch b/patches/qemu-1.4.0/0001-scripts-text2pod.pl-Escape-left-brace.patch new file mode 100644 index 0000000..0502a75 --- /dev/null +++ b/patches/qemu-1.4.0/0001-scripts-text2pod.pl-Escape-left-brace.patch @@ -0,0 +1,33 @@ +From aa5ccadcca3e6018ebd9d2e8b0a0604f7cb0cd59 Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 20 Oct 2015 15:38:46 +0800 +Subject: [PATCH] scripts/text2pod.pl: Escape left brace + +Latest perl now deprecates "{" literal in regex and print warnings like +"unescaped left brace in regex is deprecated". Add escapes to keep it +happy. + +Signed-off-by: Fam Zheng + +Message-Id: <1445326726-16031-1-git-send-email-famz@redhat.com> +Signed-off-by: Paolo Bonzini +--- + scripts/texi2pod.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/texi2pod.pl b/scripts/texi2pod.pl +index 94097fb065..8767662d30 100755 +--- a/scripts/texi2pod.pl ++++ b/scripts/texi2pod.pl +@@ -317,7 +317,7 @@ while(<$inf>) { + @columns = (); + for $column (split (/\s*\@tab\s*/, $1)) { + # @strong{...} is used a @headitem work-alike +- $column =~ s/^\@strong{(.*)}$/$1/; ++ $column =~ s/^\@strong\{(.*)\}$/$1/; + push @columns, $column; + } + $_ = "\n=item ".join (" : ", @columns)."\n"; +-- +2.14.3 + diff --git a/patches/qemu-1.4.0/0002-sheepdog-options.patch b/patches/qemu-1.4.0/0002-sheepdog-options.patch new file mode 100644 index 0000000..c077c27 --- /dev/null +++ b/patches/qemu-1.4.0/0002-sheepdog-options.patch @@ -0,0 +1,30 @@ +diff --git a/qemu-options.hx b/qemu-options.hx +index 9d7131aa0f..dc5c8341fc 100644 +--- a/qemu-options.hx ++++ b/qemu-options.hx +@@ -2075,18 +2075,18 @@ QEMU supports using either local sheepdog devices or remote networked + devices. + + Syntax for specifying a sheepdog device +-@table @list +-``sheepdog:'' ++@table @code ++@item ``sheepdog:'' + +-``sheepdog::'' ++@item ``sheepdog::'' + +-``sheepdog::'' ++@item ``sheepdog::'' + +-``sheepdog:::'' ++@item ``sheepdog:::'' + +-``sheepdog::::'' ++@item ``sheepdog::::'' + +-``sheepdog::::'' ++@item ``sheepdog::::'' + @end table + + Example diff --git a/patches/qemu-1.4.1/0001-scripts-text2pod.pl-Escape-left-brace.patch b/patches/qemu-1.4.1/0001-scripts-text2pod.pl-Escape-left-brace.patch new file mode 100644 index 0000000..0502a75 --- /dev/null +++ b/patches/qemu-1.4.1/0001-scripts-text2pod.pl-Escape-left-brace.patch @@ -0,0 +1,33 @@ +From aa5ccadcca3e6018ebd9d2e8b0a0604f7cb0cd59 Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 20 Oct 2015 15:38:46 +0800 +Subject: [PATCH] scripts/text2pod.pl: Escape left brace + +Latest perl now deprecates "{" literal in regex and print warnings like +"unescaped left brace in regex is deprecated". Add escapes to keep it +happy. + +Signed-off-by: Fam Zheng + +Message-Id: <1445326726-16031-1-git-send-email-famz@redhat.com> +Signed-off-by: Paolo Bonzini +--- + scripts/texi2pod.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/texi2pod.pl b/scripts/texi2pod.pl +index 94097fb065..8767662d30 100755 +--- a/scripts/texi2pod.pl ++++ b/scripts/texi2pod.pl +@@ -317,7 +317,7 @@ while(<$inf>) { + @columns = (); + for $column (split (/\s*\@tab\s*/, $1)) { + # @strong{...} is used a @headitem work-alike +- $column =~ s/^\@strong{(.*)}$/$1/; ++ $column =~ s/^\@strong\{(.*)\}$/$1/; + push @columns, $column; + } + $_ = "\n=item ".join (" : ", @columns)."\n"; +-- +2.14.3 + diff --git a/patches/qemu-1.4.1/0002-sheepdog-options.patch b/patches/qemu-1.4.1/0002-sheepdog-options.patch new file mode 100644 index 0000000..c077c27 --- /dev/null +++ b/patches/qemu-1.4.1/0002-sheepdog-options.patch @@ -0,0 +1,30 @@ +diff --git a/qemu-options.hx b/qemu-options.hx +index 9d7131aa0f..dc5c8341fc 100644 +--- a/qemu-options.hx ++++ b/qemu-options.hx +@@ -2075,18 +2075,18 @@ QEMU supports using either local sheepdog devices or remote networked + devices. + + Syntax for specifying a sheepdog device +-@table @list +-``sheepdog:'' ++@table @code ++@item ``sheepdog:'' + +-``sheepdog::'' ++@item ``sheepdog::'' + +-``sheepdog::'' ++@item ``sheepdog::'' + +-``sheepdog:::'' ++@item ``sheepdog:::'' + +-``sheepdog::::'' ++@item ``sheepdog::::'' + +-``sheepdog::::'' ++@item ``sheepdog::::'' + @end table + + Example diff --git a/patches/qemu-1.4.2/0001-scripts-text2pod.pl-Escape-left-brace.patch b/patches/qemu-1.4.2/0001-scripts-text2pod.pl-Escape-left-brace.patch new file mode 100644 index 0000000..0502a75 --- /dev/null +++ b/patches/qemu-1.4.2/0001-scripts-text2pod.pl-Escape-left-brace.patch @@ -0,0 +1,33 @@ +From aa5ccadcca3e6018ebd9d2e8b0a0604f7cb0cd59 Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 20 Oct 2015 15:38:46 +0800 +Subject: [PATCH] scripts/text2pod.pl: Escape left brace + +Latest perl now deprecates "{" literal in regex and print warnings like +"unescaped left brace in regex is deprecated". Add escapes to keep it +happy. + +Signed-off-by: Fam Zheng + +Message-Id: <1445326726-16031-1-git-send-email-famz@redhat.com> +Signed-off-by: Paolo Bonzini +--- + scripts/texi2pod.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/texi2pod.pl b/scripts/texi2pod.pl +index 94097fb065..8767662d30 100755 +--- a/scripts/texi2pod.pl ++++ b/scripts/texi2pod.pl +@@ -317,7 +317,7 @@ while(<$inf>) { + @columns = (); + for $column (split (/\s*\@tab\s*/, $1)) { + # @strong{...} is used a @headitem work-alike +- $column =~ s/^\@strong{(.*)}$/$1/; ++ $column =~ s/^\@strong\{(.*)\}$/$1/; + push @columns, $column; + } + $_ = "\n=item ".join (" : ", @columns)."\n"; +-- +2.14.3 + diff --git a/patches/qemu-1.5.0/0001-scripts-text2pod.pl-Escape-left-brace.patch b/patches/qemu-1.5.0/0001-scripts-text2pod.pl-Escape-left-brace.patch new file mode 100644 index 0000000..0502a75 --- /dev/null +++ b/patches/qemu-1.5.0/0001-scripts-text2pod.pl-Escape-left-brace.patch @@ -0,0 +1,33 @@ +From aa5ccadcca3e6018ebd9d2e8b0a0604f7cb0cd59 Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 20 Oct 2015 15:38:46 +0800 +Subject: [PATCH] scripts/text2pod.pl: Escape left brace + +Latest perl now deprecates "{" literal in regex and print warnings like +"unescaped left brace in regex is deprecated". Add escapes to keep it +happy. + +Signed-off-by: Fam Zheng + +Message-Id: <1445326726-16031-1-git-send-email-famz@redhat.com> +Signed-off-by: Paolo Bonzini +--- + scripts/texi2pod.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/texi2pod.pl b/scripts/texi2pod.pl +index 94097fb065..8767662d30 100755 +--- a/scripts/texi2pod.pl ++++ b/scripts/texi2pod.pl +@@ -317,7 +317,7 @@ while(<$inf>) { + @columns = (); + for $column (split (/\s*\@tab\s*/, $1)) { + # @strong{...} is used a @headitem work-alike +- $column =~ s/^\@strong{(.*)}$/$1/; ++ $column =~ s/^\@strong\{(.*)\}$/$1/; + push @columns, $column; + } + $_ = "\n=item ".join (" : ", @columns)."\n"; +-- +2.14.3 + diff --git a/patches/qemu-1.5.1/0001-scripts-text2pod.pl-Escape-left-brace.patch b/patches/qemu-1.5.1/0001-scripts-text2pod.pl-Escape-left-brace.patch new file mode 100644 index 0000000..0502a75 --- /dev/null +++ b/patches/qemu-1.5.1/0001-scripts-text2pod.pl-Escape-left-brace.patch @@ -0,0 +1,33 @@ +From aa5ccadcca3e6018ebd9d2e8b0a0604f7cb0cd59 Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 20 Oct 2015 15:38:46 +0800 +Subject: [PATCH] scripts/text2pod.pl: Escape left brace + +Latest perl now deprecates "{" literal in regex and print warnings like +"unescaped left brace in regex is deprecated". Add escapes to keep it +happy. + +Signed-off-by: Fam Zheng + +Message-Id: <1445326726-16031-1-git-send-email-famz@redhat.com> +Signed-off-by: Paolo Bonzini +--- + scripts/texi2pod.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/texi2pod.pl b/scripts/texi2pod.pl +index 94097fb065..8767662d30 100755 +--- a/scripts/texi2pod.pl ++++ b/scripts/texi2pod.pl +@@ -317,7 +317,7 @@ while(<$inf>) { + @columns = (); + for $column (split (/\s*\@tab\s*/, $1)) { + # @strong{...} is used a @headitem work-alike +- $column =~ s/^\@strong{(.*)}$/$1/; ++ $column =~ s/^\@strong\{(.*)\}$/$1/; + push @columns, $column; + } + $_ = "\n=item ".join (" : ", @columns)."\n"; +-- +2.14.3 + diff --git a/patches/qemu-1.5.2/0001-scripts-text2pod.pl-Escape-left-brace.patch b/patches/qemu-1.5.2/0001-scripts-text2pod.pl-Escape-left-brace.patch new file mode 100644 index 0000000..0502a75 --- /dev/null +++ b/patches/qemu-1.5.2/0001-scripts-text2pod.pl-Escape-left-brace.patch @@ -0,0 +1,33 @@ +From aa5ccadcca3e6018ebd9d2e8b0a0604f7cb0cd59 Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 20 Oct 2015 15:38:46 +0800 +Subject: [PATCH] scripts/text2pod.pl: Escape left brace + +Latest perl now deprecates "{" literal in regex and print warnings like +"unescaped left brace in regex is deprecated". Add escapes to keep it +happy. + +Signed-off-by: Fam Zheng + +Message-Id: <1445326726-16031-1-git-send-email-famz@redhat.com> +Signed-off-by: Paolo Bonzini +--- + scripts/texi2pod.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/texi2pod.pl b/scripts/texi2pod.pl +index 94097fb065..8767662d30 100755 +--- a/scripts/texi2pod.pl ++++ b/scripts/texi2pod.pl +@@ -317,7 +317,7 @@ while(<$inf>) { + @columns = (); + for $column (split (/\s*\@tab\s*/, $1)) { + # @strong{...} is used a @headitem work-alike +- $column =~ s/^\@strong{(.*)}$/$1/; ++ $column =~ s/^\@strong\{(.*)\}$/$1/; + push @columns, $column; + } + $_ = "\n=item ".join (" : ", @columns)."\n"; +-- +2.14.3 + diff --git a/patches/qemu-1.5.3/0001-scripts-text2pod.pl-Escape-left-brace.patch b/patches/qemu-1.5.3/0001-scripts-text2pod.pl-Escape-left-brace.patch new file mode 100644 index 0000000..0502a75 --- /dev/null +++ b/patches/qemu-1.5.3/0001-scripts-text2pod.pl-Escape-left-brace.patch @@ -0,0 +1,33 @@ +From aa5ccadcca3e6018ebd9d2e8b0a0604f7cb0cd59 Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 20 Oct 2015 15:38:46 +0800 +Subject: [PATCH] scripts/text2pod.pl: Escape left brace + +Latest perl now deprecates "{" literal in regex and print warnings like +"unescaped left brace in regex is deprecated". Add escapes to keep it +happy. + +Signed-off-by: Fam Zheng + +Message-Id: <1445326726-16031-1-git-send-email-famz@redhat.com> +Signed-off-by: Paolo Bonzini +--- + scripts/texi2pod.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/texi2pod.pl b/scripts/texi2pod.pl +index 94097fb065..8767662d30 100755 +--- a/scripts/texi2pod.pl ++++ b/scripts/texi2pod.pl +@@ -317,7 +317,7 @@ while(<$inf>) { + @columns = (); + for $column (split (/\s*\@tab\s*/, $1)) { + # @strong{...} is used a @headitem work-alike +- $column =~ s/^\@strong{(.*)}$/$1/; ++ $column =~ s/^\@strong\{(.*)\}$/$1/; + push @columns, $column; + } + $_ = "\n=item ".join (" : ", @columns)."\n"; +-- +2.14.3 + diff --git a/patches/qemu-1.6.0/0001-scripts-text2pod.pl-Escape-left-brace.patch b/patches/qemu-1.6.0/0001-scripts-text2pod.pl-Escape-left-brace.patch new file mode 100644 index 0000000..0502a75 --- /dev/null +++ b/patches/qemu-1.6.0/0001-scripts-text2pod.pl-Escape-left-brace.patch @@ -0,0 +1,33 @@ +From aa5ccadcca3e6018ebd9d2e8b0a0604f7cb0cd59 Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 20 Oct 2015 15:38:46 +0800 +Subject: [PATCH] scripts/text2pod.pl: Escape left brace + +Latest perl now deprecates "{" literal in regex and print warnings like +"unescaped left brace in regex is deprecated". Add escapes to keep it +happy. + +Signed-off-by: Fam Zheng + +Message-Id: <1445326726-16031-1-git-send-email-famz@redhat.com> +Signed-off-by: Paolo Bonzini +--- + scripts/texi2pod.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/texi2pod.pl b/scripts/texi2pod.pl +index 94097fb065..8767662d30 100755 +--- a/scripts/texi2pod.pl ++++ b/scripts/texi2pod.pl +@@ -317,7 +317,7 @@ while(<$inf>) { + @columns = (); + for $column (split (/\s*\@tab\s*/, $1)) { + # @strong{...} is used a @headitem work-alike +- $column =~ s/^\@strong{(.*)}$/$1/; ++ $column =~ s/^\@strong\{(.*)\}$/$1/; + push @columns, $column; + } + $_ = "\n=item ".join (" : ", @columns)."\n"; +-- +2.14.3 + diff --git a/patches/qemu-1.6.1/0001-scripts-text2pod.pl-Escape-left-brace.patch b/patches/qemu-1.6.1/0001-scripts-text2pod.pl-Escape-left-brace.patch new file mode 100644 index 0000000..0502a75 --- /dev/null +++ b/patches/qemu-1.6.1/0001-scripts-text2pod.pl-Escape-left-brace.patch @@ -0,0 +1,33 @@ +From aa5ccadcca3e6018ebd9d2e8b0a0604f7cb0cd59 Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 20 Oct 2015 15:38:46 +0800 +Subject: [PATCH] scripts/text2pod.pl: Escape left brace + +Latest perl now deprecates "{" literal in regex and print warnings like +"unescaped left brace in regex is deprecated". Add escapes to keep it +happy. + +Signed-off-by: Fam Zheng + +Message-Id: <1445326726-16031-1-git-send-email-famz@redhat.com> +Signed-off-by: Paolo Bonzini +--- + scripts/texi2pod.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/texi2pod.pl b/scripts/texi2pod.pl +index 94097fb065..8767662d30 100755 +--- a/scripts/texi2pod.pl ++++ b/scripts/texi2pod.pl +@@ -317,7 +317,7 @@ while(<$inf>) { + @columns = (); + for $column (split (/\s*\@tab\s*/, $1)) { + # @strong{...} is used a @headitem work-alike +- $column =~ s/^\@strong{(.*)}$/$1/; ++ $column =~ s/^\@strong\{(.*)\}$/$1/; + push @columns, $column; + } + $_ = "\n=item ".join (" : ", @columns)."\n"; +-- +2.14.3 + diff --git a/patches/qemu-1.6.2/0001-scripts-text2pod.pl-Escape-left-brace.patch b/patches/qemu-1.6.2/0001-scripts-text2pod.pl-Escape-left-brace.patch new file mode 100644 index 0000000..0502a75 --- /dev/null +++ b/patches/qemu-1.6.2/0001-scripts-text2pod.pl-Escape-left-brace.patch @@ -0,0 +1,33 @@ +From aa5ccadcca3e6018ebd9d2e8b0a0604f7cb0cd59 Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 20 Oct 2015 15:38:46 +0800 +Subject: [PATCH] scripts/text2pod.pl: Escape left brace + +Latest perl now deprecates "{" literal in regex and print warnings like +"unescaped left brace in regex is deprecated". Add escapes to keep it +happy. + +Signed-off-by: Fam Zheng + +Message-Id: <1445326726-16031-1-git-send-email-famz@redhat.com> +Signed-off-by: Paolo Bonzini +--- + scripts/texi2pod.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/texi2pod.pl b/scripts/texi2pod.pl +index 94097fb065..8767662d30 100755 +--- a/scripts/texi2pod.pl ++++ b/scripts/texi2pod.pl +@@ -317,7 +317,7 @@ while(<$inf>) { + @columns = (); + for $column (split (/\s*\@tab\s*/, $1)) { + # @strong{...} is used a @headitem work-alike +- $column =~ s/^\@strong{(.*)}$/$1/; ++ $column =~ s/^\@strong\{(.*)\}$/$1/; + push @columns, $column; + } + $_ = "\n=item ".join (" : ", @columns)."\n"; +-- +2.14.3 + diff --git a/patches/qemu-1.7.0/0001-scripts-text2pod.pl-Escape-left-brace.patch b/patches/qemu-1.7.0/0001-scripts-text2pod.pl-Escape-left-brace.patch new file mode 100644 index 0000000..0502a75 --- /dev/null +++ b/patches/qemu-1.7.0/0001-scripts-text2pod.pl-Escape-left-brace.patch @@ -0,0 +1,33 @@ +From aa5ccadcca3e6018ebd9d2e8b0a0604f7cb0cd59 Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 20 Oct 2015 15:38:46 +0800 +Subject: [PATCH] scripts/text2pod.pl: Escape left brace + +Latest perl now deprecates "{" literal in regex and print warnings like +"unescaped left brace in regex is deprecated". Add escapes to keep it +happy. + +Signed-off-by: Fam Zheng + +Message-Id: <1445326726-16031-1-git-send-email-famz@redhat.com> +Signed-off-by: Paolo Bonzini +--- + scripts/texi2pod.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/texi2pod.pl b/scripts/texi2pod.pl +index 94097fb065..8767662d30 100755 +--- a/scripts/texi2pod.pl ++++ b/scripts/texi2pod.pl +@@ -317,7 +317,7 @@ while(<$inf>) { + @columns = (); + for $column (split (/\s*\@tab\s*/, $1)) { + # @strong{...} is used a @headitem work-alike +- $column =~ s/^\@strong{(.*)}$/$1/; ++ $column =~ s/^\@strong\{(.*)\}$/$1/; + push @columns, $column; + } + $_ = "\n=item ".join (" : ", @columns)."\n"; +-- +2.14.3 + diff --git a/patches/qemu-1.7.2/0001-scripts-text2pod.pl-Escape-left-brace.patch b/patches/qemu-1.7.2/0001-scripts-text2pod.pl-Escape-left-brace.patch new file mode 100644 index 0000000..0502a75 --- /dev/null +++ b/patches/qemu-1.7.2/0001-scripts-text2pod.pl-Escape-left-brace.patch @@ -0,0 +1,33 @@ +From aa5ccadcca3e6018ebd9d2e8b0a0604f7cb0cd59 Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 20 Oct 2015 15:38:46 +0800 +Subject: [PATCH] scripts/text2pod.pl: Escape left brace + +Latest perl now deprecates "{" literal in regex and print warnings like +"unescaped left brace in regex is deprecated". Add escapes to keep it +happy. + +Signed-off-by: Fam Zheng + +Message-Id: <1445326726-16031-1-git-send-email-famz@redhat.com> +Signed-off-by: Paolo Bonzini +--- + scripts/texi2pod.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/texi2pod.pl b/scripts/texi2pod.pl +index 94097fb065..8767662d30 100755 +--- a/scripts/texi2pod.pl ++++ b/scripts/texi2pod.pl +@@ -317,7 +317,7 @@ while(<$inf>) { + @columns = (); + for $column (split (/\s*\@tab\s*/, $1)) { + # @strong{...} is used a @headitem work-alike +- $column =~ s/^\@strong{(.*)}$/$1/; ++ $column =~ s/^\@strong\{(.*)\}$/$1/; + push @columns, $column; + } + $_ = "\n=item ".join (" : ", @columns)."\n"; +-- +2.14.3 + diff --git a/patches/qemu-2.0.0/0001-scripts-text2pod.pl-Escape-left-brace.patch b/patches/qemu-2.0.0/0001-scripts-text2pod.pl-Escape-left-brace.patch new file mode 100644 index 0000000..0502a75 --- /dev/null +++ b/patches/qemu-2.0.0/0001-scripts-text2pod.pl-Escape-left-brace.patch @@ -0,0 +1,33 @@ +From aa5ccadcca3e6018ebd9d2e8b0a0604f7cb0cd59 Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 20 Oct 2015 15:38:46 +0800 +Subject: [PATCH] scripts/text2pod.pl: Escape left brace + +Latest perl now deprecates "{" literal in regex and print warnings like +"unescaped left brace in regex is deprecated". Add escapes to keep it +happy. + +Signed-off-by: Fam Zheng + +Message-Id: <1445326726-16031-1-git-send-email-famz@redhat.com> +Signed-off-by: Paolo Bonzini +--- + scripts/texi2pod.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/texi2pod.pl b/scripts/texi2pod.pl +index 94097fb065..8767662d30 100755 +--- a/scripts/texi2pod.pl ++++ b/scripts/texi2pod.pl +@@ -317,7 +317,7 @@ while(<$inf>) { + @columns = (); + for $column (split (/\s*\@tab\s*/, $1)) { + # @strong{...} is used a @headitem work-alike +- $column =~ s/^\@strong{(.*)}$/$1/; ++ $column =~ s/^\@strong\{(.*)\}$/$1/; + push @columns, $column; + } + $_ = "\n=item ".join (" : ", @columns)."\n"; +-- +2.14.3 + diff --git a/patches/qemu-2.0.2/0001-scripts-text2pod.pl-Escape-left-brace.patch b/patches/qemu-2.0.2/0001-scripts-text2pod.pl-Escape-left-brace.patch new file mode 100644 index 0000000..0502a75 --- /dev/null +++ b/patches/qemu-2.0.2/0001-scripts-text2pod.pl-Escape-left-brace.patch @@ -0,0 +1,33 @@ +From aa5ccadcca3e6018ebd9d2e8b0a0604f7cb0cd59 Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 20 Oct 2015 15:38:46 +0800 +Subject: [PATCH] scripts/text2pod.pl: Escape left brace + +Latest perl now deprecates "{" literal in regex and print warnings like +"unescaped left brace in regex is deprecated". Add escapes to keep it +happy. + +Signed-off-by: Fam Zheng + +Message-Id: <1445326726-16031-1-git-send-email-famz@redhat.com> +Signed-off-by: Paolo Bonzini +--- + scripts/texi2pod.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/texi2pod.pl b/scripts/texi2pod.pl +index 94097fb065..8767662d30 100755 +--- a/scripts/texi2pod.pl ++++ b/scripts/texi2pod.pl +@@ -317,7 +317,7 @@ while(<$inf>) { + @columns = (); + for $column (split (/\s*\@tab\s*/, $1)) { + # @strong{...} is used a @headitem work-alike +- $column =~ s/^\@strong{(.*)}$/$1/; ++ $column =~ s/^\@strong\{(.*)\}$/$1/; + push @columns, $column; + } + $_ = "\n=item ".join (" : ", @columns)."\n"; +-- +2.14.3 + diff --git a/patches/qemu-2.1.0/0001-scripts-text2pod.pl-Escape-left-brace.patch b/patches/qemu-2.1.0/0001-scripts-text2pod.pl-Escape-left-brace.patch new file mode 100644 index 0000000..0502a75 --- /dev/null +++ b/patches/qemu-2.1.0/0001-scripts-text2pod.pl-Escape-left-brace.patch @@ -0,0 +1,33 @@ +From aa5ccadcca3e6018ebd9d2e8b0a0604f7cb0cd59 Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 20 Oct 2015 15:38:46 +0800 +Subject: [PATCH] scripts/text2pod.pl: Escape left brace + +Latest perl now deprecates "{" literal in regex and print warnings like +"unescaped left brace in regex is deprecated". Add escapes to keep it +happy. + +Signed-off-by: Fam Zheng + +Message-Id: <1445326726-16031-1-git-send-email-famz@redhat.com> +Signed-off-by: Paolo Bonzini +--- + scripts/texi2pod.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/texi2pod.pl b/scripts/texi2pod.pl +index 94097fb065..8767662d30 100755 +--- a/scripts/texi2pod.pl ++++ b/scripts/texi2pod.pl +@@ -317,7 +317,7 @@ while(<$inf>) { + @columns = (); + for $column (split (/\s*\@tab\s*/, $1)) { + # @strong{...} is used a @headitem work-alike +- $column =~ s/^\@strong{(.*)}$/$1/; ++ $column =~ s/^\@strong\{(.*)\}$/$1/; + push @columns, $column; + } + $_ = "\n=item ".join (" : ", @columns)."\n"; +-- +2.14.3 + diff --git a/patches/qemu-2.1.1/0001-scripts-text2pod.pl-Escape-left-brace.patch b/patches/qemu-2.1.1/0001-scripts-text2pod.pl-Escape-left-brace.patch new file mode 100644 index 0000000..0502a75 --- /dev/null +++ b/patches/qemu-2.1.1/0001-scripts-text2pod.pl-Escape-left-brace.patch @@ -0,0 +1,33 @@ +From aa5ccadcca3e6018ebd9d2e8b0a0604f7cb0cd59 Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 20 Oct 2015 15:38:46 +0800 +Subject: [PATCH] scripts/text2pod.pl: Escape left brace + +Latest perl now deprecates "{" literal in regex and print warnings like +"unescaped left brace in regex is deprecated". Add escapes to keep it +happy. + +Signed-off-by: Fam Zheng + +Message-Id: <1445326726-16031-1-git-send-email-famz@redhat.com> +Signed-off-by: Paolo Bonzini +--- + scripts/texi2pod.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/texi2pod.pl b/scripts/texi2pod.pl +index 94097fb065..8767662d30 100755 +--- a/scripts/texi2pod.pl ++++ b/scripts/texi2pod.pl +@@ -317,7 +317,7 @@ while(<$inf>) { + @columns = (); + for $column (split (/\s*\@tab\s*/, $1)) { + # @strong{...} is used a @headitem work-alike +- $column =~ s/^\@strong{(.*)}$/$1/; ++ $column =~ s/^\@strong\{(.*)\}$/$1/; + push @columns, $column; + } + $_ = "\n=item ".join (" : ", @columns)."\n"; +-- +2.14.3 + diff --git a/patches/qemu-2.1.2/0001-scripts-text2pod.pl-Escape-left-brace.patch b/patches/qemu-2.1.2/0001-scripts-text2pod.pl-Escape-left-brace.patch new file mode 100644 index 0000000..0502a75 --- /dev/null +++ b/patches/qemu-2.1.2/0001-scripts-text2pod.pl-Escape-left-brace.patch @@ -0,0 +1,33 @@ +From aa5ccadcca3e6018ebd9d2e8b0a0604f7cb0cd59 Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 20 Oct 2015 15:38:46 +0800 +Subject: [PATCH] scripts/text2pod.pl: Escape left brace + +Latest perl now deprecates "{" literal in regex and print warnings like +"unescaped left brace in regex is deprecated". Add escapes to keep it +happy. + +Signed-off-by: Fam Zheng + +Message-Id: <1445326726-16031-1-git-send-email-famz@redhat.com> +Signed-off-by: Paolo Bonzini +--- + scripts/texi2pod.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/texi2pod.pl b/scripts/texi2pod.pl +index 94097fb065..8767662d30 100755 +--- a/scripts/texi2pod.pl ++++ b/scripts/texi2pod.pl +@@ -317,7 +317,7 @@ while(<$inf>) { + @columns = (); + for $column (split (/\s*\@tab\s*/, $1)) { + # @strong{...} is used a @headitem work-alike +- $column =~ s/^\@strong{(.*)}$/$1/; ++ $column =~ s/^\@strong\{(.*)\}$/$1/; + push @columns, $column; + } + $_ = "\n=item ".join (" : ", @columns)."\n"; +-- +2.14.3 + diff --git a/patches/qemu-2.1.3/0001-scripts-text2pod.pl-Escape-left-brace.patch b/patches/qemu-2.1.3/0001-scripts-text2pod.pl-Escape-left-brace.patch new file mode 100644 index 0000000..0502a75 --- /dev/null +++ b/patches/qemu-2.1.3/0001-scripts-text2pod.pl-Escape-left-brace.patch @@ -0,0 +1,33 @@ +From aa5ccadcca3e6018ebd9d2e8b0a0604f7cb0cd59 Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 20 Oct 2015 15:38:46 +0800 +Subject: [PATCH] scripts/text2pod.pl: Escape left brace + +Latest perl now deprecates "{" literal in regex and print warnings like +"unescaped left brace in regex is deprecated". Add escapes to keep it +happy. + +Signed-off-by: Fam Zheng + +Message-Id: <1445326726-16031-1-git-send-email-famz@redhat.com> +Signed-off-by: Paolo Bonzini +--- + scripts/texi2pod.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/texi2pod.pl b/scripts/texi2pod.pl +index 94097fb065..8767662d30 100755 +--- a/scripts/texi2pod.pl ++++ b/scripts/texi2pod.pl +@@ -317,7 +317,7 @@ while(<$inf>) { + @columns = (); + for $column (split (/\s*\@tab\s*/, $1)) { + # @strong{...} is used a @headitem work-alike +- $column =~ s/^\@strong{(.*)}$/$1/; ++ $column =~ s/^\@strong\{(.*)\}$/$1/; + push @columns, $column; + } + $_ = "\n=item ".join (" : ", @columns)."\n"; +-- +2.14.3 + diff --git a/patches/qemu-2.2.0/0001-scripts-text2pod.pl-Escape-left-brace.patch b/patches/qemu-2.2.0/0001-scripts-text2pod.pl-Escape-left-brace.patch new file mode 100644 index 0000000..0502a75 --- /dev/null +++ b/patches/qemu-2.2.0/0001-scripts-text2pod.pl-Escape-left-brace.patch @@ -0,0 +1,33 @@ +From aa5ccadcca3e6018ebd9d2e8b0a0604f7cb0cd59 Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 20 Oct 2015 15:38:46 +0800 +Subject: [PATCH] scripts/text2pod.pl: Escape left brace + +Latest perl now deprecates "{" literal in regex and print warnings like +"unescaped left brace in regex is deprecated". Add escapes to keep it +happy. + +Signed-off-by: Fam Zheng + +Message-Id: <1445326726-16031-1-git-send-email-famz@redhat.com> +Signed-off-by: Paolo Bonzini +--- + scripts/texi2pod.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/texi2pod.pl b/scripts/texi2pod.pl +index 94097fb065..8767662d30 100755 +--- a/scripts/texi2pod.pl ++++ b/scripts/texi2pod.pl +@@ -317,7 +317,7 @@ while(<$inf>) { + @columns = (); + for $column (split (/\s*\@tab\s*/, $1)) { + # @strong{...} is used a @headitem work-alike +- $column =~ s/^\@strong{(.*)}$/$1/; ++ $column =~ s/^\@strong\{(.*)\}$/$1/; + push @columns, $column; + } + $_ = "\n=item ".join (" : ", @columns)."\n"; +-- +2.14.3 + diff --git a/patches/qemu-2.2.1/0001-scripts-text2pod.pl-Escape-left-brace.patch b/patches/qemu-2.2.1/0001-scripts-text2pod.pl-Escape-left-brace.patch new file mode 100644 index 0000000..0502a75 --- /dev/null +++ b/patches/qemu-2.2.1/0001-scripts-text2pod.pl-Escape-left-brace.patch @@ -0,0 +1,33 @@ +From aa5ccadcca3e6018ebd9d2e8b0a0604f7cb0cd59 Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 20 Oct 2015 15:38:46 +0800 +Subject: [PATCH] scripts/text2pod.pl: Escape left brace + +Latest perl now deprecates "{" literal in regex and print warnings like +"unescaped left brace in regex is deprecated". Add escapes to keep it +happy. + +Signed-off-by: Fam Zheng + +Message-Id: <1445326726-16031-1-git-send-email-famz@redhat.com> +Signed-off-by: Paolo Bonzini +--- + scripts/texi2pod.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/texi2pod.pl b/scripts/texi2pod.pl +index 94097fb065..8767662d30 100755 +--- a/scripts/texi2pod.pl ++++ b/scripts/texi2pod.pl +@@ -317,7 +317,7 @@ while(<$inf>) { + @columns = (); + for $column (split (/\s*\@tab\s*/, $1)) { + # @strong{...} is used a @headitem work-alike +- $column =~ s/^\@strong{(.*)}$/$1/; ++ $column =~ s/^\@strong\{(.*)\}$/$1/; + push @columns, $column; + } + $_ = "\n=item ".join (" : ", @columns)."\n"; +-- +2.14.3 + diff --git a/patches/qemu-2.3.0/0001-scripts-text2pod.pl-Escape-left-brace.patch b/patches/qemu-2.3.0/0001-scripts-text2pod.pl-Escape-left-brace.patch new file mode 100644 index 0000000..0502a75 --- /dev/null +++ b/patches/qemu-2.3.0/0001-scripts-text2pod.pl-Escape-left-brace.patch @@ -0,0 +1,33 @@ +From aa5ccadcca3e6018ebd9d2e8b0a0604f7cb0cd59 Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 20 Oct 2015 15:38:46 +0800 +Subject: [PATCH] scripts/text2pod.pl: Escape left brace + +Latest perl now deprecates "{" literal in regex and print warnings like +"unescaped left brace in regex is deprecated". Add escapes to keep it +happy. + +Signed-off-by: Fam Zheng + +Message-Id: <1445326726-16031-1-git-send-email-famz@redhat.com> +Signed-off-by: Paolo Bonzini +--- + scripts/texi2pod.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/texi2pod.pl b/scripts/texi2pod.pl +index 94097fb065..8767662d30 100755 +--- a/scripts/texi2pod.pl ++++ b/scripts/texi2pod.pl +@@ -317,7 +317,7 @@ while(<$inf>) { + @columns = (); + for $column (split (/\s*\@tab\s*/, $1)) { + # @strong{...} is used a @headitem work-alike +- $column =~ s/^\@strong{(.*)}$/$1/; ++ $column =~ s/^\@strong\{(.*)\}$/$1/; + push @columns, $column; + } + $_ = "\n=item ".join (" : ", @columns)."\n"; +-- +2.14.3 + diff --git a/patches/qemu-2.3.1/0001-scripts-text2pod.pl-Escape-left-brace.patch b/patches/qemu-2.3.1/0001-scripts-text2pod.pl-Escape-left-brace.patch new file mode 100644 index 0000000..0502a75 --- /dev/null +++ b/patches/qemu-2.3.1/0001-scripts-text2pod.pl-Escape-left-brace.patch @@ -0,0 +1,33 @@ +From aa5ccadcca3e6018ebd9d2e8b0a0604f7cb0cd59 Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 20 Oct 2015 15:38:46 +0800 +Subject: [PATCH] scripts/text2pod.pl: Escape left brace + +Latest perl now deprecates "{" literal in regex and print warnings like +"unescaped left brace in regex is deprecated". Add escapes to keep it +happy. + +Signed-off-by: Fam Zheng + +Message-Id: <1445326726-16031-1-git-send-email-famz@redhat.com> +Signed-off-by: Paolo Bonzini +--- + scripts/texi2pod.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/texi2pod.pl b/scripts/texi2pod.pl +index 94097fb065..8767662d30 100755 +--- a/scripts/texi2pod.pl ++++ b/scripts/texi2pod.pl +@@ -317,7 +317,7 @@ while(<$inf>) { + @columns = (); + for $column (split (/\s*\@tab\s*/, $1)) { + # @strong{...} is used a @headitem work-alike +- $column =~ s/^\@strong{(.*)}$/$1/; ++ $column =~ s/^\@strong\{(.*)\}$/$1/; + push @columns, $column; + } + $_ = "\n=item ".join (" : ", @columns)."\n"; +-- +2.14.3 + diff --git a/patches/qemu-2.4.0.1/0001-scripts-text2pod.pl-Escape-left-brace.patch b/patches/qemu-2.4.0.1/0001-scripts-text2pod.pl-Escape-left-brace.patch new file mode 100644 index 0000000..0502a75 --- /dev/null +++ b/patches/qemu-2.4.0.1/0001-scripts-text2pod.pl-Escape-left-brace.patch @@ -0,0 +1,33 @@ +From aa5ccadcca3e6018ebd9d2e8b0a0604f7cb0cd59 Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 20 Oct 2015 15:38:46 +0800 +Subject: [PATCH] scripts/text2pod.pl: Escape left brace + +Latest perl now deprecates "{" literal in regex and print warnings like +"unescaped left brace in regex is deprecated". Add escapes to keep it +happy. + +Signed-off-by: Fam Zheng + +Message-Id: <1445326726-16031-1-git-send-email-famz@redhat.com> +Signed-off-by: Paolo Bonzini +--- + scripts/texi2pod.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/texi2pod.pl b/scripts/texi2pod.pl +index 94097fb065..8767662d30 100755 +--- a/scripts/texi2pod.pl ++++ b/scripts/texi2pod.pl +@@ -317,7 +317,7 @@ while(<$inf>) { + @columns = (); + for $column (split (/\s*\@tab\s*/, $1)) { + # @strong{...} is used a @headitem work-alike +- $column =~ s/^\@strong{(.*)}$/$1/; ++ $column =~ s/^\@strong\{(.*)\}$/$1/; + push @columns, $column; + } + $_ = "\n=item ".join (" : ", @columns)."\n"; +-- +2.14.3 + diff --git a/patches/qemu-2.4.0/0001-scripts-text2pod.pl-Escape-left-brace.patch b/patches/qemu-2.4.0/0001-scripts-text2pod.pl-Escape-left-brace.patch new file mode 100644 index 0000000..0502a75 --- /dev/null +++ b/patches/qemu-2.4.0/0001-scripts-text2pod.pl-Escape-left-brace.patch @@ -0,0 +1,33 @@ +From aa5ccadcca3e6018ebd9d2e8b0a0604f7cb0cd59 Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 20 Oct 2015 15:38:46 +0800 +Subject: [PATCH] scripts/text2pod.pl: Escape left brace + +Latest perl now deprecates "{" literal in regex and print warnings like +"unescaped left brace in regex is deprecated". Add escapes to keep it +happy. + +Signed-off-by: Fam Zheng + +Message-Id: <1445326726-16031-1-git-send-email-famz@redhat.com> +Signed-off-by: Paolo Bonzini +--- + scripts/texi2pod.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/texi2pod.pl b/scripts/texi2pod.pl +index 94097fb065..8767662d30 100755 +--- a/scripts/texi2pod.pl ++++ b/scripts/texi2pod.pl +@@ -317,7 +317,7 @@ while(<$inf>) { + @columns = (); + for $column (split (/\s*\@tab\s*/, $1)) { + # @strong{...} is used a @headitem work-alike +- $column =~ s/^\@strong{(.*)}$/$1/; ++ $column =~ s/^\@strong\{(.*)\}$/$1/; + push @columns, $column; + } + $_ = "\n=item ".join (" : ", @columns)."\n"; +-- +2.14.3 + diff --git a/patches/qemu-2.4.1/0001-scripts-text2pod.pl-Escape-left-brace.patch b/patches/qemu-2.4.1/0001-scripts-text2pod.pl-Escape-left-brace.patch new file mode 100644 index 0000000..0502a75 --- /dev/null +++ b/patches/qemu-2.4.1/0001-scripts-text2pod.pl-Escape-left-brace.patch @@ -0,0 +1,33 @@ +From aa5ccadcca3e6018ebd9d2e8b0a0604f7cb0cd59 Mon Sep 17 00:00:00 2001 +From: Fam Zheng +Date: Tue, 20 Oct 2015 15:38:46 +0800 +Subject: [PATCH] scripts/text2pod.pl: Escape left brace + +Latest perl now deprecates "{" literal in regex and print warnings like +"unescaped left brace in regex is deprecated". Add escapes to keep it +happy. + +Signed-off-by: Fam Zheng + +Message-Id: <1445326726-16031-1-git-send-email-famz@redhat.com> +Signed-off-by: Paolo Bonzini +--- + scripts/texi2pod.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/texi2pod.pl b/scripts/texi2pod.pl +index 94097fb065..8767662d30 100755 +--- a/scripts/texi2pod.pl ++++ b/scripts/texi2pod.pl +@@ -317,7 +317,7 @@ while(<$inf>) { + @columns = (); + for $column (split (/\s*\@tab\s*/, $1)) { + # @strong{...} is used a @headitem work-alike +- $column =~ s/^\@strong{(.*)}$/$1/; ++ $column =~ s/^\@strong\{(.*)\}$/$1/; + push @columns, $column; + } + $_ = "\n=item ".join (" : ", @columns)."\n"; +-- +2.14.3 + diff --git a/qemu-ark.spec.in b/qemu-ark.spec.in new file mode 100644 index 0000000..644d403 --- /dev/null +++ b/qemu-ark.spec.in @@ -0,0 +1,89 @@ +Name: qemu-ark-::VERSION_TAG:: +Version: ::VERSION:: +Release: 3%{?dist} +Summary: QEMU is a FAST! processor emulator + +License: GOLv2+ and LGPLv2+ and BSD +URL: https://www.qemu.org/ +Source0: https://download.qemu.org/qemu-%{version}.tar.xz +::PATCH_FILES:: + +BuildRequires: gnutls-devel +BuildRequires: texinfo +BuildRequires: perl-podlators +BuildRequires: SDL-devel +BuildRequires: zlib-devel +BuildRequires: cyrus-sasl-devel +BuildRequires: libaio-devel +BuildRequires: pulseaudio-libs-devel +BuildRequires: alsa-lib-devel +BuildRequires: libiscsi-devel +BuildRequires: libnfs-devel +BuildRequires: snappy-devel +BuildRequires: lzo-devel +BuildRequires: ncurses-devel +BuildRequires: libattr-devel +BuildRequires: libcap-devel +BuildRequires: libcap-ng-devel +BuildRequires: usbredir-devel +BuildRequires: spice-server-devel +BuildRequires: libseccomp-devel +BuildRequires: libcurl-devel +BuildRequires: librados2-devel +BuildRequires: librbd1-devel +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: libuuid-devel +BuildRequires: bluez-libs-devel +BuildRequires: pixman-devel +BuildRequires: glusterfs-devel +BuildRequires: glusterfs-api-devel +BuildRequires: libusbx-devel +BuildRequires: libssh-devel +BuildRequires: gtk2-devel +BuildRequires: gettext +BuildRequires: numactl-devel +BuildRequires: bzip2-devel +BuildRequires: libtasn1-devel +BuildRequires: libcacard-devel + + +%description +QEMU is a generic and open source processor emulator which achieves a good +emulation speed by using dynamic translation. QEMU has two operating modes: + + * Full system emulation. In this mode, QEMU emulates a full system (for + example a PC), including a processor and various peripherials. It can be + used to launch different Operating Systems without rebooting the PC or + to debug system code. + * User mode emulation. In this mode, QEMU can launch Linux processes compiled + for one CPU on another CPU. + +As QEMU requires no host kernel patches to run, it is safe and easy to use. + +%prep +%setup -q -n qemu-%{version} +::PATCH_APPLY:: + +%build +./configure --prefix=/opt/qemu/%{version} \ + --target-list=x86_64-softmmu \ + --disable-xen \ + --disable-strip \ + --disable-fdt \ + --disable-werror +%make_build + + +%install +rm -rf $RPM_BUILD_ROOT +%make_install + + +%files +%dir /opt/qemu +/opt/qemu/%{version} + +%changelog +* Fri Feb 2 2018 Daniel Berrange +- Initial package