Skip to content

GitLab

L
libguestfs
Commit 0cacbac0 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Updated libguestfs to 1.45.6

parent 65942277
Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 36 deletions
Makefile
View file @ 0cacbac0
...@@ -6,33 +6,36 @@ all: ...@@ -6,33 +6,36 @@ all:
mkdir tmp mkdir tmp
chown nobody tmp chown nobody tmp
mount --bind tmp /var/tmp mount --bind tmp /tmp
sed '/eth0.network/d' -i /usr/share/packages/systemd.md5 sed '/eth0.network/d' -i /usr/share/packages/systemd.md5
sed '/run/d' -i /usr/share/packages/lvm2.md5 sed '/run/d' -i /usr/share/packages/lvm2.md5
sed '/\/etc\/ssl/d' -i /usr/share/packages/openssl.md5 sed '/\/etc\/ssl/d' -i /usr/share/packages/openssl.md5
tar xf libguestfs-1.42.0.tar.gz tar xf libguestfs-1.45.6.tar.gz
patch -Np1 -d libguestfs-1.42.0 < libguestfs-1.42.0-certo.patch patch -Np1 -d libguestfs-1.45.6 < libguestfs-1.45.6-certo.patch
patch -Np1 -d libguestfs-1.42.0 < libguestfs-1.42.0-mlv2v.patch patch -Np1 -d libguestfs-1.45.6 < libguestfs-1.45.6-fix_test_timeout.patch
patch -Np1 -d libguestfs-1.42.0 < libguestfs-1.42.0-fix_test_timeout.patch patch -Np1 -d libguestfs-1.45.6 < libguestfs-1.45.6-force_resize2fs.patch
patch -Np1 -d libguestfs-1.42.0 < libguestfs-1.42.0-force_resize2fs.patch patch -Np1 -d libguestfs-1.45.6 < libguestfs-1.45.6-set_raid0_layout.patch
patch -Np1 -d libguestfs-1.42.0 < libguestfs-1.42.0-set_raid0_layout.patch patch -Np1 -d libguestfs-1.45.6 < libguestfs-1.45.6-query_files_cmd.patch
cd libguestfs-1.42.0 && ./configure --prefix=/usr --sysconfdir=/etc --with-extra-packages="glibc readline ncurses util-linux xz pcre zlib systemd iproute2 libcap jansson augeas hivex libtirpc parted mdadm libaio cryptsetup popt openssl json-c cdrkit gptfdisk gcc" patch -Np1 -d libguestfs-1.45.6 < libguestfs-1.45.6-fix_9p.patch
$(MAKE) -C libguestfs-1.42.0 patch -Np1 -d libguestfs-1.45.6 < libguestfs-1.45.6-fix_isoimage_test.patch
patch -Np1 -d libguestfs-1.45.6 < libguestfs-1.45.6-fix_mount-local_test.patch
cd libguestfs-1.45.6 && ./configure --prefix=/usr --sysconfdir=/etc --with-extra-packages="glibc readline ncurses util-linux xz pcre zlib systemd iproute2 libcap jansson augeas hivex libtirpc parted mdadm libaio cryptsetup popt openssl json-c cdrkit gptfdisk gcc"
$(MAKE) -C libguestfs-1.45.6
# As of November 2020 QEMU 5.1.0 does not have functioning TCG implementation of Skylake CPU - attempt to run libguestfs tests in TCG mode bound to fail on Skylake system. # As of November 2020 QEMU 5.1.0 does not have functioning TCG implementation of Skylake CPU - attempt to run libguestfs tests in TCG mode bound to fail on Skylake system.
# As of April 2021 QEMU 5.1.0 does not have functioning TCG implementation of Cortex-A7 CPU running on ARMv7 - attempt to run libguestfs tests in TCG mode bound to fail on ARMv7 system. # As of April 2021 QEMU 5.1.0 does not have functioning TCG implementation of Cortex-A7 CPU running on ARMv7 - attempt to run libguestfs tests in TCG mode bound to fail on ARMv7 system.
# Let's skip testing (with heavy heart) hoping that whatever bugs lurking around will become apparent during builds for other types of CPUs. # Let's skip testing (with heavy heart) hoping that whatever bugs lurking around will become apparent during builds for other types of CPUs.
# This condition should be removed/modified in the future when QEMU TCG will catch up with real world Skylake CPU and/or Cortex-A7. # This condition should be removed/modified in the future when QEMU TCG will catch up with real world Skylake CPU and/or Cortex-A7.
if [[ `lscpu | grep -c "^Model name:.*Skylake"` = 0 ]] && ! [[ ! -c /dev/kvm && `uname -m` = 'armv7l' ]] ; then \ if [[ `lscpu | grep -c "^Model name:.*Skylake"` = 0 ]] && ! [[ ! -c /dev/kvm && `uname -m` = 'armv7l' ]] ; then \
chown -Rv nobody libguestfs-1.42.0 ; \ chown -Rv nobody libguestfs-1.45.6 ; \
su nobody -s /bin/bash -c "PATH=$$PATH SKIP_QEMU_FORCE_TCG_SH=1 make -C libguestfs-1.42.0 check" ; \ su nobody -s /bin/bash -c "PATH=$$PATH SKIP_QEMU_FORCE_TCG_SH=1 SKIP_TEST_RSYNC_SH=1 make -C libguestfs-1.45.6 check" ; \
fi fi
$(MAKE) -C libguestfs-1.42.0 install REALLY_INSTALL=yes $(MAKE) -C libguestfs-1.45.6 install REALLY_INSTALL=yes
rm -rf libguestfs-1.42.0 rm -rf libguestfs-1.45.6
umount /var/tmp umount /tmp
rm -rf tmp rm -rf tmp
swapoff swap swapoff swap
......
libguestfs-1.42.0-mlv2v.patch deleted 100644 → 0
View file @ 65942277
diff -uNr libguestfs-1.42.0/po/POTFILES-ml libguestfs-1.42.0-mlv2v/po/POTFILES-ml
--- libguestfs-1.42.0/po/POTFILES-ml 2020-03-10 00:03:41.405900737 +1030
+++ libguestfs-1.42.0-mlv2v/po/POTFILES-ml 2020-04-28 20:05:32.288827541 +0930
@@ -41,7 +41,6 @@
common/mltools/xpath_helpers.ml
common/mlutils/c_utils.ml
common/mlutils/unix_utils.ml
-common/mlv2v/uefi.ml
common/mlvisit/visit.ml
common/mlxml/xml.ml
customize/append_line.ml
libguestfs-1.42.0-certo.patch → libguestfs-1.45.6-certo.patch
View file @ 0cacbac0
diff -uNr libguestfs-1.42.0/appliance/hostfiles.in libguestfs-1.42.0-certo/appliance/hostfiles.in diff -uNr libguestfs-1.45.6/appliance/hostfiles.in libguestfs-1.45.6-certo/appliance/hostfiles.in
--- libguestfs-1.42.0/appliance/hostfiles.in 2020-03-07 06:01:08.078079260 +1030 --- libguestfs-1.45.6/appliance/hostfiles.in 2020-03-07 06:01:08.078079260 +1030
+++ libguestfs-1.42.0-certo/appliance/hostfiles.in 2021-09-20 14:18:01.051748080 +0930 +++ libguestfs-1.45.6-certo/appliance/hostfiles.in 2024-03-04 13:07:52.183106928 +1030
@@ -17,3 +17,54 @@ @@ -17,3 +17,60 @@
/etc/ld.so.cache /etc/ld.so.cache
/lib/lsb/* /lib/lsb/*
/usr/share/augeas/lenses/*.aug /usr/share/augeas/lenses/*.aug
...@@ -37,6 +37,8 @@ diff -uNr libguestfs-1.42.0/appliance/hostfiles.in libguestfs-1.42.0-certo/appli ...@@ -37,6 +37,8 @@ diff -uNr libguestfs-1.42.0/appliance/hostfiles.in libguestfs-1.42.0-certo/appli
+/lib/libe2p.so.2 +/lib/libe2p.so.2
+/lib/libfdisk.so.1 +/lib/libfdisk.so.1
+/lib/libbz2.so.1.0 +/lib/libbz2.so.1.0
+/lib/libcrypt.so.1
+/lib/systemd/systemd-udevd
+/sbin/reboot +/sbin/reboot
+/sbin/lsmod +/sbin/lsmod
+/sbin/modprobe +/sbin/modprobe
...@@ -52,6 +54,10 @@ diff -uNr libguestfs-1.42.0/appliance/hostfiles.in libguestfs-1.42.0-certo/appli ...@@ -52,6 +54,10 @@ diff -uNr libguestfs-1.42.0/appliance/hostfiles.in libguestfs-1.42.0-certo/appli
+/usr/lib/libjson-c.so.5 +/usr/lib/libjson-c.so.5
+/usr/lib/libmagic.so.1 +/usr/lib/libmagic.so.1
+/usr/lib/libstdc++.so.6 +/usr/lib/libstdc++.so.6
+/usr/lib/libpcre2-8.so.0
+/usr/lib/libpcre2-8.so.0.10.1
+/usr/lib/libzstd.so.1
+/usr/lib/libzstd.so.1.5.0
+/usr/sbin/mkfs.vfat +/usr/sbin/mkfs.vfat
+/usr/sbin/mkfs.msdos +/usr/sbin/mkfs.msdos
+/usr/bin/strace +/usr/bin/strace
......
libguestfs-1.45.6-fix_9p.patch 0 → 100644
View file @ 0cacbac0
diff -uNr libguestfs-1.45.6/tests/9p/test-9p.sh libguestfs-1.45.6-fix_9p/tests/9p/test-9p.sh
--- libguestfs-1.45.6/tests/9p/test-9p.sh 2020-03-07 06:01:08.586071969 +1030
+++ libguestfs-1.45.6-fix_9p/tests/9p/test-9p.sh 2024-03-06 18:50:19.374581022 +1030
@@ -45,7 +45,7 @@
sparse test-9p.img 1M
config -device '$virtio_9p,fsdev=test9p,mount_tag=test9p'
-config -fsdev 'local,id=test9p,path=${abs_srcdir},security_model=passthrough'
+config -fsdev 'local,id=test9p,path=${abs_srcdir}/9p,security_model=passthrough'
run
libguestfs-1.45.6-fix_isoimage_test.patch 0 → 100644
View file @ 0cacbac0
diff -uNr libguestfs-1.45.6/generator/actions_core.ml libguestfs-1.45.6-fix_isoimage_test/generator/actions_core.ml
--- libguestfs-1.45.6/generator/actions_core.ml 2021-04-03 21:30:22.075484966 +1030
+++ libguestfs-1.45.6-fix_isoimage_test/generator/actions_core.ml 2024-03-06 19:03:50.849242031 +1030
@@ -6882,7 +6882,8 @@
tests = [
InitNone, Always, TestResult (
[["isoinfo_device"; "/dev/sdd"]],
- "STREQ (ret->iso_volume_id, \"ISOIMAGE\") && "^
+ "(STREQ (ret->iso_volume_id, \"CDROM\") || "^
+ " STREQ (ret->iso_volume_id, \"ISOIMAGE\")) && "^
"STREQ (ret->iso_volume_set_id, \"\") && "^
"ret->iso_volume_set_size == 1 && "^
"ret->iso_volume_sequence_number == 1 && "^
libguestfs-1.45.6-fix_mount-local_test.patch 0 → 100644
View file @ 0cacbac0
diff -uNr libguestfs-1.45.6/tests/mount-local/test-parallel-mount-local.c libguestfs-1.45.6-fix_mount-local_test/tests/mount-local/test-parallel-mount-local.c
--- libguestfs-1.45.6/tests/mount-local/test-parallel-mount-local.c 2021-03-23 02:22:04.348232100 +1030
+++ libguestfs-1.45.6-fix_mount-local_test/tests/mount-local/test-parallel-mount-local.c 2024-03-06 19:21:43.043662506 +1030
@@ -220,10 +220,10 @@
if (pid == 0) { /* child */
setpgid (0, 0); /* so we don't get ^C from parent */
- execlp ("./test-parallel-mount-local",
+ execlp ("mount-local/test-parallel-mount-local",
"test-parallel-mount-local", "--test", state->mp, NULL);
perror ("execlp");
- goto error;
+ _exit (EXIT_FAILURE);
}
/* Run the FUSE main loop. We don't really want to see libguestfs
libguestfs-1.42.0-fix_test_timeout.patch → libguestfs-1.45.6-fix_test_timeout.patch
View file @ 0cacbac0
diff -uNr libguestfs-1.42.0/run.in libguestfs-1.42.0-fix_test_timeout/run.in diff -uNr libguestfs-1.45.6/run.in libguestfs-1.45.6-fix_test_timeout/run.in
--- libguestfs-1.42.0/run.in 2020-03-07 06:01:08.573072155 +1030 --- libguestfs-1.45.6/run.in 2021-05-28 02:02:10.000000000 +0930
+++ libguestfs-1.42.0-fix_test_timeout/run.in 2021-01-12 01:56:19.346154903 +1030 +++ libguestfs-1.45.6-fix_test_timeout/run.in 2023-08-25 13:11:57.858811531 +0930
@@ -243,7 +243,7 @@ @@ -248,7 +248,7 @@
# Originally 1h, but that is not long enough to run the C API # Originally 1h, but that is not long enough to run the C API
# tests on Koji. # tests on Koji.
...@@ -10,10 +10,10 @@ diff -uNr libguestfs-1.42.0/run.in libguestfs-1.42.0-fix_test_timeout/run.in ...@@ -10,10 +10,10 @@ diff -uNr libguestfs-1.42.0/run.in libguestfs-1.42.0-fix_test_timeout/run.in
timeout_kill=30s timeout_kill=30s
# Must use the --foreground option (RHBZ#1025269). # Must use the --foreground option (RHBZ#1025269).
diff -uNr libguestfs-1.42.0/tests/c-api/tests-main.c libguestfs-1.42.0-fix_test_timeout/tests/c-api/tests-main.c diff -uNr libguestfs-1.45.6/tests/c-api/tests-main.c libguestfs-1.45.6-fix_test_timeout/tests/c-api/tests-main.c
--- libguestfs-1.42.0/tests/c-api/tests-main.c 2020-03-07 06:01:08.588071940 +1030 --- libguestfs-1.45.6/tests/c-api/tests-main.c 2021-05-28 02:02:10.000000000 +0930
+++ libguestfs-1.42.0-fix_test_timeout/tests/c-api/tests-main.c 2021-01-12 01:55:30.500011272 +1030 +++ libguestfs-1.45.6-fix_test_timeout/tests/c-api/tests-main.c 2023-08-25 13:11:57.858811531 +0930
@@ -446,7 +446,7 @@ @@ -452,7 +452,7 @@
} }
/* Set a timeout in case qemu hangs during launch (RHBZ#505329). */ /* Set a timeout in case qemu hangs during launch (RHBZ#505329). */
......
libguestfs-1.42.0-force_resize2fs.patch → libguestfs-1.45.6-force_resize2fs.patch
View file @ 0cacbac0
diff -uNr libguestfs-1.42.0/daemon/ext2.c libguestfs-1.42.0-force_resize2fs/daemon/ext2.c diff -uNr libguestfs-1.45.6/daemon/ext2.c libguestfs-1.45.6-force_resize2fs/daemon/ext2.c
--- libguestfs-1.42.0/daemon/ext2.c 2020-03-07 06:01:08.114078744 +1030 --- libguestfs-1.45.6/daemon/ext2.c 2021-05-28 02:02:10.000000000 +0930
+++ libguestfs-1.42.0-force_resize2fs/daemon/ext2.c 2021-01-07 11:23:05.455008816 +1030 +++ libguestfs-1.45.6-force_resize2fs/daemon/ext2.c 2023-08-25 13:13:24.188929518 +0930
@@ -207,7 +207,7 @@ @@ -207,7 +207,7 @@
if (if_not_mounted_run_e2fsck (device) == -1) if (if_not_mounted_run_e2fsck (device) == -1)
return -1; return -1;
......
libguestfs-1.45.6-query_files_cmd.patch 0 → 100644
View file @ 0cacbac0
diff -uNr libguestfs-1.45.6/appliance/Makefile.am libguestfs-1.45.6-query_files_cmd/appliance/Makefile.am
--- libguestfs-1.45.6/appliance/Makefile.am 2020-12-01 22:01:56.038534170 +1030
+++ libguestfs-1.45.6-query_files_cmd/appliance/Makefile.am 2024-02-29 16:52:19.721428913 +1030
@@ -89,6 +89,7 @@
if HAVE_PACMAN
QUERY_FILES_CMD := xargs pacman -Qo | sed -r 's/.* is owned by ([^ ]+) .*/\1/'
endif
+QUERY_FILES_CMD := xargs -I % grep -l % /usr/share/packages/* | sed -e 's!.*/!!' -e 's!\.md5!!'
# Automatically generate library dependency list
guestfsd.deps: ../daemon/guestfsd
diff -uNr libguestfs-1.45.6/appliance/Makefile.in libguestfs-1.45.6-query_files_cmd/appliance/Makefile.in
--- libguestfs-1.45.6/appliance/Makefile.in 2021-05-28 01:45:15.093487229 +0930
+++ libguestfs-1.45.6-query_files_cmd/appliance/Makefile.in 2024-02-29 16:51:26.801528221 +1030
@@ -655,6 +655,7 @@
@HAVE_DPKG_TRUE@QUERY_FILES_CMD := xargs dpkg -S | cut -d: -f1
@HAVE_PACMAN_TRUE@QUERY_FILES_CMD := xargs pacman -Qo | sed -r 's/.* is owned by ([^ ]+) .*/\1/'
@HAVE_RPM_TRUE@QUERY_FILES_CMD := xargs rpm -qf --qf '%{name}\n'
+QUERY_FILES_CMD := xargs -I % grep -l % /usr/share/packages/* | sed -e 's!.*/!!' -e 's!\.md5!!'
# If installing the daemon, install the udev rules too.
@INSTALL_DAEMON_TRUE@udevrulesdir = /lib/udev/rules.d
libguestfs-1.42.0-set_raid0_layout.patch → libguestfs-1.45.6-set_raid0_layout.patch
View file @ 0cacbac0
diff -uNr libguestfs-1.42.0/lib/appliance-kcmdline.c libguestfs-1.42.0-set_raid0_layout/lib/appliance-kcmdline.c diff -uNr libguestfs-1.45.6/lib/appliance-kcmdline.c libguestfs-1.45.6-set_raid0_layout/lib/appliance-kcmdline.c
--- libguestfs-1.42.0/lib/appliance-kcmdline.c 2020-03-07 06:01:08.166077997 +1030 --- libguestfs-1.45.6/lib/appliance-kcmdline.c 2021-05-28 02:02:10.000000000 +0930
+++ libguestfs-1.42.0-set_raid0_layout/lib/appliance-kcmdline.c 2022-03-22 05:15:31.808267407 +1030 +++ libguestfs-1.45.6-set_raid0_layout/lib/appliance-kcmdline.c 2023-08-25 13:16:09.087154883 +0930
@@ -204,6 +204,9 @@ @@ -286,6 +286,9 @@
/* Don't scan all 8250 UARTS. */ /* Don't scan all 8250 UARTS. */
guestfs_int_add_string (g, &argv, "8250.nr_uarts=1"); guestfs_int_add_string (g, &argv, "8250.nr_uarts=1");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment