search for: packager_config

--- src/utils.ml | 21 +++++++++++++++++++++ src/utils.mli | 3 +++ 2 files changed, 24 insertions(+) diff --git a/src/utils.ml b/src/utils.ml index 3e81c21..7ae24bd 100644 --- a/src/utils.ml +++ b/src/utils.ml @@ -204,3 +204,24 @@ let compare_architecture a1 a2 = exit 1 in compare (index_of_architecture a1) (index_of_architecture a2) + +(* Parse a size field, eg. "10G".

...+ 5 files changed, 35 insertions(+), 14 deletions(-) diff --git a/src/build.ml b/src/build.ml index d7d0781..fb2e6d3 100644 --- a/src/build.ml +++ b/src/build.ml @@ -59,7 +59,7 @@ and string_of_file_content = function let rec build debug (copy_kernel, dtb_wildcard, format, host_cpu, - packager_config, tmpdir, use_installed) + packager_config, tmpdir, use_installed, size) inputs outputdir = if debug >= 1 then printf "supermin: build: %s\n%!" (String.concat " " inputs); @@ -210,7 +210,7 @@ let rec build debug and initrd = outputdir // "initrd&quot...

Hi, to ease debugging issues with appliances (e.g. when used in libguestfs), using --include-packagelist will add a file containing the list of all the packages used. Thanks, Pino Toscano (3): ext2: add ext2fs_chmod and ext2fs_chown chroot: factor out file copy code Add --include-packagelist src/build.ml | 42 +++++++++++++++++++++++++------ src/chroot.ml | 29

This is an attempt to make supermin check for the existing results of an output when checking whether the appliance must be rebuilt using --if-newer. At the moment it is implemented only for the build mode, and for its ext2 output format. Pino Toscano (4): build: factor ext2 filenames Tighten Unix_error check for missing outputdir Extend modes with list of outputs build: set

