rpm/supermin
SHA256
1
0
Fork 0
forked from pool/supermin
Code Pull Requests Activity

- add changes to support zypper

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Virtualization/supermin?expand=0&rev=2
This commit is contained in:
Olaf Hering 2013-04-09 17:22:09 +00:00 committed by Git OBS Bridge
parent 19d539248f
commit b703c5af43
5 changed files with 326 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
0000-Actually-update-gnulib.patch Normal file
View File

@ -0,0 +1,28 @@
From 9f60bbb8e486c410d76e1864a11d3990c2119787 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 5 Feb 2013 16:46:22 +0000
Subject: [PATCH] Actually update gnulib.
This fixes commit 4df7ff0786d872c9bb8a0a1b5410429ca1f8440b.
---
lib/.gitignore | 3 +++
m4/.gitignore | 2 +-
m4/gnulib-cache.m4 | 4 ++--
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index e70274d..ff80694 100644
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-2013 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -52,4 +52,4 @@ gl_LIB([libgnu])
gl_MAKEFILE_NAME([])
gl_MACRO_PREFIX([gl])
gl_PO_DOMAIN([])
-gl_WITNESS_C_DOMAIN([])
+gl_WITNESS_C_MACRO([])

50
0001-add-run_shell-helper.patch Normal file
View File

