Compare commits
5 Commits
imports/c9
...
c9-beta
Author | SHA1 | Date | |
---|---|---|---|
5965ef3233 | |||
|
b1a5a66c83 | ||
|
9e6358f3a7 | ||
|
b97916ce78 | ||
|
e57fabcd7c |
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,2 +1,2 @@
|
||||
SOURCES/guestfs-tools-1.46.1.tar.gz
|
||||
SOURCES/guestfs-tools-1.51.6.tar.gz
|
||||
SOURCES/libguestfs.keyring
|
||||
|
@ -1,2 +1,2 @@
|
||||
a34069426419e2c5cabf951f5282cb57a7ba788d SOURCES/guestfs-tools-1.46.1.tar.gz
|
||||
7a64ba52bca3a3591d2e639a6bc9002d61e7d374 SOURCES/guestfs-tools-1.51.6.tar.gz
|
||||
1bbc40f501a7fef9eef2a39b701a71aee2fea7c4 SOURCES/libguestfs.keyring
|
||||
|
26
SOURCES/0001-Update-common-submodule.patch
Normal file
26
SOURCES/0001-Update-common-submodule.patch
Normal file
@ -0,0 +1,26 @@
|
||||
From 28ecb8693bbded3e1c70c1baa57f3498a6b8127e Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Sat, 9 Dec 2023 12:59:13 +0000
|
||||
Subject: [PATCH] Update common submodule
|
||||
|
||||
Pick up this bug fix:
|
||||
|
||||
mltools/libosinfo-c.c: Fix off-by-one error
|
||||
---
|
||||
common | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
Submodule common cd29aee91..0dba002c2:
|
||||
diff --git a/common/mltools/libosinfo-c.c b/common/mltools/libosinfo-c.c
|
||||
index 93357fd91..a48c8989f 100644
|
||||
--- a/common/mltools/libosinfo-c.c
|
||||
+++ b/common/mltools/libosinfo-c.c
|
||||
@@ -296,7 +296,7 @@ v2v_osinfo_os_get_device_drivers (value osv)
|
||||
|
||||
driver = OSINFO_DEVICE_DRIVER(osinfo_list_get_nth (OSINFO_LIST(list), i));
|
||||
|
||||
- vi = caml_alloc (6, 0);
|
||||
+ vi = caml_alloc (7, 0);
|
||||
str = osinfo_device_driver_get_architecture (driver);
|
||||
copyv = caml_copy_string (str);
|
||||
Store_field (vi, 0, copyv);
|
@ -1,191 +0,0 @@
|
||||
From 83de85e717ad525423b0eabe153b48ff8af90bd1 Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Mon, 17 May 2021 15:18:04 +0100
|
||||
Subject: [PATCH 1/5] win-reg: Fix output of virt-win-reg --version
|
||||
|
||||
Before we split libguestfs and guestfs-tools the version of programs
|
||||
was exactly the same as the version of libguestfs. This was
|
||||
convenient for virt-win-reg where it is difficult to encode the
|
||||
version into the script, because virt-win-reg could simply use the
|
||||
version from Sys::Guestfs (ie. libguestfs). However after the split
|
||||
this no longer applies, so we must do the difficult thing.
|
||||
|
||||
After this change virt-win-reg will print both the version of
|
||||
guestfs-tools and the version of libguestfs, eg:
|
||||
|
||||
$ virt-win-reg --version
|
||||
virt-win-reg 1.47.1
|
||||
libguestfs 1.45.5fedora=35,release=1.fc35,libvirt
|
||||
|
||||
Reported-by: Yongkui Guo
|
||||
Fixes: commit 4354a3126152a2748cc9097cba139b3908ccc342
|
||||
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1961160
|
||||
(cherry picked from commit 9e9eeeaf4c4b478eca82bf0d4c3e680a624d6d91)
|
||||
---
|
||||
.gitignore | 1 +
|
||||
configure.ac | 2 ++
|
||||
po-docs/podfiles | 2 +-
|
||||
po/POTFILES-pl | 2 +-
|
||||
po/guestfs-tools.pot | 18 +++++++++---------
|
||||
win-reg/Makefile.am | 6 ------
|
||||
win-reg/{virt-win-reg => virt-win-reg.in} | 5 +++--
|
||||
7 files changed, 17 insertions(+), 19 deletions(-)
|
||||
rename win-reg/{virt-win-reg => virt-win-reg.in} (99%)
|
||||
|
||||
diff --git a/.gitignore b/.gitignore
|
||||
index 006042a8..6bc509fa 100644
|
||||
--- a/.gitignore
|
||||
+++ b/.gitignore
|
||||
@@ -163,3 +163,4 @@ Makefile.in
|
||||
/test-data/phony-guests/windows-software
|
||||
/test-data/phony-guests/windows-system
|
||||
/website/*.html
|
||||
+/win-reg/virt-win-reg
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 56cfef57..ef412670 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -99,6 +99,8 @@ AC_CONFIG_FILES([podwrapper.pl],
|
||||
[chmod +x,-w podwrapper.pl])
|
||||
AC_CONFIG_FILES([run],
|
||||
[chmod +x,-w run])
|
||||
+AC_CONFIG_FILES([win-reg/virt-win-reg],
|
||||
+ [chmod +x,-w win-reg/virt-win-reg])
|
||||
|
||||
AC_CONFIG_FILES([Makefile
|
||||
align/Makefile
|
||||
diff --git a/po-docs/podfiles b/po-docs/podfiles
|
||||
index d7ef1389..6b0c481f 100644
|
||||
--- a/po-docs/podfiles
|
||||
+++ b/po-docs/podfiles
|
||||
@@ -26,4 +26,4 @@ sparsify/virt-sparsify.pod
|
||||
sysprep/sysprep-extra-options.pod
|
||||
sysprep/sysprep-operations.pod
|
||||
sysprep/virt-sysprep.pod
|
||||
-win-reg/virt-win-reg
|
||||
+win-reg/virt-win-reg.in
|
||||
diff --git a/po/POTFILES-pl b/po/POTFILES-pl
|
||||
index 47d30fc8..c6520cea 100644
|
||||
--- a/po/POTFILES-pl
|
||||
+++ b/po/POTFILES-pl
|
||||
@@ -1 +1 @@
|
||||
-win-reg/virt-win-reg
|
||||
+win-reg/virt-win-reg.in
|
||||
diff --git a/po/guestfs-tools.pot b/po/guestfs-tools.pot
|
||||
index a3be1b95..d7e9a3a7 100644
|
||||
--- a/po/guestfs-tools.pot
|
||||
+++ b/po/guestfs-tools.pot
|
||||
@@ -9,7 +9,7 @@ msgstr ""
|
||||
"Project-Id-Version: guestfs-tools 1.46.1\n"
|
||||
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
|
||||
"component=libguestfs&product=Virtualization+Tools\n"
|
||||
-"POT-Creation-Date: 2021-05-08 08:57+0100\n"
|
||||
+"POT-Creation-Date: 2021-05-17 15:25+0100\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
@@ -4213,11 +4213,11 @@ msgstr ""
|
||||
msgid "%s: subprocess failed\n"
|
||||
msgstr ""
|
||||
|
||||
-#: win-reg/virt-win-reg:260
|
||||
+#: win-reg/virt-win-reg.in:261
|
||||
msgid "no libvirt domain name or disk image given\n"
|
||||
msgstr ""
|
||||
|
||||
-#: win-reg/virt-win-reg:316
|
||||
+#: win-reg/virt-win-reg.in:317
|
||||
#, perl-brace-format
|
||||
msgid ""
|
||||
"{prog}: No operating system could be detected inside this disk image.\n"
|
||||
@@ -4230,33 +4230,33 @@ msgid ""
|
||||
"information about the disk image as possible.\n"
|
||||
msgstr ""
|
||||
|
||||
-#: win-reg/virt-win-reg:320
|
||||
+#: win-reg/virt-win-reg.in:321
|
||||
#, perl-brace-format
|
||||
msgid "{prog}: multiboot operating systems are not supported.\n"
|
||||
msgstr ""
|
||||
|
||||
-#: win-reg/virt-win-reg:342
|
||||
+#: win-reg/virt-win-reg.in:343
|
||||
msgid ""
|
||||
"expecting 1 or 2 more parameters, subkey path and optionally the value to "
|
||||
"export\n"
|
||||
msgstr ""
|
||||
|
||||
-#: win-reg/virt-win-reg:502
|
||||
+#: win-reg/virt-win-reg.in:503
|
||||
#, perl-brace-format
|
||||
msgid "virt-win-reg: {p}: cannot find user directory\n"
|
||||
msgstr ""
|
||||
|
||||
-#: win-reg/virt-win-reg:507
|
||||
+#: win-reg/virt-win-reg.in:508
|
||||
#, perl-brace-format
|
||||
msgid "virt-win-reg: {p}: not a supported Windows Registry path\n"
|
||||
msgstr ""
|
||||
|
||||
-#: win-reg/virt-win-reg:580
|
||||
+#: win-reg/virt-win-reg.in:581
|
||||
#, perl-brace-format
|
||||
msgid "virt-win-reg: {p}: could not download registry file: {err}\n"
|
||||
msgstr ""
|
||||
|
||||
-#: win-reg/virt-win-reg:597
|
||||
+#: win-reg/virt-win-reg.in:598
|
||||
#, perl-brace-format
|
||||
msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
|
||||
msgstr ""
|
||||
diff --git a/win-reg/Makefile.am b/win-reg/Makefile.am
|
||||
index 22a22db4..61ec066a 100644
|
||||
--- a/win-reg/Makefile.am
|
||||
+++ b/win-reg/Makefile.am
|
||||
@@ -17,8 +17,6 @@
|
||||
|
||||
include $(top_srcdir)/subdir-rules.mk
|
||||
|
||||
-EXTRA_DIST = virt-win-reg
|
||||
-
|
||||
bin_SCRIPTS = virt-win-reg
|
||||
|
||||
# Manual pages and HTML files for the website.
|
||||
@@ -36,7 +34,3 @@ stamp-virt-win-reg.pod: virt-win-reg
|
||||
--warning custom \
|
||||
$<
|
||||
touch $@
|
||||
-
|
||||
-all-local:
|
||||
- for f in virt-win-reg; do echo win-reg/$$f; done \
|
||||
- > $(top_srcdir)/po/POTFILES-pl
|
||||
diff --git a/win-reg/virt-win-reg b/win-reg/virt-win-reg.in
|
||||
similarity index 99%
|
||||
rename from win-reg/virt-win-reg
|
||||
rename to win-reg/virt-win-reg.in
|
||||
index 1a936c5d..6d9d0a28 100755
|
||||
--- a/win-reg/virt-win-reg
|
||||
+++ b/win-reg/virt-win-reg.in
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/usr/bin/env perl
|
||||
# virt-win-reg
|
||||
-# Copyright (C) 2010 Red Hat Inc.
|
||||
+# Copyright (C) 2010-2021 Red Hat Inc.
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
@@ -234,9 +234,10 @@ my %opts = ("help|?" => \$help,
|
||||
GetOptions (%opts) or pod2usage (2);
|
||||
pod2usage (1) if $help;
|
||||
if ($version) {
|
||||
+ print "virt-win-reg @PACKAGE_VERSION@\n";
|
||||
my $g = Sys::Guestfs->new ();
|
||||
my %h = $g->version ();
|
||||
- print "virt-win-reg $h{major}.$h{minor}.$h{release}$h{extra}\n";
|
||||
+ print "libguestfs $h{major}.$h{minor}.$h{release}$h{extra}\n";
|
||||
exit
|
||||
}
|
||||
|
||||
--
|
||||
2.31.1
|
||||
|
63
SOURCES/0002-builder-Add-a-test-of-the-chown-parameter.patch
Normal file
63
SOURCES/0002-builder-Add-a-test-of-the-chown-parameter.patch
Normal file
@ -0,0 +1,63 @@
|
||||
From 5f9beb89443f84640efc52ee6cd68f7f880fb66b Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Fri, 19 Jan 2024 13:22:51 +0000
|
||||
Subject: [PATCH] builder: Add a test of the --chown parameter
|
||||
|
||||
Also update the libguestfs common submodule, pulling in this change
|
||||
from libguestfs:
|
||||
|
||||
generator/customize.ml: Split --chown parameter on ':' character
|
||||
|
||||
and this patch to common/mltools:
|
||||
|
||||
mltools/libosinfo-c.c: Fix off-by-one error
|
||||
|
||||
(cherry picked from commit 299dc5ec2a0bdd9adecef75adc6a5eca0dc685b1)
|
||||
---
|
||||
builder/test-virt-builder.sh | 4 ++++
|
||||
common | 2 +-
|
||||
2 files changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/builder/test-virt-builder.sh b/builder/test-virt-builder.sh
|
||||
index 705788a3c..f839fd7af 100755
|
||||
--- a/builder/test-virt-builder.sh
|
||||
+++ b/builder/test-virt-builder.sh
|
||||
@@ -69,6 +69,7 @@ virt-builder phony-fedora \
|
||||
--write '/etc/append6:
|
||||
' \
|
||||
--append-line '/etc/append6:line2' \
|
||||
+ --chown 1:1:/etc/append6 \
|
||||
--firstboot Makefile --firstboot-command 'echo "hello"' \
|
||||
--firstboot-install "minicom,inkscape"
|
||||
|
||||
@@ -112,6 +113,7 @@ echo append5:
|
||||
cat /etc/append5
|
||||
echo append6:
|
||||
cat /etc/append6
|
||||
+stat /etc/append6 | grep '^[ug]id:'
|
||||
|
||||
echo -----
|
||||
EOF
|
||||
@@ -154,6 +156,8 @@ append6:
|
||||
|
||||
line2
|
||||
|
||||
+uid: 1
|
||||
+gid: 1
|
||||
-----" ]; then
|
||||
echo "$0: unexpected output:"
|
||||
cat test-virt-builder.out
|
||||
Submodule common 0dba002c2..54869c987:
|
||||
diff --git a/common/mlcustomize/customize_cmdline.ml b/common/mlcustomize/customize_cmdline.ml
|
||||
index 245d9960a..48ee33445 100644
|
||||
--- a/common/mlcustomize/customize_cmdline.ml
|
||||
+++ b/common/mlcustomize/customize_cmdline.ml
|
||||
@@ -157,7 +157,7 @@ let rec argspec () =
|
||||
let len = String.length arg in
|
||||
String.sub arg 0 i, String.sub arg (i+1) (len-(i+1))
|
||||
and split_string_triplet option_name arg =
|
||||
- match String.nsplit ~max:3 "," arg with
|
||||
+ match String.nsplit ~max:3 ":" arg with
|
||||
| [a; b; c] -> a, b, c
|
||||
| _ ->
|
||||
error (f_"invalid format for '--%s' parameter, see the man page")
|
@ -1,32 +0,0 @@
|
||||
From 662e12ba1a2c2f06151b0f06814e6da0025cff2d Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Tue, 5 Oct 2021 20:51:19 +0100
|
||||
Subject: [PATCH 2/5] m4/guestfs-ocaml.m4: Fix deprecated warning format
|
||||
|
||||
In OCaml 4.13:
|
||||
|
||||
Alert ocaml_deprecated_cli: Setting a warning with a sequence of lowercase or uppercase letters,
|
||||
like 'CDEFLMPSUVYZX', is deprecated.
|
||||
Use the equivalent signed form: +C+D+E+F+L+M+P+S+U+V+Y+Z+X+52-3.
|
||||
|
||||
(cherry picked from commit fa4f59e1d99c08d7e0bae2a7cb54f254a6506d67)
|
||||
---
|
||||
m4/guestfs-ocaml.m4 | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/m4/guestfs-ocaml.m4 b/m4/guestfs-ocaml.m4
|
||||
index f5ac7eff..d2b3804a 100644
|
||||
--- a/m4/guestfs-ocaml.m4
|
||||
+++ b/m4/guestfs-ocaml.m4
|
||||
@@ -166,7 +166,7 @@ EOF
|
||||
])
|
||||
|
||||
dnl Flags we want to pass to every OCaml compiler call.
|
||||
-OCAML_WARN_ERROR="-warn-error CDEFLMPSUVYZX+52-3"
|
||||
+OCAML_WARN_ERROR="-warn-error +C+D+E+F+L+M+P+S+U+V+Y+Z+X+52-3"
|
||||
AC_SUBST([OCAML_WARN_ERROR])
|
||||
OCAML_FLAGS="-g -annot $safe_string_option"
|
||||
AC_SUBST([OCAML_FLAGS])
|
||||
--
|
||||
2.31.1
|
||||
|
@ -0,0 +1,24 @@
|
||||
From b5fdf9eac368a1c5df4ddd93ce40884924e6092a Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Tue, 7 Jul 2015 09:28:03 -0400
|
||||
Subject: [PATCH] RHEL: Reject use of libguestfs-winsupport features except for
|
||||
virt-* tools (RHBZ#1240276).
|
||||
|
||||
Fix the tests: it doesn't let us use guestfish for arbitrary Windows
|
||||
edits.
|
||||
---
|
||||
test-data/phony-guests/make-windows-img.sh | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/test-data/phony-guests/make-windows-img.sh b/test-data/phony-guests/make-windows-img.sh
|
||||
index 16debd129..1c13ddac3 100755
|
||||
--- a/test-data/phony-guests/make-windows-img.sh
|
||||
+++ b/test-data/phony-guests/make-windows-img.sh
|
||||
@@ -37,6 +37,7 @@ fi
|
||||
|
||||
# Create a disk image.
|
||||
guestfish <<EOF
|
||||
+set-program virt-testing
|
||||
sparse windows.img-t 512M
|
||||
run
|
||||
|
@ -1,33 +0,0 @@
|
||||
From 89617fbe8867254b8c5a77c7fd28ab7746338751 Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Tue, 5 Oct 2021 20:53:25 +0100
|
||||
Subject: [PATCH 3/5] customize: Suppress OCaml warning
|
||||
|
||||
In OCaml 4.13:
|
||||
|
||||
File "perl_edit.ml", line 30, characters 2-13:
|
||||
30 | c_edit_file (verbose ()) g (Guestfs.c_pointer g) file expr
|
||||
^^^^^^^^^^^
|
||||
Error (warning 6 [labels-omitted]): label verbose was omitted in the application of this function.
|
||||
|
||||
(cherry picked from commit a4930f5fad82e5358d565b8cf3610970e9646259)
|
||||
---
|
||||
m4/guestfs-ocaml.m4 | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/m4/guestfs-ocaml.m4 b/m4/guestfs-ocaml.m4
|
||||
index d2b3804a..8a23877c 100644
|
||||
--- a/m4/guestfs-ocaml.m4
|
||||
+++ b/m4/guestfs-ocaml.m4
|
||||
@@ -166,7 +166,7 @@ EOF
|
||||
])
|
||||
|
||||
dnl Flags we want to pass to every OCaml compiler call.
|
||||
-OCAML_WARN_ERROR="-warn-error +C+D+E+F+L+M+P+S+U+V+Y+Z+X+52-3"
|
||||
+OCAML_WARN_ERROR="-warn-error +C+D+E+F+L+M+P+S+U+V+Y+Z+X+52-3-6"
|
||||
AC_SUBST([OCAML_WARN_ERROR])
|
||||
OCAML_FLAGS="-g -annot $safe_string_option"
|
||||
AC_SUBST([OCAML_FLAGS])
|
||||
--
|
||||
2.31.1
|
||||
|
26
SOURCES/0004-RHEL-builder-Disable-opensuse-repository.patch
Normal file
26
SOURCES/0004-RHEL-builder-Disable-opensuse-repository.patch
Normal file
@ -0,0 +1,26 @@
|
||||
From 511de43cdca80381d52360e050bf57f7079f46d6 Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Mon, 21 Nov 2022 13:03:22 +0000
|
||||
Subject: [PATCH] RHEL: builder: Disable opensuse repository
|
||||
|
||||
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2145160
|
||||
(cherry picked from commit 8e0e91c923bd7076fd906a71678ddd3f328ae2c0)
|
||||
---
|
||||
builder/opensuse.conf.in | 10 +++++++---
|
||||
1 file changed, 7 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/builder/opensuse.conf.in b/builder/opensuse.conf.in
|
||||
index 19f979699..a57fc6977 100644
|
||||
--- a/builder/opensuse.conf.in
|
||||
+++ b/builder/opensuse.conf.in
|
||||
@@ -1,3 +1,7 @@
|
||||
-[opensuse.org]
|
||||
-uri=http://download.opensuse.org/repositories/Virtualization:/virt-builder-images/images/index
|
||||
-gpgkey=file://@SYSCONFDIR@/virt-builder/repos.d/opensuse.gpg
|
||||
+# https://bugzilla.redhat.com/show_bug.cgi?id=2145160
|
||||
+# This is disabled in RHEL by default, but you can enable it by
|
||||
+# uncommenting the lines below.
|
||||
+
|
||||
+#[opensuse.org]
|
||||
+#uri=http://download.opensuse.org/repositories/Virtualization:/virt-builder-images/images/index
|
||||
+#gpgkey=file://@SYSCONFDIR@/virt-builder/repos.d/opensuse.gpg
|
@ -1,39 +0,0 @@
|
||||
From e8148241cfd6019e493269580c7fe74d62e0fbdc Mon Sep 17 00:00:00 2001
|
||||
From: Laszlo Ersek <lersek@redhat.com>
|
||||
Date: Wed, 13 Oct 2021 18:30:42 +0200
|
||||
Subject: [PATCH 4/5] virt-inspector.rng: recognize "kalilinux" and "msdos"
|
||||
distros
|
||||
|
||||
As of libguestfs @ e597fc5317e0, the "string_of_distro" function
|
||||
[daemon/inspect_types.ml] may output "kalilinux" and "msdos" beyond what
|
||||
"virt-inspector.rng" currently accepts. Add these distro identifiers to
|
||||
"virt-inspector.rng" now.
|
||||
|
||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
Message-Id: <20211013163043.21837-2-lersek@redhat.com>
|
||||
Acked-by: Richard W.M. Jones <rjones@redhat.com>
|
||||
(cherry picked from commit aefdf0dcd4954b822e6a098f7258899f1b6a72b7)
|
||||
---
|
||||
inspector/virt-inspector.rng | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/inspector/virt-inspector.rng b/inspector/virt-inspector.rng
|
||||
index 7807e4d7..0a81538e 100644
|
||||
--- a/inspector/virt-inspector.rng
|
||||
+++ b/inspector/virt-inspector.rng
|
||||
@@ -87,10 +87,12 @@
|
||||
<value>freedos</value>
|
||||
<value>frugalware</value>
|
||||
<value>gentoo</value>
|
||||
+ <value>kalilinux</value>
|
||||
<value>linuxmint</value>
|
||||
<value>mageia</value>
|
||||
<value>mandriva</value>
|
||||
<value>meego</value>
|
||||
+ <value>msdos</value>
|
||||
<value>neokylin</value>
|
||||
<value>netbsd</value>
|
||||
<value>openbsd</value>
|
||||
--
|
||||
2.31.1
|
||||
|
@ -1,29 +0,0 @@
|
||||
From 8dad474829a8f6874c01a6d85749d8fd66d192ae Mon Sep 17 00:00:00 2001
|
||||
From: Laszlo Ersek <lersek@redhat.com>
|
||||
Date: Wed, 13 Oct 2021 18:30:43 +0200
|
||||
Subject: [PATCH 5/5] virt-inspector.rng: Add support for Kylin (RHBZ#1995391).
|
||||
|
||||
Similar-to: b8bc491ff59cc1cc24a1935be99cee0c5edfb5be
|
||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||
Message-Id: <20211013163043.21837-3-lersek@redhat.com>
|
||||
Acked-by: Richard W.M. Jones <rjones@redhat.com>
|
||||
(cherry picked from commit f041a5e24d8c5850daf7ad8f8e1a284e0445266b)
|
||||
---
|
||||
inspector/virt-inspector.rng | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/inspector/virt-inspector.rng b/inspector/virt-inspector.rng
|
||||
index 0a81538e..5b460b36 100644
|
||||
--- a/inspector/virt-inspector.rng
|
||||
+++ b/inspector/virt-inspector.rng
|
||||
@@ -88,6 +88,7 @@
|
||||
<value>frugalware</value>
|
||||
<value>gentoo</value>
|
||||
<value>kalilinux</value>
|
||||
+ <value>kylin</value>
|
||||
<value>linuxmint</value>
|
||||
<value>mageia</value>
|
||||
<value>mandriva</value>
|
||||
--
|
||||
2.31.1
|
||||
|
65
SOURCES/copy-patches.sh
Executable file
65
SOURCES/copy-patches.sh
Executable file
@ -0,0 +1,65 @@
|
||||
#!/bin/bash -
|
||||
|
||||
set -e
|
||||
|
||||
# Maintainer script to copy patches from the git repo to the current
|
||||
# directory. Use it like this:
|
||||
# ./copy-patches.sh
|
||||
|
||||
project=guestfs-tools
|
||||
rhel_version=9.4
|
||||
|
||||
# Check we're in the right directory.
|
||||
if [ ! -f $project.spec ]; then
|
||||
echo "$0: run this from the directory containing '$project.spec'"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
case `id -un` in
|
||||
rjones) git_checkout=$HOME/d/$project-rhel-$rhel_version ;;
|
||||
lacos) git_checkout=$HOME/src/v2v/$project ;;
|
||||
*) git_checkout=$HOME/d/$project-rhel-$rhel_version ;;
|
||||
esac
|
||||
if [ ! -d $git_checkout ]; then
|
||||
echo "$0: $git_checkout does not exist"
|
||||
echo "This script is only for use by the maintainer when preparing a"
|
||||
echo "$project release on RHEL."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Get the base version of the project.
|
||||
version=`grep '^Version:' $project.spec | awk '{print $2}'`
|
||||
tag="v$version"
|
||||
|
||||
# Remove any existing patches.
|
||||
git rm -f [0-9]*.patch ||:
|
||||
rm -f [0-9]*.patch
|
||||
|
||||
# Get the patches.
|
||||
(
|
||||
cd $git_checkout
|
||||
rm -f [0-9]*.patch
|
||||
git -c core.abbrev=9 format-patch -O/dev/null --subject-prefix=PATCH -N \
|
||||
--submodule=diff --no-signature --patience $tag
|
||||
)
|
||||
mv $git_checkout/[0-9]*.patch .
|
||||
|
||||
# Remove any not to be applied.
|
||||
rm -f *NOT-FOR-RPM*.patch
|
||||
|
||||
# Add the patches.
|
||||
git add [0-9]*.patch
|
||||
|
||||
# Print out the patch lines.
|
||||
echo
|
||||
echo "--- Copy the following text into $project.spec file"
|
||||
echo
|
||||
|
||||
echo "# Patches."
|
||||
for f in [0-9]*.patch; do
|
||||
n=`echo $f | awk -F- '{print $1}'`
|
||||
echo "Patch$n: $f"
|
||||
done
|
||||
|
||||
echo
|
||||
echo "--- End of text"
|
@ -1,17 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmCWR4QRHHJpY2hAYW5u
|
||||
ZXhpYS5vcmcACgkQkXOPc+G3aKB9Qg/5AYHa5Jges5uviaps3aDahEWZjKHdkHOR
|
||||
ttZ3LGxqUeY8qxwaoLpGfTpFVmTI8VQj6mQES3IeSPOpBYVPeACz7j3GCvhedsv7
|
||||
naKVIl3RO1koG8IvPUc3H9P3iaNwp9w/8I8qUinbz2++xhP3tideeomz5js0taud
|
||||
beEry79TvkxRtGRDz50YD3KOv4kVDWS46WN+tms2XJOSTX7SdZavK6VMmX+zt8aT
|
||||
8oFL6kbGKyk9bswoBLSnbrholBS6l09UbIbfhKr+xvqBgUGvbm2wqTNR7I3T2rPj
|
||||
19MPW1o/jrjRjPW7j3H73piHP/nD8S8M1Y+yEUycIZh1FEn4EDbVsiVGSbOxWZwP
|
||||
SKn0+sfuLnoINzT/PyrRKHqoP9U3kUKeanPXk1jZerCF1aBqYL/8a1fExy5Ha4LW
|
||||
JVq9P9KrWzQ5hfb5Emp+5dR2quroPfBQcRCJP8PC/5Nc0PN/JCngDfPQNScyH4lR
|
||||
PI51zDIo/E9OHqoAzrOws+Jir4AaZabERO2JDBaibtbZlbOqISOdf05SYaHFfm0u
|
||||
Tf2PFdDCd9tN1rfcv4zP5EB5Ty/APPkIa0nlhyk0QZPkx23PLF60iuyl4UOZxL5r
|
||||
IQRadagD17iaYQ9dm+V61YOuYDSr2luRh4FnyPOVJUeeCjbivz/e0f3dmRVlZzpo
|
||||
s8mtYmo7vUM=
|
||||
=qllH
|
||||
-----END PGP SIGNATURE-----
|
17
SOURCES/guestfs-tools-1.51.6.tar.gz.sig
Normal file
17
SOURCES/guestfs-tools-1.51.6.tar.gz.sig
Normal file
@ -0,0 +1,17 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmV0UtkRHHJpY2hAYW5u
|
||||
ZXhpYS5vcmcACgkQkXOPc+G3aKArQQ/8DR2NMjDy8zyXfLSAoSPcChx+wS36RRhj
|
||||
rYGSNzD2aNhMzB+WGZHomiW4ahLqj7OAuXQlmpUMjLVsAfyja8aNW7rsnfTM1l5u
|
||||
p6GS3DFTk34XgVrZO01pEBLWk9blr+xhAFP+qNIwWKv76+xO0QjNa0D5gJvBojZf
|
||||
J3ct9l1ibKqDh4eG9ReSSUh76WOxm97JwP80ZRBKCpcNJe+fceJGHdBhl5UJFw/N
|
||||
lAKY+d7MESk9aKZCNy6BRrls6IeIlsOBB8HbG5mXqMv4IfwarB91zZTG9NJRpmSN
|
||||
MzZ/GIwSCJy9U9hmG3dA/70xFu3HQkshaCisXb4FrzCnlTHZFNCvwdhY2k3qIzZr
|
||||
PuvsA3ETQqYUj66AlOOD/3TqAu36kFEeeateH75cIiOYfkUUmrO7FF76hY2jNs+q
|
||||
puTm14dg/MA0OROQv5ykcuN2ukvfsyEsCFao+76am5MG8CViy1tSnL/ZSBN0itLl
|
||||
jalFbag3GbDCwVt+lpPQbrLDTWNVabAEeN9LlMMcsciIGWDiz99Ntmwe1yxwLLl3
|
||||
kk8f9xFiWXU7C0yrPY4HzPGNjzklsaNlpzVnqgkWpR1gzpLr37HWx0E1Ct6OlJBJ
|
||||
7vllv9L9bZErUwyvlSuGcY/6rHd+KnWSS0IBvEfE/eveQErzwgiuGiBUnvGB6NUT
|
||||
l868E59pb84=
|
||||
=cEbV
|
||||
-----END PGP SIGNATURE-----
|
@ -2,14 +2,7 @@
|
||||
#
|
||||
# As the test suite takes a very long time to run and is somewhat
|
||||
# unreliable on !x86 architectures, only run it on x86-64.
|
||||
%if !0%{?rhel}
|
||||
%global test_arches x86_64
|
||||
%else
|
||||
# RHEL 9 only:
|
||||
# x86-64: "/lib64/libc.so.6: CPU ISA level is lower than required"
|
||||
# (RHBZ#1919389)
|
||||
%global test_arches NONE
|
||||
%endif
|
||||
|
||||
# Verify tarball signature with GPGv2.
|
||||
%global verify_tarball_signature 1
|
||||
@ -18,16 +11,16 @@
|
||||
%global patches_touch_autotools 1
|
||||
|
||||
# The source directory.
|
||||
%global source_directory 1.46-stable
|
||||
%global source_directory 1.51-development
|
||||
|
||||
# Filter perl provides.
|
||||
%{?perl_default_filter}
|
||||
|
||||
Summary: Tools to access and modify virtual machine disk images
|
||||
Name: guestfs-tools
|
||||
Version: 1.46.1
|
||||
Release: 5%{?dist}
|
||||
License: GPLv2+
|
||||
Version: 1.51.6
|
||||
Release: 2%{?dist}
|
||||
License: GPL-2.0-or-later AND LGPL-2.0-or-later
|
||||
|
||||
# Build only for architectures that have a kernel
|
||||
ExclusiveArch: %{kernel_arches}
|
||||
@ -48,17 +41,17 @@ Source1: http://download.libguestfs.org/guestfs-tools/%{source_directory}/
|
||||
Source2: libguestfs.keyring
|
||||
%endif
|
||||
|
||||
# Maintainer script which helps with handling patches.
|
||||
Source3: copy-patches.sh
|
||||
|
||||
# Patches are maintained in the following repository:
|
||||
# https://github.com/rwmjones/guestfs-tools/commits/rhel-9.0.0
|
||||
# https://github.com/rwmjones/guestfs-tools/commits/rhel-9.4
|
||||
|
||||
# Fix virt-win-reg --version (RHBZ#1961160)
|
||||
Patch0001: 0001-win-reg-Fix-output-of-virt-win-reg-version.patch
|
||||
|
||||
# Fix detection of Kylin Desktop (RHBZ#2025950)
|
||||
Patch0002: 0002-m4-guestfs-ocaml.m4-Fix-deprecated-warning-format.patch
|
||||
Patch0003: 0003-customize-Suppress-OCaml-warning.patch
|
||||
Patch0004: 0004-virt-inspector.rng-recognize-kalilinux-and-msdos-dis.patch
|
||||
Patch0005: 0005-virt-inspector.rng-Add-support-for-Kylin-RHBZ-199539.patch
|
||||
# Patches.
|
||||
Patch0001: 0001-Update-common-submodule.patch
|
||||
Patch0002: 0002-builder-Add-a-test-of-the-chown-parameter.patch
|
||||
Patch0003: 0003-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch
|
||||
Patch0004: 0004-RHEL-builder-Disable-opensuse-repository.patch
|
||||
|
||||
%if 0%{patches_touch_autotools}
|
||||
BuildRequires: autoconf, automake, libtool, gettext-devel
|
||||
@ -67,7 +60,7 @@ BuildRequires: autoconf, automake, libtool, gettext-devel
|
||||
# Basic build requirements.
|
||||
BuildRequires: gcc, gcc-c++
|
||||
BuildRequires: make
|
||||
BuildRequires: libguestfs-devel >= 1.45.3-1
|
||||
BuildRequires: libguestfs-devel >= 1:1.49.8-1
|
||||
BuildRequires: libguestfs-xfs
|
||||
BuildRequires: perl(Pod::Simple)
|
||||
BuildRequires: perl(Pod::Man)
|
||||
@ -79,8 +72,12 @@ BuildRequires: pcre2-devel
|
||||
BuildRequires: libxml2-devel
|
||||
BuildRequires: jansson-devel
|
||||
BuildRequires: libvirt-devel
|
||||
BuildRequires: libosinfo-devel
|
||||
BuildRequires: libxcrypt-devel
|
||||
BuildRequires: ncurses-devel
|
||||
%ifarch x86_64
|
||||
BuildRequires: glibc-static
|
||||
%endif
|
||||
BuildRequires: ocaml-libguestfs-devel
|
||||
BuildRequires: ocaml-findlib-devel
|
||||
BuildRequires: ocaml-gettext-devel
|
||||
@ -100,6 +97,7 @@ BuildRequires: perl(Expect)
|
||||
BuildRequires: bash-completion
|
||||
BuildRequires: /usr/bin/qemu-img
|
||||
BuildRequires: xorriso
|
||||
BuildRequires: hwdata-devel
|
||||
BuildRequires: perl(Locale::TextDomain)
|
||||
BuildRequires: perl(Sys::Guestfs)
|
||||
BuildRequires: perl(Win::Hivex)
|
||||
@ -110,6 +108,11 @@ BuildRequires: perl-generators
|
||||
BuildRequires: gnupg2
|
||||
%endif
|
||||
|
||||
# Ensure a minimum version of libguestfs is installed. This contains
|
||||
# a workaround for openssl bug RHBZ#2133884 and the hang where we
|
||||
# called setenv between fork and exec.
|
||||
Requires: libguestfs >= 1.49.6-1
|
||||
|
||||
# For virt-builder:
|
||||
Requires: curl
|
||||
Requires: gnupg2
|
||||
@ -119,6 +122,9 @@ Requires: xz
|
||||
# For virt-builder-repository:
|
||||
Suggests: osinfo-db
|
||||
|
||||
# For virt-drivers:
|
||||
Recommends: hwdata
|
||||
|
||||
# For virt-inspector, since Fedora and RHEL >= 7 use XFS:
|
||||
Recommends: libguestfs-xfs
|
||||
|
||||
@ -158,6 +164,8 @@ works for Windows virtual machines.
|
||||
|
||||
Virt-diff shows the differences between virtual machines.
|
||||
|
||||
Virt-drivers detects the bootloader, kernel and drivers inside a guest.
|
||||
|
||||
Virt-edit is a command line tool to edit the contents of a file in a
|
||||
virtual machine.
|
||||
|
||||
@ -196,7 +204,7 @@ Virt-tail follows (tails) a log file within a guest, like 'tail -f'.
|
||||
|
||||
%package -n virt-win-reg
|
||||
Summary: Access and modify the Windows Registry of a Windows VM
|
||||
License: GPLv2+
|
||||
License: GPL-2.0-or-later
|
||||
BuildArch: noarch
|
||||
|
||||
# This replaces the libguestfs-tools package.
|
||||
@ -209,24 +217,6 @@ Virt-win-reg lets you look at and modify the Windows Registry of
|
||||
Windows virtual machines.
|
||||
|
||||
|
||||
%if !0%{?rhel}
|
||||
%package -n virt-dib
|
||||
Summary: Safe and secure diskimage-builder replacement
|
||||
License: GPLv2+
|
||||
# This subpackage (only) must have an Epoch of 1 because it
|
||||
# replaces a package in libguestfs which had an Epoch of 1.
|
||||
Epoch: 1
|
||||
|
||||
Requires: libguestfs-dib >= 1:1.45.2-1
|
||||
|
||||
|
||||
%description -n virt-dib
|
||||
Virt-dib is a safe and secure alternative to the OpenStack
|
||||
diskimage-builder command. It is compatible with most
|
||||
diskimage-builder elements.
|
||||
%endif
|
||||
|
||||
|
||||
%package bash-completion
|
||||
Summary: Bash tab-completion scripts for %{name}
|
||||
BuildArch: noarch
|
||||
@ -284,6 +274,13 @@ make V=1 %{?_smp_mflags}
|
||||
|
||||
%check
|
||||
%ifarch %{test_arches}
|
||||
# Only run the tests with non-debug (ie. non-Rawhide) kernels.
|
||||
# XXX This tests for any debug kernel installed.
|
||||
if grep CONFIG_DEBUG_MUTEXES=y /lib/modules/*/config ; then
|
||||
echo "Skipping tests because debug kernel is installed"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Enable debugging.
|
||||
export LIBGUESTFS_DEBUG=1
|
||||
export LIBGUESTFS_TRACE=1
|
||||
@ -323,12 +320,6 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
|
||||
mv $RPM_BUILD_ROOT%{_docdir}/%{name} installed-docs
|
||||
gzip --best installed-docs/*.xml
|
||||
|
||||
%if 0%{?rhel}
|
||||
# Remove virt-dib if it was built.
|
||||
rm -f $RPM_BUILD_ROOT%{_bindir}/virt-dib
|
||||
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/virt-dib.1*
|
||||
%endif
|
||||
|
||||
# Find locale files.
|
||||
%find_lang %{name}
|
||||
|
||||
@ -359,6 +350,7 @@ end
|
||||
%{_bindir}/virt-customize
|
||||
%{_bindir}/virt-df
|
||||
%{_bindir}/virt-diff
|
||||
%{_bindir}/virt-drivers
|
||||
%{_bindir}/virt-edit
|
||||
%{_bindir}/virt-filesystems
|
||||
%{_bindir}/virt-format
|
||||
@ -372,6 +364,7 @@ end
|
||||
%{_bindir}/virt-sparsify
|
||||
%{_bindir}/virt-sysprep
|
||||
%{_bindir}/virt-tail
|
||||
%{_mandir}/man1/guestfs-tools-release-notes-1*.1*
|
||||
%{_mandir}/man1/virt-alignment-scan.1*
|
||||
%{_mandir}/man1/virt-builder-repository.1*
|
||||
%{_mandir}/man1/virt-builder.1*
|
||||
@ -379,6 +372,7 @@ end
|
||||
%{_mandir}/man1/virt-customize.1*
|
||||
%{_mandir}/man1/virt-df.1*
|
||||
%{_mandir}/man1/virt-diff.1*
|
||||
%{_mandir}/man1/virt-drivers.1*
|
||||
%{_mandir}/man1/virt-edit.1*
|
||||
%{_mandir}/man1/virt-filesystems.1*
|
||||
%{_mandir}/man1/virt-format.1*
|
||||
@ -401,15 +395,6 @@ end
|
||||
%{_mandir}/man1/virt-win-reg.1*
|
||||
|
||||
|
||||
%if !0%{?rhel}
|
||||
%files -n virt-dib
|
||||
%license COPYING
|
||||
%doc README
|
||||
%{_bindir}/virt-dib
|
||||
%{_mandir}/man1/virt-dib.1*
|
||||
%endif
|
||||
|
||||
|
||||
%files bash-completion
|
||||
%license COPYING
|
||||
%dir %{_datadir}/bash-completion/completions
|
||||
@ -425,6 +410,52 @@ end
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Jan 19 2024 Richard W.M. Jones <rjones@redhat.com> - 1.51.6-2
|
||||
- Rebase to guestfs-tools 1.51.6
|
||||
- Implement --key all:...
|
||||
resolves: RHEL-19030
|
||||
- Fix crash because of off-by-one error
|
||||
resolves: RHEL-19062
|
||||
- Fix virt-customize --chown invalid format
|
||||
resolves: RHEL-21899
|
||||
|
||||
* Thu Jun 08 2023 Laszlo Ersek <lersek@redhat.com> - 1.50.1-3
|
||||
- let virt-inspector recognize "--key /dev/mapper/VG-LV:key:password"
|
||||
- reenable "make check"; we now use "-cpu max" (libguestfs 30f74f38bd6e)
|
||||
resolves: rhbz#2209280
|
||||
|
||||
* Thu Apr 06 2023 Richard W.M. Jones <rjones@redhat.com> - 1.50.1-1
|
||||
- Rebase to guestfs-tools 1.50.1
|
||||
resolves: rhbz#2168626
|
||||
- Fix virt-drivers inspection of RHEL 9.2 guests
|
||||
resolves: rhbz#2184963
|
||||
|
||||
* Thu Nov 24 2022 Richard W.M. Jones <rjones@redhat.com> - 1.48.2-8
|
||||
- Support Rocky Linux in virt-customize
|
||||
resolves: rhbz#2133443
|
||||
- Disable OpenSUSE repo in virt-builder
|
||||
resolves: rhbz#2145160
|
||||
|
||||
* Fri Jul 15 2022 Richard W.M. Jones <rjones@redhat.com> - 1.48.2-5
|
||||
- Rebase to guestfs-tools 1.48.2
|
||||
resolves: rhbz#2059286
|
||||
- Default to --selinux-relabel in various tools
|
||||
resolves: rhbz#2075718, rhbz#2089748
|
||||
- Add lvm system.devices cleanup operation to virt-sysprep
|
||||
resolves: rhbz#2072493
|
||||
- Refactor virt-customize --install, --update options in common submodule
|
||||
- Add support for Clevis & Tang
|
||||
resolves: rhbz#1809453
|
||||
- Fix CVE-2022-2211 Denial of Service in --key parameter
|
||||
resolves: rhbz#2102721
|
||||
- Fix virt-sysprep and LUKS-on-LVM guests
|
||||
resolves: rhbz#2106286
|
||||
|
||||
* Sat Dec 04 2021 Richard W.M. Jones <rjones@redhat.com> - 1.46.1-6
|
||||
- Clean up NetworkManager connection files
|
||||
- Add the copy-patches.sh script from virt-v2v
|
||||
resolves: rhbz#1980922
|
||||
|
||||
* Tue Nov 23 2021 Richard W.M. Jones <rjones@redhat.com> - 1.46.1-5
|
||||
- Fix detection of Kylin Desktop
|
||||
resolves: rhbz#2025950
|
||||
|
Loading…
Reference in New Issue
Block a user