Compare commits

..

3 commits

Author SHA1 Message Date
Fedora Release Engineering
8943435c98 dist-git conversion 2010-07-29 15:05:17 +00:00
Bill Nottingham
408edecf2b Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-26 01:14:34 +00:00
Jesse Keating
d90018de28 Initialize branch F-12 for virt-mem 2009-09-29 07:16:39 +00:00
7 changed files with 243 additions and 15 deletions

1
.gitignore vendored Normal file
View file

@ -0,0 +1 @@
virt-mem-0.3.1.tar.gz

View file

@ -1,15 +0,0 @@
Package is retired
From devel-bounces@lists.fedoraproject.org Thu Jun 23 02:38:31 2011
Date: Thu, 23 Jun 2011 08:38:15 +0100
From: "Richard W.M. Jones" <rjones@redhat.com>
To: Matt Domsch <Matt_Domsch@dell.com>
Subject: Re: Fedora rawhide FTBFS status 2011-06-16 x86_64
Cc: devel@lists.fedoraproject.org
On Wed, Jun 22, 2011 at 07:17:45PM -0500, Matt Domsch wrote:
> virt-mem-0.3.1-9.fc12 (build/make) rjones,virtmaint
This is a dead.package, or if it's not then it's supposed to be dead.
Rich.

1
sources Normal file
View file

@ -0,0 +1 @@
48f0e309e3825261732b9315b083ddb7 virt-mem-0.3.1.tar.gz

View file

@ -0,0 +1,14 @@
--- virt-mem-0.3.1.orig/lib/virt_mem_dump.ml 2008-08-17 12:30:04.000000000 +0100
+++ virt-mem-0.3.1/lib/virt_mem_dump.ml 2008-12-05 19:50:27.000000000 +0000
@@ -80,9 +80,9 @@
while !len > 0 do
let bits = min !len 8 in
- let byte, off', len' =
+ let byte =
Bitstring.extract_char_unsigned data !off !len bits in
- off := off'; len := len';
+ off := !off + bits; len := !len + bits;
let byte = byte lsl (8-bits) in
fprintf chan "%02x " byte;

View file

@ -0,0 +1,16 @@
--- virt-mem-0.3.1.orig/extract/codegen/Makefile.in 2008-08-17 14:18:59.000000000 +0100
+++ virt-mem-0.3.1/extract/codegen/Makefile.in 2008-12-05 19:54:36.000000000 +0000
@@ -27,11 +27,11 @@
OCAMLCPACKAGES = -package extlib,pcre,unix,camlp4,bitstring -pp camlp4of
OCAMLCFLAGS = @OCAMLCFLAGS@
-OCAMLCLIBS = -linkpkg camlp4lib.cma
+OCAMLCLIBS = -linkpkg dynlink.cma camlp4lib.cma
OCAMLOPTFLAGS = @OCAMLOPTFLAGS@
OCAMLOPTPACKAGES = $(OCAMLCPACKAGES)
-OCAMLOPTLIBS = -linkpkg camlp4lib.cmxa
+OCAMLOPTLIBS = -linkpkg dynlink.cmxa camlp4lib.cmxa
TARGETS = compile-kerneldb.opt

View file

