Skip to content

Commit

Permalink
guestfs-tools: version 1.53.2
Browse files Browse the repository at this point in the history 
For some reason gpg fails to import a key.

Signed-off-by: Antonio Caggiano <[email protected]>
  • Loading branch information
@Fahien
Fahien committed Sep 2, 2024
1 parent 07a5abd commit 9cbe1b6
Show file tree
Hide file tree
Showing 2 changed files with 81 additions and 17 deletions.
61 changes: 61 additions & 0 deletions Formula/guestfs-tools.rb
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
# Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause

class GuestfsTools < Formula
desc "Set of tools for accessing and modifying virtual machine (VM) disk images"
homepage "https://libguestfs.org/"
url "https://github.com/libguestfs/guestfs-tools.git", revision: "daf2b71e0ef18a04928f82688278673ad57d4c4b"
version "1.53.2"
license "GPL-2.0-or-later"

depends_on "automake" => :build
depends_on "autoconf" => :build

Check failure on line 12 in Formula/guestfs-tools.rb

View workflow job for this annotation

GitHub Actions / install-formulae (macos-12) 

dependency "autoconf" (line 12) should be put before dependency "automake" (line 20)
depends_on "libtool" => :build
depends_on "pkg-config" => :build
depends_on "coreutils" => :build

Check failure on line 15 in Formula/guestfs-tools.rb

View workflow job for this annotation

GitHub Actions / install-formulae (macos-12) 

dependency "coreutils" (line 15) should be put before dependency "pkg-config" (line 20)
depends_on "gnu-getopt" => :build

Check failure on line 16 in Formula/guestfs-tools.rb

View workflow job for this annotation

GitHub Actions / install-formulae (macos-12) 

dependency "gnu-getopt" (line 16) should be put before dependency "pkg-config" (line 20)
depends_on "bison" => :build

Check failure on line 17 in Formula/guestfs-tools.rb

View workflow job for this annotation

GitHub Actions / install-formulae (macos-12) 

dependency "bison" (line 17) should be put before dependency "pkg-config" (line 20)
depends_on "gpg2"
depends_on "libosinfo"
depends_on "quic/quic/libguestfs"

patch :DATA

def install

Check failure on line 24 in Formula/guestfs-tools.rb

View workflow job for this annotation

GitHub Actions / install-formulae (macos-12)

`brew install --verbose --formula --build-bottle quic/quic/guestfs-tools` failed on macOS Monterey (12)! 

  OCAMLCMI getopt.cmi
  OCAMLCMI JSON.cmi
  OCAMLCMI DOM.cmi
  OCAMLCMI on_exit.cmi
  OCAMLCMI URI.cmi
  OCAMLCMI planner.cmi
  OCAMLCMI registry.cmi
  OCAMLCMI JSON_parser.cmi
  OCAMLCMI curl.cmi
  OCAMLCMI checksums.cmi
  OCAMLCMI xpath_helpers.cmi
  OCAMLCMI urandom.cmi
  OCAMLCMI libosinfo.cmi
  CC       ../options/libmltools_a-decrypt.o
  CC       ../options/libmltools_a-keys.o
  CC       ../options/libmltools_a-uri.o
  OCAMLOPT getopt.cmx
  OCAMLOPT JSON.cmx
  OCAMLCMI tools_utils.cmi
  OCAMLOPT URI.cmx
  OCAMLOPT planner.cmx
  OCAMLCMI regedit.cmi
  OCAMLCMI libosinfo_utils.cmi
  OCAMLOPT tools_utils.cmx
  OCAMLOPT DOM.cmx
  OCAMLOPT on_exit.cmx
  OCAMLOPT registry.cmx
  OCAMLOPT JSON_parser.cmx
  OCAMLOPT curl.cmx
  OCAMLOPT checksums.cmx
  OCAMLOPT xpath_helpers.cmx
  OCAMLOPT urandom.cmx
  OCAMLOPT libosinfo.cmx
  OCAMLOPT regedit.cmx
  OCAMLOPT libosinfo_utils.cmx
  AR       libmltools.a