@ -0,0 +1,50 @@
From e83608bd0b8ef62fcd950b2b848effa1e1b81d66 Mon Sep 17 00:00:00 2001
From: Olaf Hering <olaf@aepfle.de>
Date: Tue, 9 Apr 2013 18:43:11 +0200
Subject: [PATCH 1/2] add run_shell helper
The new run_shell helper is a copy of run_python,
and will be used by upcoming changes.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
---
src/supermin_utils.ml | 9 +++++++++
src/supermin_utils.mli | 5 +++++
2 files changed, 14 insertions(+)
diff --git a/src/supermin_utils.ml b/src/supermin_utils.ml
index f98e09a..cb8a27e 100644
--- a/src/supermin_utils.ml
+++ b/src/supermin_utils.ml
@@ -70,6 +70,15 @@ let run_command cmd =
exit 1
)
+let run_shell code args =
+ let cmd = sprintf "sh -c %s arg0 %s"
+ (Filename.quote code)
+ (String.concat " " (List.map Filename.quote args)) in
+ if Sys.command cmd <> 0 then (
+ eprintf "supermin: external shell program failed, see earlier error messages\n";
+ exit 1
+ )
+
let run_python code args =
let cmd = sprintf "python -c %s %s"
(Filename.quote code)
diff --git a/src/supermin_utils.mli b/src/supermin_utils.mli
index 54df1e8..c4a52c6 100644
--- a/src/supermin_utils.mli
+++ b/src/supermin_utils.mli
@@ -41,6 +41,11 @@ val run_command : string -> unit
when constructing the command to properly quote any arguments
(using {!Filename.quote}). *)
+val run_shell : string -> string list -> unit
+ (** [run_shell code args] runs shell [code] with arguments [args].
+ This does not return anything, but exits with an error message
+ if the shell code returns an error. *)
+
val run_python : string -> string list -> unit
(** [run_python code args] runs Python [code] with arguments [args].
This does not return anything, but exits with an error message

236
0002-add-support-for-zypp.patch Normal file
View File

@ -0,0 +1,236 @@
From fbc07fc688ea6a59a9d2ff34e28436933a38ec69 Mon Sep 17 00:00:00 2001
From: Olaf Hering <olaf@aepfle.de>
Date: Tue, 9 Apr 2013 18:47:13 +0200
Subject: [PATCH 2/2] add support for zypp
This adds support for zypper which is used as package management in
SuSE Linux. It started out as copy of yum support.
TODO:
add regex support
Signed-off-by: Olaf Hering <olaf@aepfle.de>
---
configure.ac | 1 +
src/Makefile.am | 1 +
src/config.ml.in | 1 +
src/supermin_zypp_rpm.ml | 174 +++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 177 insertions(+)
create mode 100644 src/supermin_zypp_rpm.ml
diff --git a/configure.ac b/configure.ac
index a22fcf3..f975f3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,6 +64,7 @@ fi
AM_CONDITIONAL(HAVE_PERLDOC,[test "$perldoc" != "no"])
dnl For yum-rpm handler.
+AC_CHECK_PROG(ZYPPER,[zypper],[zypper],[no])
AC_CHECK_PROG(YUM,[yum],[yum],[no])
AC_CHECK_PROG(RPM,[rpm],[rpm],[no])
AC_CHECK_PROG(YUMDOWNLOADER,[yumdownloader],[yumdownloader],[no])
diff --git a/src/Makefile.am b/src/Makefile.am
index 6ff3d56..3b6ca9b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,6 +26,7 @@ SOURCES = \
supermin_utils.ml \
supermin_package_handlers.mli \
supermin_package_handlers.ml \
+ supermin_zypp_rpm.ml \
supermin_yum_rpm.ml \
supermin_debian.ml \
supermin_pacman.ml \
diff --git a/src/config.ml.in b/src/config.ml.in
index c281486..c3e7672 100644
--- a/src/config.ml.in
+++ b/src/config.ml.in
@@ -19,6 +19,7 @@
let package_name = "@PACKAGE_NAME@"
let package_version = "@PACKAGE_VERSION@"
+let zypper = "@ZYPPER@"
let yum = "@YUM@"
let rpm = "@RPM@"
let yumdownloader = "@YUMDOWNLOADER@"
diff --git a/src/supermin_zypp_rpm.ml b/src/supermin_zypp_rpm.ml
new file mode 100644
index 0000000..e4555bf
--- /dev/null
+++ b/src/supermin_zypp_rpm.ml
@@ -0,0 +1,174 @@
+(* supermin 4
+ * Copyright (C) 2009-2010 Red Hat Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *)
+
+(* Zypper and RPM support. *)
+
+open Unix
+open Printf
+
+open Supermin_package_handlers
+open Supermin_utils
+open Supermin_cmdline
+
+
+(* Create a temporary directory for use by all the functions in this file. *)
+let tmpdir = tmpdir ()
+
+let zypp_rpm_detect () =
+ (file_exists "/etc/SuSE-release") &&
+ Config.zypper <> "no" && Config.rpm <> "no"
+
+let zypp_rpm_init () =
+ if use_installed && Unix.getuid() > 0 then
+ failwith "zypp_rpm driver doesn't support --use-installed when called as non-root user"
+
+let zypp_rpm_resolve_dependencies_and_download names =
+ (* Liberate this data from shell. *)
+ let tmp_pkg_cache_dir = tmpdir // "pkg_cache_dir" in
+ let tmp_root = tmpdir // "root" in
+ let sh = sprintf "
+set -ex
+unset LANG ${!LC_*}
+tmpdir=%S
+cache_dir=\"${tmpdir}/cache-dir\"
+pkg_cache_dir=%S
+time zypper \
+ %s \
+ %s \
+ %s \
+ --cache-dir \"${cache_dir}\" \
+ --pkg-cache-dir \"${pkg_cache_dir}\" \
+ --gpg-auto-import-keys \
+ --non-interactive \
+ install \
+ --auto-agree-with-licenses \
+ --download-only \
+ $@
+"
+ tmpdir
+ tmp_pkg_cache_dir
+ (if verbose then "--verbose --verbose" else "--quiet")
+ (match packager_config with None -> ""
+ | Some filename -> sprintf "--config %s" filename)
+ (if Unix.getuid() > 0 then sprintf "--root %S --reposd-dir /etc/zypp/repos.d" tmp_root else "")
+ in
+ run_shell sh names;
+
+ (* http://rosettacode.org/wiki/Walk_a_directory/Recursively *)
+ let walk_directory_tree dir pattern =
+ let select str = Str.string_match (Str.regexp pattern) str 0 in
+ let rec walk acc = function
+ | [] -> (acc)
+ | dir::tail ->
+ let contents = Array.to_list (Sys.readdir dir) in
+ let contents = List.rev_map (Filename.concat dir) contents in
+ let dirs, files =
+ List.fold_left (fun (dirs,files) f ->
+ match (stat f).st_kind with
+ | S_REG -> (dirs, f::files) (* Regular file *)
+ | S_DIR -> (f::dirs, files) (* Directory *)
+ | _ -> (dirs, files)
+ ) ([],[]) contents
+ in
+ let matched = List.filter (select) files in
+ walk (matched @ acc) (dirs @ tail)
+ in
+ walk [] [dir]
+ in
+
+ let pkgs = walk_directory_tree tmp_pkg_cache_dir ".*\\.rpm" in
+
+ (* Return list of package filenames. *)
+ pkgs
+
+let rec zypp_rpm_list_files pkg =
+ (* Run rpm -qlp with some extra magic. *)
+ let cmd =
+ sprintf "rpm -q --qf '[%%{FILENAMES} %%{FILEFLAGS:fflags} %%{FILEMODES} %%{FILESIZES}\\n]' -p %S"
+ pkg in
+ let lines = run_command_get_lines cmd in
+
+ let files =
+ filter_map (
+ fun line ->
+ match string_split " " line with
+ | [filename; flags; mode; size] ->
+ let test_flag = String.contains flags in
+ let mode = int_of_string mode in
+ let size = int_of_string size in
+ if test_flag 'd' then None (* ignore documentation *)
+ else
+ Some (filename, {
+ ft_dir = mode land 0o40000 <> 0;
+ ft_ghost = test_flag 'g'; ft_config = test_flag 'c';
+ ft_mode = mode; ft_size = size;
+ })
+ | _ ->
+ eprintf "supermin: bad output from rpm command: '%s'" line;
+ exit 1
+ ) lines in
+
+ (* I've never understood why the base packages like 'filesystem' don't
+ * contain any /dev nodes at all. This leaves every program that
+ * bootstraps RPMs to create a varying set of device nodes themselves.
+ * This collection was copied from mock/backend.py.
+ *)
+ let files =
+ let b = Filename.basename pkg in
+ if string_prefix "filesystem-" b then (
+ let dirs = [ "/proc"; "/sys"; "/dev"; "/dev/pts"; "/dev/shm";
+ "/dev/mapper" ] in
+ let dirs =
+ List.map (fun name ->
+ name, { ft_dir = true; ft_ghost = false;
+ ft_config = false; ft_mode = 0o40755;
+ ft_size = 0 }) dirs in
+ let devs = [ "/dev/null"; "/dev/full"; "/dev/zero"; "/dev/random";
+ "/dev/urandom"; "/dev/tty"; "/dev/console";
+ "/dev/ptmx"; "/dev/stdin"; "/dev/stdout"; "/dev/stderr" ] in
+ (* No need to set the mode because these will go into hostfiles. *)
+ let devs =
+ List.map (fun name ->
+ name, { ft_dir = false; ft_ghost = false;
+ ft_config = false; ft_mode = 0o644;
+ ft_size = 0 }) devs in
+ dirs @ devs @ files
+ ) else files in
+
+ files
+
+let zypp_rpm_get_file_from_package pkg file =
+ debug "extracting %s from %s ..." file (Filename.basename pkg);
+
+ let outfile = tmpdir // file in
+ let cmd =
+ sprintf "umask 0000; rpm2cpio %s | (cd %s && cpio --quiet -id .%s)"
+ (Filename.quote pkg) (Filename.quote tmpdir) (Filename.quote file) in
+ run_command cmd;
+ outfile
+
+let () =
+ let ph = {
+ ph_detect = zypp_rpm_detect;
+ ph_init = zypp_rpm_init;
+ ph_resolve_dependencies_and_download =
+ zypp_rpm_resolve_dependencies_and_download;
+ ph_list_files = zypp_rpm_list_files;
+ ph_get_file_from_package = zypp_rpm_get_file_from_package;
+ } in
+ register_package_handler "zypp-rpm" ph

5
supermin.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Apr 9 19:21:47 CEST 2013 - ohering@suse.de
- add changes to support zypper
-------------------------------------------------------------------
Sat Mar 9 17:44:29 CET 2013 - ohering@suse.de

8
supermin.spec
View File

@ -28,6 +28,9 @@ Provides: febootstrap
Obsoletes: febootstrap
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: http://libguestfs.org/download/supermin/supermin-%{version}.tar.gz
Patch0: 0000-Actually-update-gnulib.patch
Patch1: 0001-add-run_shell-helper.patch
Patch2: 0002-add-support-for-zypp.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: e2fsprogs
@ -38,7 +41,6 @@ BuildRequires: glibc-devel-static
BuildRequires: ocaml
BuildRequires: ocaml-findlib
BuildRequires: pkg-config
BuildRequires: zypper
%description
supermin is a tool for building supermin appliances. These are tiny
@ -48,8 +50,12 @@ you need to boot one of them.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
export ZYPPER=zypper
touch INSTALL NEWS AUTHORS ChangeLog
autoreconf -fi
%configure --help