search for: copy_kernel

* Richard W.M. Jones: > On Sat, Apr 26, 2014 at 02:27:07PM +0200, Hilko Bengen wrote: >> --- >> src/kernel.ml | 43 ++++++++++++++++++++++++++++--------------- >> 1 file changed, 28 insertions(+), 15 deletions(-) >> >> diff --git a/src/kernel.ml b/src/kernel.ml >> index ed5aea3..436b1b0 100644 >> --- a/src/kernel.ml >> +++ b/src/kernel.ml

...mp; host_cpu.[3] = '6' -> ["?86"] + | _ when String.sub host_cpu 0 5 = "armv7" -> ["armmp"] + | _ -> [host_cpu] + in + List.map (fun model -> sprintf "vmlinu?-*-%s" model) models + let rec build_kernel debug host_cpu dtb_wildcard copy_kernel kernel dtb = (* Locate the kernel. *) let kernel_name, kernel_version = @@ -59,9 +72,6 @@ and find_kernel debug host_cpu copy_kernel kernel = let kernel_name = Filename.basename kernel_env in kernel_env, kernel_name, kernel_version with Not_found -> - let is_x86 = -...

...++++++------------------------------ 1 file changed, 44 insertions(+), 45 deletions(-) diff --git a/src/kernel.ml b/src/kernel.ml index 9b0e8a2..2e061d8 100644 --- a/src/kernel.ml +++ b/src/kernel.ml @@ -40,28 +40,7 @@ let patt_of_cpu host_cpu = let rec build_kernel debug host_cpu dtb_wildcard copy_kernel kernel dtb = (* Locate the kernel. *) - let kernel_name, kernel_version = - find_kernel debug host_cpu copy_kernel kernel in - - (* If the user passed --dtb option, locate dtb. *) - (match dtb_wildcard with - | None -> () - | Some wildcard -> - find_dtb debug copy_kernel kernel_...

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

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

...| 9 +++++++-- 5 files changed, 30 insertions(+), 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 *...

Hi Rich But there is no src/kernel.ml file on my ubuntu powerpc to which the above patch is reffering. I have installed supermin as supermin_5.1.8-2_powerpc.deb debian package. Thanks On Tue, Jun 3, 2014 at 7:16 PM, Richard W.M. Jones <rjones@redhat.com> wrote: > On Tue, Jun 03, 2014 at 06:55:49PM +0530, abhishek jain wrote: > > supermin: failed to find a suitable kernel

...en String.length host_cpu >= 5 && String.sub host_cpu 0 5 = > "armv7" -> ["armmp"] > | _ -> [host_cpu] > in > List.map (fun model -> sprintf "vmlinu?-*-%s" model) models > > let rec build_kernel debug host_cpu dtb_wildcard copy_kernel kernel dtb = > (* Locate the kernel. *) > let kernel_name, kernel_version = > find_kernel debug host_cpu copy_kernel kernel in > > (* If the user passed --dtb option, locate dtb. *) > (match dtb_wildcard with > | None -> () > | Some wildcard -> >...

--- 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".

...9 +++++++-- src/supermin.pod | 15 +++++++++++++++ 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...

...minor problem with this patch: > diff --git a/src/mode_prepare.ml b/src/mode_prepare.ml > index 70f9dd4..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, >...

See patch #2 for more explanation. Pino Toscano (2): prepare: keep config_files available for longer prepare: create a really empty base.tar.gz with no config files src/mode_prepare.ml | 87 +++++++++++++++++++++++++++------------------ 1 file changed, 52 insertions(+), 35 deletions(-) -- 2.17.2

...uot;gzip %s" (string_of_file_content c) @@ -56,6 +57,7 @@ and string_of_file_content = function | Packages -> "packages" | Hostfiles -> "hostfiles" | Excludefiles -> "excludefiles" + | Empty -> "(empty)" let rec build debug (copy_kernel, format, host_cpu, @@ -250,6 +252,8 @@ and read_appliance debug basedir appliance = function (* Depending on the file type, read or unpack the file. *) let appliance = match file_type with + | Uncompressed Empty | GZip Empty | XZ Empty -> + appliance | Uncompr...

...Chop final '/' in output directory (RHBZ#1146753). *) + let outputdir = + let len = String.length outputdir in + if outputdir.[len - 1] == '/' then String.sub outputdir 0 (len - 1) + else outputdir in debug, mode, if_newer, inputs, lockfile, outputdir, (copy_kernel, dtb_wildcard, format, host_cpu, -- 2.1.0

...Xen guest, and you only have Xen domU kernels installed, try installing a fullvirt kernel (only for -supermin use, you shouldn't boot the Xen guest with it).\n" - host_cpu; - exit 1 +supermin use, you shouldn't boot the Xen guest with it)." + host_cpu and find_dtb debug copy_kernel kernel_name wildcard dtb = let dtb_file = @@ -180,27 +179,25 @@ and find_dtb debug copy_kernel kernel_name wildcard dtb = copy_or_symlink_file copy_kernel dtb_file dtb and no_dtb_dir kernel_name = - eprintf "\ -supermin: failed to find a dtb (device tree) directory. + error "\...

This is a "merge" of two previous series: https://www.redhat.com/archives/libguestfs/2018-December/msg00015.html https://www.redhat.com/archives/libguestfs/2018-December/msg00020.html The goal is to handle better situations like: - empty file in the appliance directory - no config files available in the packages to include in an appliance Compared to the two series, the changes are: -

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 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

This patch series fixes several problems in the way that supermin handles kernels. The most pressing problem is that supermin doesn't handle bogus vmlinuz files which aren't actual kernels. Along the way there is a lot of clean up. The patches look much better if you view them with ‘-w’. This series will require plenty of time to be tested in Fedora, especially on non-x86 arches.

Hi, few cleanups in the supermin codebase; no actual functional change. Thanks, -- Pino Toscano (3): ext2: simplify tracking of visited modules utils: remove unused run_python function Add and use an helper error function src/build.ml | 20 +++++----------- src/dpkg.ml | 4 +--- src/ext2_initrd.ml | 10 ++++---- src/kernel.ml | 27