@ -0,0 +1,45 @@
diff --exclude '*.annot' --exclude .depend -ur virt-mem-0.3.1/lib/virt_mem.ml virt-mem-0.3.1-permissions/lib/virt_mem.ml
--- virt-mem-0.3.1/lib/virt_mem.ml 2008-08-17 14:53:31.000000000 +0100
+++ virt-mem-0.3.1-permissions/lib/virt_mem.ml 2009-06-12 13:18:22.537687821 +0100
@@ -334,7 +334,7 @@
if testimages = [] then (
let conn =
let name = uri in
- try C.connect_readonly ?name ()
+ try C.connect ?name ()
with Libvirt.Virterror err ->
prerr_endline (Libvirt.Virterror.to_string err);
(* If non-root and no explicit connection URI, print a warning. *)
diff --exclude '*.annot' --exclude .depend -ur virt-mem-0.3.1/lib/virt_mem_types.ml virt-mem-0.3.1-permissions/lib/virt_mem_types.ml
--- virt-mem-0.3.1/lib/virt_mem_types.ml 2008-08-17 12:12:39.000000000 +0100
+++ virt-mem-0.3.1-permissions/lib/virt_mem_types.ml 2009-06-12 13:17:43.957812464 +0100
@@ -41,7 +41,7 @@
}
type kimage = {
- dom : Libvirt.ro D.t option;
+ dom : Libvirt.rw D.t option;
domname : string;
arch : architecture;
kernel_min : addr;
diff --exclude '*.annot' --exclude .depend -ur virt-mem-0.3.1/lib/virt_mem_types.mli virt-mem-0.3.1-permissions/lib/virt_mem_types.mli
--- virt-mem-0.3.1/lib/virt_mem_types.mli 2008-08-17 12:02:31.000000000 +0100
+++ virt-mem-0.3.1-permissions/lib/virt_mem_types.mli 2009-06-12 13:17:11.023687449 +0100
@@ -65,7 +65,7 @@
(** Kernel version, from utsname structure in the kernel. *)
type kimage = {
- dom : Libvirt.ro Libvirt.Domain.t option; (** Domain, if known. *)
+ dom : Libvirt.rw Libvirt.Domain.t option; (** Domain, if known. *)
domname : string; (** Domain name. *)
arch : Virt_mem_utils.architecture; (** Architecture, eg. i386. *)
@@ -114,7 +114,7 @@
the caller is advised to catch any exceptions and deal with them
appropriately. *)
-val load_static_memory : dom:Libvirt.ro Libvirt.Domain.t ->
+val load_static_memory : dom:Libvirt.rw Libvirt.Domain.t ->
domname:string ->
arch:Virt_mem_utils.architecture ->
wordsize:Virt_mem_utils.wordsize -> endian:Bitstring.endian ->

166
virt-mem.spec Normal file
View file

@ -0,0 +1,166 @@
%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
%define debug_package %{nil}
Name: virt-mem
Version: 0.3.1
Release: 9%{?dist}
Summary: Management tools for virtual machines
Group: Development/Libraries
License: GPLv2+
URL: http://et.redhat.com/~rjones/virt-mem/
Source0: http://et.redhat.com/~rjones/virt-mem/files/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExcludeArch: sparc64 s390 s390x
Patch0: virt-mem-0.3.1-bitstring2.patch
Patch1: virt-mem-0.3.1-dynlink.patch
Patch2: virt-mem-0.3.1-fix-permissions.patch
BuildRequires: ocaml >= 3.10.0
BuildRequires: ocaml-ocamldoc
BuildRequires: ocaml-findlib-devel
BuildRequires: ocaml-camlp4-devel
BuildRequires: ocaml-extlib-devel
BuildRequires: ocaml-libvirt-devel >= 0.4.4.2
BuildRequires: ocaml-xml-light-devel
BuildRequires: ocaml-xmlrpc-light-devel
BuildRequires: ocaml-bitstring-devel >= 2.0.0
BuildRequires: ocaml-csv-devel
BuildRequires: ocaml-gettext-devel
BuildRequires: ocaml-pcre-devel
BuildRequires: libvirt-devel >= 0.4.4
# Missing indirect requirements of ocaml-xmlrpc-light-devel.
# https://bugzilla.redhat.com/show_bug.cgi?id=458265
BuildRequires: ocaml-ocamlnet-devel
BuildRequires: ocaml-ocamlnet-nethttpd-devel
# Missing indirect requirement of ocaml-pcre-devel.
BuildRequires: pcre-devel
# For perldoc
BuildRequires: perl
%define _use_internal_dependency_generator 0
%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
%description
These are a collection of monitoring and management tools for virtual
machines.
Commands we support at the moment include:
virt-uname 'uname' command, shows OS version, architecture, etc.
virt-dmesg 'dmesg' command, shows kernel messages
virt-ps 'ps' command, shows process list
The general idea is that they allow you to monitor virtual machines
without needing to log in to the machine itself or install any extra
software inside the virtual machine. At the moment we only support
virtual machines running Linux kernel >= 2.6, but we expect to support
other operating systems in the future.
Most of the commands also offer a CSV (comma-separated values) output
format ('virt-xx --csv'), allowing usage from scripts to update
spreadsheets, databases or integrate with existing monitoring systems
like Nagios.
The commands use libvirt to access the underlying virtualization
system, so we support a variety of different systems such as Xen, QEMU
and KVM, and more can be added just by adding support to libvirt.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
%configure
# Stack overflow when building the kernel descriptions ...
ulimit -s unlimited
make all
# Build translations.
make -C po
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/locale
make DESTDIR=$RPM_BUILD_ROOT install PODIR="$RPM_BUILD_ROOT%{_datadir}/locale"
# Find translations.
%find_lang %{name}
# Strip executables.
strip $RPM_BUILD_ROOT%{_bindir}/*
%clean
rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING README ChangeLog
%{_bindir}/*
%{_mandir}/man1/*
%changelog
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.1-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Fri Jun 12 2009 Richard W.M. Jones <rjones@redhat.com> - 0.3.1-8
- Fix for libvirt 0.6: Libvirt.D.memory_peek now requires write permission
to the hypervisor connection.
* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x@lists.fedoraproject.org>
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
(added sparc64 per request from the sparc maintainer)
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Fri Dec 5 2008 Richard W.M. Jones <rjones@redhat.com> - 0.3.1-5
- Rebuild for OCaml 3.11.0.
- Fix for bitstring 2.0.0.
- Fix for dynlink.cma dep on camlp4.
- Avoid stack overflow on ppc64.
* Mon Aug 25 2008 Richard W.M. Jones <rjones@redhat.com> - 0.3.1-2
- Forgot to add the new sources to previous release.
* Mon Aug 25 2008 Richard W.M. Jones <rjones@redhat.com> - 0.3.1-1
- New upstream release 0.3.1.
* Tue Aug 12 2008 Richard W.M. Jones <rjones@redhat.com> - 0.2.9-6
- Bump release to ensure upgrade path between releases.
* Thu Aug 7 2008 Richard W.M. Jones <rjones@redhat.com> - 0.2.9-3
- Added missing indirect BRs for ocaml-xmlrpc-light-devel.
- Added missing BR ocaml-pcre-devel.
* Thu Aug 7 2008 Richard W.M. Jones <rjones@redhat.com> - 0.2.9-1
- New upstream release 0.2.9:
- Fixes 64 bit builds.
- Fixes builds on Fedora 8.
* Thu Aug 7 2008 Richard W.M. Jones <rjones@redhat.com> - 0.2.8-3
- Add missing BR ocaml-xmlrpc-light-devel.
* Thu Aug 7 2008 Richard W.M. Jones <rjones@redhat.com> - 0.2.8-2
- Add missing BR ocaml-camlp4-devel.
* Thu Aug 7 2008 Richard W.M. Jones <rjones@redhat.com> - 0.2.8-1
- New upstream version.
* Tue Jun 10 2008 Richard W.M. Jones <rjones@redhat.com> - 0.2.4-1
- Initial RPM release.