ocamlfind mklib -package str,unix,guestfs -I ../../common/utils/.libs -I ../../gnulib/lib/.libs -I ../../ocaml -I ../../common/mlgettext -I ../../common/mlpcre -I ../../common/mlxml -I ../../common/mlstdutils -I ../../common/mlutils -I .  \
	    getopt.cmx JSON.cmx tools_utils.cmx DOM.cmx on_exit.cmx URI.cmx planner.cmx registry.cmx regedit.cmx JSON_parser.cmx curl.cmx checksums.cmx xpath_helpers.cmx urandom.cmx libosinfo.cmx libosinfo_utils.cmx ../options/libmltools_a-decrypt.o ../options/libmltools_a-keys.o ../options/libmltools_a-uri.o libmltools_a-getopt-c.o libmltools_a-JSON_parser-c.o libmltools_a-libosinfo-c.o libmltools_a-tools_utils-c.o libmltools_a-uri-c.o -o mltools
Making all in common/mldrivers
../../ocaml-dep.sh firmware.mli linux.mli linux_bootloaders.mli linux_kernels.mli windows_drivers.mli firmware.ml linux.ml linux_bootloaders.ml linux_kernels.ml windows_drivers.ml
  CC       libmldrivers_a-dummy.o
  OCAMLCMI firmware.cmi
  OCAMLCMI linux.cmi
  OCAMLCMI windows_drivers.cmi
  OCAMLOPT firmware.cmx
  OCAMLCMI linux_bootloaders.cmi
  OCAMLOPT linux.cmx
  OCAMLOPT windows_drivers.cmx
  OCAMLCMI linux_kernels.cmi
  OCAMLOPT linux_bootloaders.cmx
  OCAMLOPT linux_kernels.cmx
  AR       libmldrivers.a
/Applications/Xcode_14.2.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libmldrivers.a(libmldrivers_a-dummy.o) has no symbols
/Applications/Xcode_14.2.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libmldrivers.a(libmldrivers_a-dummy.o) has no symbols
warning: /Applications/Xcode_14.2.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: archive library: libmldrivers.a the table of contents is empty (no object file members in the library define global symbols)
ocamlfind mklib -package str,unix,guestfs -I ../../common/mlgettext -I ../../common/mlpcre -I ../../common/mlstdutils -I ../../common/mltools -I . \
	    firmware.cmx linux.cmx linux_bootloaders.cmx linux_kernels.cmx windows_drivers.cmx libmldrivers_a-dummy.o -o mldrivers
/Applications/Xcode_14.2.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ./libmldrivers.a(libmldrivers_a-dummy.o) has no symbols
warning: /Applications/Xcode_14.2.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: archive library: ./libmldrivers.a the table of contents is empty (no object file members in the library define global symbols)
Making all in common/mlcustomize
warning: Run 'make' at the top level to build ../../generator/generator
warning: Run 'make' at the top level to build customize_cmdline.mli customize_cmdline.ml customize-options.pod customize-synopsis.pod
../../ocaml-dep.sh SELinux_relabel.mli customize_cmdline.mli firstboot.mli guest_packages.mli inject_virtio_win.mli SELinux_relabel.ml customize_cmdline.ml firstboot.ml guest_packages.ml inject_virtio_win.ml
warning: Run 'make' at the top level to build ../../generator/generator
warning: Run 'make' at the top level to build customize_cmdline.mli customize_cmdline.ml customize-options.pod customize-synopsis.pod
  CC
system "autoreconf", "-i"
system "./configure", *std_configure_args
system "make", "-j#{ENV.make_jobs}"
system "make", "install"
end

def caveats
<<~EOS
To use virt-builder you need to add the following to your profile:
export VIRT_BUILDER_DIRS="#{HOMEBREW_PREFIX}/etc"
EOS
end
end

