Sync from SUSE:SLFO:Main libguestfs revision 65b403f8647e49feb1ef0ddbd92251fe
This commit is contained in:
parent
028c6a7032
commit
bec3bb9036
20
Initialise-bar-fp-as-NULL.patch
Normal file
20
Initialise-bar-fp-as-NULL.patch
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
Subject: Initialise bar->fp as NULL
|
||||
From: Ben Brown ben.brown@softiron.com Thu Mar 28 12:35:28 2024 +0000
|
||||
Date: Thu Mar 28 12:53:52 2024 +0000:
|
||||
Git: 0330ebe40cb645df311bab25888c5ca6cc179efe
|
||||
|
||||
Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
|
||||
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2272045
|
||||
|
||||
diff --git a/common/progress/progress.c b/common/progress/progress.c
|
||||
index e4b3066..5848abd 100644
|
||||
--- a/common/progress/progress.c
|
||||
+++ b/common/progress/progress.c
|
||||
@@ -123,6 +123,7 @@ progress_bar_init (unsigned flags)
|
||||
bar->machine_readable = 1;
|
||||
bar->utf8_mode = 0;
|
||||
bar->have_terminfo = 0;
|
||||
+ bar->fp = NULL;
|
||||
} else {
|
||||
bar->machine_readable = 0;
|
||||
|
||||
24
Split-chown-parameter-on-character.patch
Normal file
24
Split-chown-parameter-on-character.patch
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
Subject: generator/customize.ml: Split --chown parameter on ':' character
|
||||
From: Richard W.M. Jones rjones@redhat.com Fri Jan 19 13:18:00 2024 +0000
|
||||
Date: Fri Jan 19 13:24:37 2024 +0000:
|
||||
Git: e9a728bb22dfa1de5328fbbe7d6d7acad2dbed64
|
||||
|
||||
The previous code split it on ',' which was completely wrong.
|
||||
(It reveals the lack of testing however).
|
||||
|
||||
Fixes: commit c08032ebe2763f5e9ce5b14e003721475219d390
|
||||
Reported-by: Yongkui Guo
|
||||
|
||||
diff --git a/generator/customize.ml b/generator/customize.ml
|
||||
index e64b45c0d..e2c4b6051 100644
|
||||
--- a/generator/customize.ml
|
||||
+++ b/generator/customize.ml
|
||||
@@ -775,7 +775,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,3 +1,49 @@
|
|||
-------------------------------------------------------------------
|
||||
Wed May 8 12:42:02 MDT 2024 - carnold@suse.com
|
||||
|
||||
- Set Recommends on zerofree and ntfsprogs for libguestfs-appliance
|
||||
(bsc#1223444)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue May 7 10:27:25 MDT 2024 - carnold@suse.com
|
||||
|
||||
- Switch Recommends to Requires for several packages in the
|
||||
libguestfs-appliance which is where the tools from these
|
||||
packages are used. (bsc#1223444)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 15 13:11:57 MDT 2024 - carnold@suse.com
|
||||
|
||||
- Require ntfs-3g for libguestfs-winsupport
|
||||
libguestfs.spec
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 29 13:13:41 MDT 2024 - carnold@suse.com
|
||||
|
||||
- Upstream bug fixes
|
||||
Split-chown-parameter-on-character.patch
|
||||
Initialise-bar-fp-as-NULL.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 5 14:24:08 MST 2024 - carnold@suse.com
|
||||
|
||||
- bsc#1206361 - SLES 15 SP5 Beta2 - virt-customize ssh-inject fails
|
||||
(s390x/kvm/libvirt) (-> Server-Applications module)
|
||||
use-rtc-driftfix-slew-for-x86-only.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 1 04:30:27 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- BuildRequire pkgconfig(libzstd) additionaly to zstd: we need the
|
||||
devel package. In the past, it was pulled in by indirect deps.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 11 15:45:00 MST 2024 - carnold@suse.com
|
||||
|
||||
- Copy sorted packagelist to packages during supermin appliance
|
||||
setup. (bsc#1215586)
|
||||
libguestfs.spec
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 4 13:10:51 MST 2024 - carnold@suse.com
|
||||
|
||||
|
|
|
|||
|
|
@ -32,6 +32,9 @@ Source100: mount-rootfs-and-chroot.sh
|
|||
Source101: README
|
||||
|
||||
# Patches
|
||||
Patch1: use-rtc-driftfix-slew-for-x86-only.patch
|
||||
Patch2: Split-chown-parameter-on-character.patch
|
||||
Patch3: Initialise-bar-fp-as-NULL.patch
|
||||
|
||||
BuildRequires: bison
|
||||
BuildRequires: file-devel
|
||||
|
|
@ -70,6 +73,7 @@ BuildRequires: pkgconfig(libpcre2-8)
|
|||
BuildRequires: pkgconfig(libtirpc)
|
||||
BuildRequires: pkgconfig(libvirt)
|
||||
BuildRequires: pkgconfig(libxml-2.0)
|
||||
BuildRequires: pkgconfig(libzstd)
|
||||
BuildRequires: pkgconfig(ncurses)
|
||||
BuildRequires: pkgconfig(python3)
|
||||
BuildRequires: pkgconfig(rpm) >= 4.6.0
|
||||
|
|
@ -97,7 +101,7 @@ sed -i 's/tar zcf/tar -zcf/' appliance/Makefile.am
|
|||
# provide a wrapper to tar that creates bit-reproducible output (boo#1218191)
|
||||
# used in supermin for base.tar.gz, in %install for zz-winsupport.tar.gz zz-scripts.tar.gz and in appliance/Makefile.am for 3 more .tar.gz files
|
||||
SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH:-$(date -r %{SOURCE0} +%%s)}
|
||||
mkdir ~/bin ; cat >~/bin/tar <<EOF
|
||||
mkdir -p ~/bin ; cat >~/bin/tar <<EOF
|
||||
#!/bin/sh
|
||||
exec /usr/bin/tar \
|
||||
--sort=name --clamp-mtime --mtime=@$SOURCE_DATE_EPOCH \
|
||||
|
|
@ -223,6 +227,8 @@ find %{buildroot}/ -name "*.bs" -size 0c -print -delete
|
|||
# OCaml
|
||||
%ocaml_create_file_list
|
||||
# Supermin
|
||||
# Use RPMs from packagelist for the packages file. Sort and clean leading whitespace.
|
||||
sort -u appliance/packagelist | awk '{$1=$1};1' > %buildroot%_libdir/guestfs/supermin.d/packages
|
||||
pushd $RPM_BUILD_ROOT%{_libdir}/guestfs/supermin.d
|
||||
|
||||
function remove
|
||||
|
|
@ -363,6 +369,7 @@ BuildRequires: xz
|
|||
# the appliance will fail to start the guestfsd.
|
||||
Requires: augeas
|
||||
Requires: augeas-lenses
|
||||
Requires: dhcp-client
|
||||
Requires: libaugeas0
|
||||
Requires: libcap2
|
||||
Requires: libguestfs0
|
||||
|
|
@ -371,20 +378,19 @@ Requires: libpcre1
|
|||
|
||||
# For core disk features
|
||||
Requires: qemu-tools
|
||||
Requires: btrfsprogs
|
||||
Requires: cryptsetup
|
||||
Requires: dosfstools
|
||||
Requires: e2fsprogs
|
||||
Requires: gptfdisk
|
||||
Requires: jfsutils
|
||||
Requires: ldmtool
|
||||
Requires: mdadm
|
||||
Requires: mkisofs
|
||||
Recommends: ntfsprogs
|
||||
Requires: parted
|
||||
Requires: supermin >= 5.1.18
|
||||
|
||||
# Optional packages that could be picked up by supermin
|
||||
Recommends: btrfsprogs
|
||||
Recommends: cryptsetup
|
||||
Recommends: dosfstools
|
||||
Recommends: e2fsprogs
|
||||
Recommends: gptfdisk
|
||||
Recommends: jfsutils
|
||||
Recommends: ldmtool
|
||||
Recommends: mdadm
|
||||
Recommends: mkisofs
|
||||
Recommends: parted
|
||||
Recommends: xfsprogs
|
||||
Requires: xfsprogs
|
||||
Recommends: zerofree
|
||||
|
||||
Summary: Virtual machine needed for libguestfs
|
||||
|
|
@ -400,6 +406,8 @@ Requires: libguestfs >= 1.32
|
|||
BuildRequires: ntfs-3g
|
||||
BuildRequires: ntfsprogs
|
||||
BuildRequires: rsync
|
||||
Requires: ntfs-3g
|
||||
Requires: ntfsprogs
|
||||
Provides: guestfs-winsupport = %{version}
|
||||
Obsoletes: guestfs-winsupport < %{version}
|
||||
|
||||
|
|
|
|||
13
use-rtc-driftfix-slew-for-x86-only.patch
Normal file
13
use-rtc-driftfix-slew-for-x86-only.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
--- libguestfs-1.52.0/lib/launch-direct.c.orig 2024-02-05 14:17:10.208970293 -0700
|
||||
+++ libguestfs-1.52.0/lib/launch-direct.c 2024-02-05 14:21:37.548976664 -0700
|
||||
@@ -650,7 +650,10 @@ launch_direct (guestfs_h *g, void *datav
|
||||
flag ("-no-reboot");
|
||||
|
||||
/* These are recommended settings, see RHBZ#1053847. */
|
||||
+#if defined(__i386__) || defined(__x86_64__)
|
||||
+ /* Man page states, "Enable driftfix (i386 targets only)" */
|
||||
arg ("-rtc", "driftfix=slew");
|
||||
+#endif
|
||||
if (guestfs_int_qemu_supports (g, data->qemu_data, "-no-hpet"))
|
||||
flag ("-no-hpet");
|
||||
#if defined(__i386__) || defined(__x86_64__)
|
||||
Loading…
Reference in New Issue
Block a user