...nsertions(+), 3 deletions(-) diff --git a/src/mode_build.ml b/src/mode_build.ml index d54a3cd..4a58460 100644 --- a/src/mode_build.ml +++ b/src/mode_build.ml @@ -462,3 +462,10 @@ and munge files = let files = loop files in files + +and get_outputs + (copy_kernel, format, host_cpu, + packager_config, tmpdir, use_installed, size, + include_packagelist) + inputs = + [] diff --git a/src/mode_build.mli b/src/mode_build.mli index 0f8b956..4fba2ab 100644 --- a/src/mode_build.mli +++ b/src/mode_build.mli @@ -21,3 +21,7 @@ val build : int -> (bool * Types.format * string * string option *...

...ir = tmpdir () +let get_repos_dir () = + let zypper_default = "/etc/zypp/repos.d" in + let parse_repos_dir path = + let cfg = new inifile path in + let dir = (try cfg#getval "main" "reposdir" with _ -> zypper_default) in + dir + in + let dir = (match packager_config with None -> zypper_default | + Some filename -> (try parse_repos_dir filename with _ -> zypper_default) ) in + dir + +let repos_dir = get_repos_dir () + let zypp_rpm_detect () = (file_exists "/etc/SuSE-release") && Config.zypper <> "no" &am...

...\ - %s \ + --root %S --reposd-dir /etc/zypp/repos.d \ --cache-dir \"${cache_dir}\" \ --pkg-cache-dir \"${pkg_cache_dir}\" \ --gpg-auto-import-keys \ @@ -65,7 +65,7 @@ time zypper \ (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 "") + tmp_root in run_shell sh names;

.....e0ad1a8 100644 > --- a/src/mode_prepare.ml > +++ b/src/mode_prepare.ml > @@ -21,7 +21,7 @@ open Printf > open Package_handler > open Utils > > -let prepare debug (copy_kernel, format, host_cpu, > +let rec prepare debug (copy_kernel, format, host_cpu, > packager_config, tmpdir, use_installed, size, > include_packagelist) > inputs outputdir = > @@ -175,3 +175,10 @@ let prepare debug (copy_kernel, format, host_cpu, > (* No config files to copy, so do not create base.tar.gz. *) > if debug >= 1 then printf "supermin...

Hi, as pointed out by Neal Gompa, Mageia recently introduced dnf in the distribution (currently only in Cauldron, which is the future Mageia 6), and most probably it will replace urpmi in the future. As such, on Mageia make supermin prefer dnf over urpmi when found, using the same code already used for Fedora. Related change: make test-harder.sh work explicitly also on Mageia

This is an attempt to make supermin check for the existing results of an output when checking whether the appliance must be rebuilt using --if-newer. At the moment it is implemented only for the ext2 output format of the build mode. Changes from v1: - drop empty stub for the prepare mode - add patch to ignore --if-newer on modes different than build - squash patch with stub for the build mode

Bind and use rpmvercmp to compare versions of packages when sorting them, instead of an own string-based comparison function. --- src/librpm-c.c | 12 ++++++++++++ src/librpm.ml | 1 + src/librpm.mli | 1 + src/rpm.ml | 2 +- 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/librpm-c.c b/src/librpm-c.c index 1ae3bad..fc847d6 100644 --- a/src/librpm-c.c +++

Document what each module does, using *.mli files. Remove the --dtb option, it's obsolete. Rename modules according to their purpose. Rich.

...md = - sprintf "%s download --destdir %s %s" - Config.dnf (quote tdir) (quoted_list rpms) in + sprintf "%s download%s%s --destdir %s %s" + Config.dnf + (if !settings.debug >= 1 then " -v" else " -q") + (match !settings.packager_config with + | None -> "" + | Some filename -> sprintf " -c %s" (quote filename)) + (quote tdir) + (quoted_list rpms) in run_command cmd ); -- 1.9.3

...tests/test-if-newer-ext2.sh diff --git a/src/mode_build.ml b/src/mode_build.ml index d54a3cd..ed47366 100644 --- a/src/mode_build.ml +++ b/src/mode_build.ml @@ -462,3 +462,15 @@ and munge files = let files = loop files in files + +and get_outputs + (copy_kernel, format, host_cpu, + packager_config, tmpdir, use_installed, size, + include_packagelist) + inputs = + match format with + | Chroot -> + (* The content for chroot depends on the packages. *) + [] + | Ext2 -> + [kernel_filename; appliance_filename; initrd_filename] diff --git a/src/mode_build.mli b/src/mode_bui...

...xml sel -t \ + -m \"stream/install-summary/to-install/solvable[%@type='package']\" \ + -c \"string(%@name)\" -n +" + (if verbose then "set -x" else "") + (if verbose then "--verbose --verbose" else "--quiet") + (match packager_config with None -> "" + | Some filename -> sprintf "--config %s" filename) + tmpdir tmpdir (String.concat " " (List.map Filename.quote names)) in + let pkg_names = run_command_get_lines cmd in + + (* Return list of package names, remove empty lines. *) + List...

...d string_of_file_content = function + | Base_image -> "base image (tar)" + | Packages -> "packages" + | Hostfiles -> "hostfiles" + | Excludefiles -> "excludefiles" + +let rec build debug + (copy_kernel, dtb_wildcard, format, host_cpu, + packager_config, tmpdir, use_installed) + inputs outputdir = + if debug >= 1 then + printf "supermin: build: %s\n%!" (String.concat " " inputs); + + if inputs = [] then ( + eprintf "supermin: build: no input supermin appliance specified\n"; + exit 1; + ); + + (* Whe...

The new run_shell helper is a copy of run_python, and will be used by upcoming changes. Signed-off-by: Olaf Hering <olaf at 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

...e mode = + |PkgFiles + |PkgNames + |PkgNamesOnly + let excludes = ref [] -let names_mode = ref false +let mode = ref PkgFiles let outputdir = ref "." let packages = ref [] let save_temps = ref false let use_installed = ref false let verbose = ref false @@ -50,12 +55,14 @@ let set_packager_config filename = packager_config := Some filename let argspec = Arg.align [ "--exclude", Arg.String add_exclude, "regexp Exclude packages matching regexp"; - "--names", Arg.Set names_mode, + "--names", Arg.Unit (fun () -> mode := PkgNames),...