mirror of
https://github.com/libguestfs/libguestfs.git
synced 2026-03-21 22:53:37 +00:00
generator: Remove common/mlv2v/uefi.ml{,i} files
Stop generating these files. They are currently only used by virt-v2v
-o qemu mode, and there are better ways to locate the UEFI files
there.
Update the common submodule to bring in:
Richard W.M. Jones (5):
mlcustomize: Add heuristic support for Windows Server 2025
mlcustomize/customize_run.ml: Move 'in' to new line
mlstdutils/guestfs_config: Define host_os
mlcustomize, mltools: Check guest OS is compatible before allowing --run
Remove mlv2v/ subdirectory
This commit is contained in:
@@ -447,7 +447,6 @@ maintainer-check-extra-dist:
|
||||
grep -v '^common/mlgettext/' | \
|
||||
grep -v '^common/mlprogress/' | \
|
||||
grep -v '^common/mltools/' | \
|
||||
grep -v '^common/mlv2v/' | \
|
||||
grep -v '^common/mlvisit/' | \
|
||||
grep -v '^common/mlxml/' | \
|
||||
grep -v '^intltool-.*\.in' | \
|
||||
@@ -458,7 +457,7 @@ maintainer-check-extra-dist:
|
||||
cat tmp/comm-out
|
||||
[ ! -s tmp/comm-out ]
|
||||
@echo Checking for generated files missing from the tarball ...
|
||||
@for f in `cat generator/files-generated.txt | grep -v '^common/mlcustomize' | grep -v '^common/mlv2v/'`; do \
|
||||
@for f in `cat generator/files-generated.txt | grep -v '^common/mlcustomize'`; do \
|
||||
if ! grep -sq "^$$f\$$" tmp/tarfiles; then \
|
||||
echo generated file missing from tarball: $$f; \
|
||||
exit 1; \
|
||||
|
||||
2
common
2
common
Submodule common updated: e9eea65a49...9293e5eb5b
@@ -23,9 +23,9 @@ open Utils
|
||||
open Pr
|
||||
open Docstrings
|
||||
|
||||
(* danpb is proposing that libvirt supports E<lt>loader type="efi"/E<gt>
|
||||
* (L<https://bugzilla.redhat.com/1217444#c6>). If that happens we can
|
||||
* simplify or even remove this code.
|
||||
(* This code is currently only used when starting the appliance
|
||||
* on aarch64 (and probably only on RHEL). (See lib/appliance-uefi.c)
|
||||
* It is vestigial and we should think about deleting it.
|
||||
*)
|
||||
|
||||
(* Order is significant *within architectures only*. *)
|
||||
@@ -110,55 +110,3 @@ let generate_uefi_c () =
|
||||
) firmware;
|
||||
pr "};\n";
|
||||
) arches
|
||||
|
||||
let generate_uefi_ml () =
|
||||
generate_header OCamlStyle GPLv2plus;
|
||||
|
||||
pr "\
|
||||
type uefi_firmware = {
|
||||
code : string;
|
||||
code_debug : string option;
|
||||
vars : string;
|
||||
flags : uefi_flags;
|
||||
}
|
||||
and uefi_flags = uefi_flag list
|
||||
and uefi_flag = UEFI_FLAG_SECURE_BOOT_REQUIRED
|
||||
";
|
||||
List.iter (
|
||||
fun arch ->
|
||||
let firmware =
|
||||
List.filter (fun (arch', _, _, _, _) -> arch = arch') firmware in
|
||||
pr "\n";
|
||||
pr "let uefi_%s_firmware = [\n" arch;
|
||||
List.iter (
|
||||
fun (_, code, code_debug, vars, flags) ->
|
||||
pr " { code = %S;\n" code;
|
||||
(match code_debug with
|
||||
| None -> pr " code_debug = None;\n"
|
||||
| Some code_debug -> pr " code_debug = Some %S;\n" code_debug
|
||||
);
|
||||
pr " vars = %S;\n" vars;
|
||||
pr " flags = [%s];\n" (String.concat "; " flags);
|
||||
pr " };\n";
|
||||
) firmware;
|
||||
pr "]\n";
|
||||
) arches
|
||||
|
||||
let generate_uefi_mli () =
|
||||
generate_header OCamlStyle GPLv2plus;
|
||||
|
||||
pr "\
|
||||
(** UEFI paths. *)
|
||||
|
||||
type uefi_firmware = {
|
||||
code : string; (** code file *)
|
||||
code_debug : string option; (** code debug file *)
|
||||
vars : string; (** vars template file *)
|
||||
flags : uefi_flags; (** flags *)
|
||||
}
|
||||
and uefi_flags = uefi_flag list
|
||||
and uefi_flag = UEFI_FLAG_SECURE_BOOT_REQUIRED
|
||||
|
||||
";
|
||||
|
||||
List.iter (pr "val uefi_%s_firmware : uefi_firmware list\n") arches
|
||||
|
||||
@@ -17,5 +17,3 @@
|
||||
*)
|
||||
|
||||
val generate_uefi_c : unit -> unit
|
||||
val generate_uefi_ml : unit -> unit
|
||||
val generate_uefi_mli : unit -> unit
|
||||
|
||||
@@ -347,14 +347,6 @@ Run it from the top source directory using the command
|
||||
output_to "gobject/src/session.c"
|
||||
GObject.generate_gobject_session_source;
|
||||
|
||||
(* mlv2v may not be shipped in this source. *)
|
||||
if is_regular_file "common/mlv2v/Makefile.am" then (
|
||||
output_to "common/mlv2v/uefi.ml"
|
||||
UEFI.generate_uefi_ml;
|
||||
output_to "common/mlv2v/uefi.mli"
|
||||
UEFI.generate_uefi_mli;
|
||||
);
|
||||
|
||||
(* mlcustomize may not be shipped in this source. *)
|
||||
if is_regular_file "common/mlcustomize/Makefile.am" then (
|
||||
output_to "common/mlcustomize/customize_cmdline.mli"
|
||||
|
||||
Reference in New Issue
Block a user