diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..c9a618551d7d788cde5f4326178966a3917277e9 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.gz filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..a23e0755b00cf143c31e46876d64788ba0329953 --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/libguestfs-tools diff --git a/0001-customize-timezone.ml-Add-gettext-f_-call-around-an-.patch b/0001-customize-timezone.ml-Add-gettext-f_-call-around-an-.patch deleted file mode 100644 index 679ca244661e5cf76176612512c95af1d1c1d808..0000000000000000000000000000000000000000 --- a/0001-customize-timezone.ml-Add-gettext-f_-call-around-an-.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 5e5baad0f29b1aff5e99664a19ca9270da9c2af3 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Mon, 6 Feb 2023 15:04:03 +0000 -Subject: [PATCH] customize/timezone.ml: Add gettext f_ call around an error - message - -Problem has existed since before we moved the code to the current -location in 2014 (in commit f1f5208bd5 "customize: Move -virt-customize-related code to a separate directory"). ---- - customize/timezone.ml | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/customize/timezone.ml b/customize/timezone.ml -index 2ac7a105..1de566e1 100644 ---- a/customize/timezone.ml -+++ b/customize/timezone.ml -@@ -17,6 +17,7 @@ - *) - - open Tools_utils -+open Common_gettext.Gettext - - open Printf - -@@ -31,7 +32,8 @@ let set_timezone (g : Guestfs.guestfs) root timezone = - | "linux" -> - let target = sprintf "/usr/share/zoneinfo/%s" timezone in - if not (g#exists target) then -- error "timezone '%s' does not exist, use a location like 'Europe/London'" timezone; -+ error (f_"timezone '%s' does not exist, use a location like \ -+ 'Europe/London'") timezone; - g#ln_sf target "/etc/localtime"; - true - --- -2.39.1 - diff --git a/0002-guestfs-tools-adapt-virt-customize-for-openEuler-ima.patch b/0002-guestfs-tools-adapt-virt-customize-for-openEuler-ima.patch deleted file mode 100644 index fe961532882268018b22e28dbc8f9d0a998c6a27..0000000000000000000000000000000000000000 --- a/0002-guestfs-tools-adapt-virt-customize-for-openEuler-ima.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 4706c7d842c5a06daa3871a9eb2a6b5aaf097808 Mon Sep 17 00:00:00 2001 -From: Wang Guoquan -Date: Wed, 11 Sep 2024 09:51:34 +0800 -Subject: [PATCH] guestfs-tools: adapt virt-customize for openEuler image - -enable virt-customize options, such as first-boot, hostname, password. - -Signed-off-by: Wang Guoquan ---- - common/mlcustomize/firstboot.ml | 2 +- - customize/hostname.ml | 4 ++-- - customize/password.ml | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/common/mlcustomize/firstboot.ml b/common/mlcustomize/firstboot.ml -index 0c76283..73a336d 100644 ---- a/common/mlcustomize/firstboot.ml -+++ b/common/mlcustomize/firstboot.ml -@@ -152,7 +152,7 @@ WantedBy=%s - and install_sysvinit_service g root distro major = - match distro with - | "fedora"|"rhel"|"centos"|"scientificlinux"|"oraclelinux"|"rocky"| -- "redhat-based" -> -+ "redhat-based" |"openeuler" -> - install_sysvinit_redhat g - | "opensuse"|"sles"|"suse-based" -> - install_sysvinit_suse g -diff --git a/customize/hostname.ml b/customize/hostname.ml -index fabba3c..b301a3e 100644 ---- a/customize/hostname.ml -+++ b/customize/hostname.ml -@@ -37,7 +37,7 @@ let rec set_hostname (g : Guestfs.guestfs) root hostname = - true - - | "linux", ("rhel"|"centos"|"scientificlinux"|"oraclelinux"|"rocky"| -- "redhat-based"), v -+ "redhat-based"| "openeuler"), v - when v >= 7 -> - update_etc_hostname g hostname; - update_etc_machine_info g hostname; -@@ -49,7 +49,7 @@ let rec set_hostname (g : Guestfs.guestfs) root hostname = - replace_host_in_etc_hosts g old_hostname hostname; - true - -- | "linux", ("fedora"|"rhel"|"centos"|"scientificlinux"|"oraclelinux"|"redhat-based"), _ -> -+ | "linux", ("fedora"|"rhel"|"centos"|"scientificlinux"|"oraclelinux"|"redhat-based"|"openeuler"), _ -> - replace_line_in_file g "/etc/sysconfig/network" "HOSTNAME" hostname; - true - -diff --git a/customize/password.ml b/customize/password.ml -index b37b31f..094bfb6 100644 ---- a/customize/password.ml -+++ b/customize/password.ml -@@ -186,7 +186,7 @@ and default_crypto g root = - - (* Rolling distributions, which hopefully should be updated enough. *) - | ("archlinux"|"kalilinux"), _ -> `YESCRYPT -- | ("voidlinux"), _ -> `SHA512 -+ | ("voidlinux"|"openeuler"), _ -> `SHA512 - - | _, _ -> - let minor = g#inspect_get_minor_version root in --- -2.43.0 - diff --git a/guestfs-tools-1.49.5.tar.gz b/guestfs-tools-1.49.5.tar.gz deleted file mode 100644 index c4a427d4942bb25bc829b24d06084550eabad83a..0000000000000000000000000000000000000000 Binary files a/guestfs-tools-1.49.5.tar.gz and /dev/null differ diff --git a/guestfs-tools-1.49.5.tar.gz.sig b/guestfs-tools-1.49.5.tar.gz.sig deleted file mode 100644 index b2fa4bcfdefad6d50a3dbe30cdeff028751ca6b2..0000000000000000000000000000000000000000 --- a/guestfs-tools-1.49.5.tar.gz.sig +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmNF0hwRHHJpY2hAYW5u -ZXhpYS5vcmcACgkQkXOPc+G3aKD8fw//cblY7mMgAKcAWt+nWqi3X8Ku2exSYnKy -2JdQa43Jq20WCViUpOOFkU8qG+D18whR54e13DB/+KY53cObRw4d4kqSnMD1e3ID -ziOK5ch5nl2uEjvsYPZNS9nl+5VEX3LSPKj5fV/Q2Oitvqx3wPfMivH3IJbn2rnv -fPqddk9AyUzidP1wuX6qNhQLZF9SCqAg1NsBwXANj+u3GuoC8VxRl7AiNrWSaO9z -xkrHEm/HktClOZBBHFYJr52jlMIlrYng2kc2aHpS/dL74dU3isPc2hI6YKmhbO95 -o+upIsdeuB4/fIUoD/H+jGudQzzRvv+d1uiaSachYyAEVplTk6T4Aue62B2mIfDC -oKfvLSRiYhLdrZdTJGVlCOQIilatv5Vwa4bUFR2NekxL0OMfbz4UCC1x5BFK8q9g -2XiCa5apRqFRLMZ0Ee5/YtiWdWY6v2JNkxv2oJk2iP3ogMYCZrZnOxylSOAi5Mgy -bIDUsI6W4ZHB0ChY4vnyiXEYT7hpKRmAIZtmpfrix7Oc/I5Wog/QUJOxRbp1Y5g9 -2+CKqe9oDQp4YiiW5wfEmBGF9fYK3+1T8c0CP00yjQOGAgvucSivgfIW+n2filCf -I5phRhjCAawdXn8fookDhluA8Y/DVWkalqOvS14PgwjXC6ZQoWFHzkPFmjFtNK+E -dbl3yD0UDn8= -=4igm ------END PGP SIGNATURE----- diff --git a/guestfs-tools-1.54.0.tar.gz b/guestfs-tools-1.54.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..160a2b1c9136f905805bcdd4748a15a5d9688240 --- /dev/null +++ b/guestfs-tools-1.54.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b6efbe365f7afe44649ed983bb4564985b523f88b41abb8c2b0de1598868fa2 +size 16243507 diff --git a/libguestfs-tools.spec b/libguestfs-tools.spec index 9a006a6218b7d1bb99f13f4ed631a570fed1d5db..68de5b8445c4f608a87bfb57a8bf83138cae0719 100644 --- a/libguestfs-tools.spec +++ b/libguestfs-tools.spec @@ -1,41 +1,32 @@ -# Verify tarball signature with GPGv2. -%global verify_tarball_signature 1 - -# If there are patches which touch autotools files, set this to 1. -%global patches_touch_autotools %{nil} - # The source directory. -%global source_directory 1.49-development - -# Filter perl provides. -%{?perl_default_filter} +%global source_directory 1.54-stable Summary: Tools to access and modify virtual machine disk images Name: guestfs-tools -Version: 1.49.5 -Release: 3%{?dist} -License: GPLv2+ +Version: 1.54.0 +Release: 1 +License: GPL-2.0-or-later ExcludeArch: %{power64} # Source and patches. -URL: http://libguestfs.org/ -Source0: http://download.libguestfs.org/guestfs-tools/%{source_directory}/%{name}-%{version}.tar.gz -%if 0%{verify_tarball_signature} -Source1: http://download.libguestfs.org/guestfs-tools/%{source_directory}/%{name}-%{version}.tar.gz.sig -%endif - -Patch1: 0001-customize-timezone.ml-Add-gettext-f_-call-around-an-.patch -Patch2: 0002-guestfs-tools-adapt-virt-customize-for-openEuler-ima.patch - -%if 0%{patches_touch_autotools} -BuildRequires: autoconf, automake, libtool, gettext-devel -%endif +URL: https://libguestfs.org/ +Source0: https://download.libguestfs.org/guestfs-tools/%{source_directory}/%{name}-%{version}.tar.gz # Basic build requirements. BuildRequires: gcc, gcc-c++ BuildRequires: make -BuildRequires: libguestfs-devel >= 1.49.5-1 +BuildRequires: pkgconfig(bash-completion) >= 2.0 +BuildRequires: pkgconfig(json-c) >= 0.14 +BuildRequires: pkgconfig(libguestfs) >= 1.55.6 +BuildRequires: pkgconfig(liblzma) +BuildRequires: pkgconfig(libosinfo-1.0) +BuildRequires: pkgconfig(libpcre2-8) +BuildRequires: pkgconfig(libvirt) >= 0.10.2 +BuildRequires: pkgconfig(libxcrypt) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(ncurses) +BuildRequires: pkgconfig(tinfo) BuildRequires: libguestfs-xfs BuildRequires: perl(Pod::Simple) BuildRequires: perl(Pod::Man) @@ -43,19 +34,12 @@ BuildRequires: perl(Module::Build) BuildRequires: perl(Test::More) BuildRequires: /usr/bin/pod2text BuildRequires: po4a -BuildRequires: pcre2-devel -BuildRequires: libxml2-devel -BuildRequires: jansson-devel -BuildRequires: libvirt-devel -BuildRequires: libxcrypt-devel -BuildRequires: ncurses-devel BuildRequires: ocaml-libguestfs-devel BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-gettext-devel BuildRequires: ocaml-ounit-devel BuildRequires: flex BuildRequires: bison -BuildRequires: xz-devel BuildRequires: zip BuildRequires: unzip BuildRequires: perl(Expect) @@ -71,7 +55,6 @@ BuildRequires: perl-generators # For virt-builder: Requires: curl -Requires: gnupg2 Requires: /usr/bin/qemu-img Requires: xz @@ -87,6 +70,7 @@ Suggests: perl # This replaces the libguestfs-tools-c package. Provides: libguestfs-tools-c = 1:%{version}-%{release} Obsoletes: libguestfs-tools-c <= 1:1.49.5-1 +Provides: guestfs-tools = %{version}-%{release} %description @@ -155,7 +139,6 @@ 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+ BuildArch: noarch # This replaces the libguestfs-tools package. @@ -168,20 +151,6 @@ Virt-win-reg lets you look at and modify the Windows Registry of Windows virtual machines. -%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 - - -%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. - - %package bash-completion Summary: Bash tab-completion scripts for %{name} BuildArch: noarch @@ -215,13 +184,7 @@ for %{name}. %prep -%setup -q -%autopatch -p1 - -%if 0%{patches_touch_autotools} -autoreconf -i -%endif - +%autosetup -p1 %build %{configure} @@ -272,10 +235,8 @@ fi %install -make DESTDIR=$RPM_BUILD_ROOT install - -# Delete libtool files. -find $RPM_BUILD_ROOT -name '*.la' -delete +%make_install +%delete_la # Move installed documentation back to the source directory so # we can install it using a %%doc rule. @@ -313,6 +274,7 @@ end %{_bindir}/virt-customize %{_bindir}/virt-df %{_bindir}/virt-diff +%{_bindir}/virt-drivers %{_bindir}/virt-edit %{_bindir}/virt-filesystems %{_bindir}/virt-format @@ -334,6 +296,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* @@ -356,13 +319,6 @@ end %{_mandir}/man1/virt-win-reg.1* -%files -n virt-dib -%license COPYING -%doc README -%{_bindir}/virt-dib -%{_mandir}/man1/virt-dib.1* - - %files bash-completion %license COPYING %dir %{_datadir}/bash-completion/completions @@ -378,9 +334,14 @@ end %changelog +* Mon Jun 23 2025 Funda Wang - 1.54.0-1 +- update to 1.54.0 + * Tue Sep 17 2024 Wang Guoquan - 1.49.5-3 - guestfs-tools-adapt-virt-customize-for-openEuler-ima + * Wed Apr 24 2024 Wei Jiangang - 1.49.5-2 - Fix error message by adding gettext f_ call around it. + * Tue Mar 23 2021 Wei Jiangang - 1.49.5-1 - New guestfs-tools package, split off from libguestfs.