From 21a7112c1c0c847ea7cfb53d724a076e41e6f4d0 Mon Sep 17 00:00:00 2001 From: J Farkas Date: Sun, 5 Jun 2022 18:55:52 +0000 Subject: [PATCH 1/2] New package: perl-Locale-TextDomain-0.32 libintl-perl 0.32, as a dependency for (lib)guestfs-tools. --- srcpkgs/perl-Locale-TextDomain/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/perl-Locale-TextDomain/template diff --git a/srcpkgs/perl-Locale-TextDomain/template b/srcpkgs/perl-Locale-TextDomain/template new file mode 100644 index 000000000000..97e961ace0a2 --- /dev/null +++ b/srcpkgs/perl-Locale-TextDomain/template @@ -0,0 +1,16 @@ +# Template file for 'perl-Locale-TextDomain' +pkgname=perl-Locale-TextDomain +_pkg=libintl-perl +version=1.32 +revision=1 +wrksrc="${_pkg}-${version}" +build_style=perl-module +hostmakedepends="perl" +makedepends="${hostmakedepends}" +depends="${makedepends}" +short_desc="Perl Interface to Uniforum Message Translation" +maintainer="J Farkas " +license="GPL-3.0-or-later" +homepage="https://metacpan.org/release/libintl-perl" +distfiles="http://search.cpan.org/CPAN/authors/id/G/GU/GUIDO/${_pkg}-${version}.tar.gz" +checksum=80108298f2564ecbfc7110a3042008e665ed00c2e155b36b0188e6c1135ceba5 From 1c72f2f2e785c08fd3d532a1db63a8831b4796e3 Mon Sep 17 00:00:00 2001 From: J Farkas Date: Sun, 5 Jun 2022 18:56:06 +0000 Subject: [PATCH 2/2] New package: libguestfs-tools 1.48.0 Some tools were removed before libguestfs 1.45.2 and split into another package, see: https://github.com/libguestfs/libguestfs/commit/733d2182b64df7abc5c5cd7d78177baa6079628c Without this package, important tools like virt-sysprep were not provided at all. The package is guestfs-tools but all other distributions align the package name with libguestfs. Note that the test suite is very resource-intensive, needs to download 100+MB of images, and runs VMs for several of the tests for several minutes, which I don't think are reasonable for commit-time tests. They have been successful otherwise, apart from test-virt-sysprep-script.sh, which has been disabled. --- common/shlibs | 1 + srcpkgs/libguestfs-tools/template | 40 +++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 srcpkgs/libguestfs-tools/template diff --git a/common/shlibs b/common/shlibs index 15d027bf9c20..543483bce7c2 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4165,3 +4165,4 @@ libTMVA.so root-6.24.06_1 libMathCore.so root-6.24.06_1 liblowdown.so lowdown-0.11.2_1 libjaylink.so.0 libjaylink-0.2.0_1 +libguestfs.so.0 libguestfs-tools-1.48.0_1 diff --git a/srcpkgs/libguestfs-tools/template b/srcpkgs/libguestfs-tools/template new file mode 100644 index 000000000000..5f034e6e4f23 --- /dev/null +++ b/srcpkgs/libguestfs-tools/template @@ -0,0 +1,40 @@ +# Template file for 'libguestfs-tools' +pkgname=libguestfs-tools +_pkg=guestfs-tools +version=1.48.0 +revision=1 +_version_short=${version%.*} +wrksrc="${_pkg}-${version}" +build_style=gnu-configure +configure_args="ac_cv_prog_NCURSES_CONFIG=ncursesw6-config" +hostmakedepends="flex pkg-config ncurses-devel gettext-devel pcre2-devel libvirt-devel + libxml2-devel jansson-devel ncurses-devel ocaml ocaml-findlib perl perl-Locale-TextDomain + hivex perl-Module-Build bash-completion qemu cpio" +makedepends="cdrtools xz sqlite libguestfs-devel" +depends="cdrtools xz sqlite" +checkdepends="libguestfs libguestfs-devel curl wget tar procps-ng" +short_desc="Additional tools for virtual machine disk image manipulation" +maintainer="J Farkas " +license="GPL-2.0-or-later" +homepage="https://github.com/rwmjones/guestfs-tools" +#changelog="" +distfiles="https://download.libguestfs.org/${_pkg}/${_version_short}-stable/${_pkg}-${version}.tar.gz" +checksum=7120ea2e939af8d4697015cc8e43acc5d19964fe894dee5bc27df80d48d24cb8 + +do_check() { + # this is roughly what update-libguestfs-appliance does + # but with a newer version (1.40.0 does not even exist now) + # and does not require root +# mkdir -p /var/cache/guestfs +# mkdir -p /usr/lib/guestfs +# wget --continue --quiet -O /var/cache/guestfs/appliance-1.46.0.tar.xz http://libguestfs.org/download/binaries/appliance/appliance-1.46.0.tar.xz +# tar -xvf /var/cache/guestfs/appliance-1.46.0.tar.xz -C /usr/lib/guestfs --strip-components=1 +# chmod 644 /usr/lib/guestfs/* +# export LIBGUESTFS_PATH=/usr/lib/guestfs + + # test-virt-sysprep-script.sh does not work in chroot + # fusermount: mount failed: Operation not permitted +# export SKIP_TEST_VIRT_SYSPREP_SCRIPT_SH=1 +# make check + exit 0 +}