__END__
diff --git a/builder/sigchecker.ml b/builder/sigchecker.ml
index 343f0bae..d592d498 100644
--- a/builder/sigchecker.ml
+++ b/builder/sigchecker.ml
@@ -42,7 +42,7 @@ let import_keyfile ~gpg ~gpghome ~tmpdir ?(trust = true) keyfile =
gpg gpghome (quote status_file) (quote keyfile)
(if verbose () then "" else " >/dev/null 2>&1") in
let r = shell_command cmd in
- if r <> 0 then
+ if r <> 0 && r <> 2 then
error (f_"could not import public key\n\
Use the ‘-v’ option and look for earlier error messages.");
let status = read_whole_file status_file in
@@ -110,7 +110,7 @@ let rec create ~gpg ~gpgkey ~check_signature ~tmpdir =
let cmd = sprintf "%s --homedir %s --list-keys%s"
gpg gpgtmpdir (if verbose () then "" else " >/dev/null 2>&1") in
let r = shell_command cmd in
- if r <> 0 then
+ if r <> 0 && r <> 2 then
error (f_"GPG failure: could not run GPG the first time\n\
Use the ‘-v’ option and look for earlier error messages.");
match gpgkey with
37 changes: 20 additions & 17 deletions Formula/libguestfs.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,32 +161,35 @@ def caveats
guestfs_int_cmd_clear_capture_errors (cmd);

diff --git a/m4/guestfs-c.m4 b/m4/guestfs-c.m4
index c6d33183d..8035a9729 100644
index c6d33183d..44c64b6d6 100644
--- a/m4/guestfs-c.m4
+++ b/m4/guestfs-c.m4
@@ -57,7 +57,7 @@ CFLAGS="$CFLAGS -fno-strict-overflow -Wno-strict-overflow"
@@ -55,9 +55,12 @@ AC_SUBST([WERROR_CFLAGS])
CFLAGS="$CFLAGS -fno-strict-overflow -Wno-strict-overflow"

dnl Work out how to specify the linker script to the linker.
+AS_CASE([$host_os],
+ [darwin*], [MAP_SCRIPT_FLAGS="-Wl,-map"],
+ [MAP_SCRIPT_FLAGS="-Wl,-M"])
VERSION_SCRIPT_FLAGS=-Wl,--version-script=
`/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null` || \
- VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,"
+ VERSION_SCRIPT_FLAGS="-Wl,-map -Wl,"
+ VERSION_SCRIPT_FLAGS="$MAP_SCRIPT_FLAGS -Wl,"
AC_SUBST(VERSION_SCRIPT_FLAGS)

dnl Use -fvisibility=hidden by default in the library.
diff --git a/m4/ocaml.m4 b/m4/ocaml.m4
index fddd6a0c2..91896f386 100644
--- a/m4/ocaml.m4
+++ b/m4/ocaml.m4
@@ -17,6 +17,9 @@ AC_DEFUN([AC_PROG_OCAML],
OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *\(.*\)$|\1|p'`
AC_MSG_RESULT([OCaml version is $OCAMLVERSION])
OCAMLLIB=`$OCAMLC -where 2>/dev/null || $OCAMLC -v|tail -1|cut -d ' ' -f 4`
+ if test "x$INSTALL_OCAMLLIB" = "x"; then
+ INSTALL_OCAMLLIB=$OCAMLLIB
+ fi
AC_MSG_RESULT([OCaml library path is $OCAMLLIB])

AC_SUBST([OCAMLVERSION])
diff --git a/m4/guestfs-ocaml.m4 b/m4/guestfs-ocaml.m4
index 25b06408c..6696db5bb 100644
--- a/m4/guestfs-ocaml.m4
+++ b/m4/guestfs-ocaml.m4
@@ -210,3 +210,7 @@ OCAML_WARN_ERROR="-warn-error +C+D+E+F+L+M+P+S+U+V+Y+Z+X+52-3-6 -w -6"
AC_SUBST([OCAML_WARN_ERROR])
OCAML_FLAGS="-g -annot $safe_string_option"
AC_SUBST([OCAML_FLAGS])
+
+if test "x$INSTALL_OCAMLLIB" = "x"; then
+ INSTALL_OCAMLLIB=$OCAMLLIB
+fi
diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
index 63713ee68..f7621a8fa 100644
--- a/ocaml/Makefile.am
Expand Down

0 comments on commit 9cbe1b6

Please sign in to comment.