search for: dtb_wildcard

This two-part patch for supermin implements device trees (for ARM). The first patch introduces a more rational way to handle command line arguments in 'supermin-helper'. See the commit message for details. The old style is still supported for compatibility. The second patch adds an extra supermin-helper --dtb parameter specifying a wildcard. A device tree file which matches the

...+++++++++++++++++++------------------------------ 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_ke...

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

...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 debug an...

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

...39;/' 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

...n(-) diff --git a/src/kernel.ml b/src/kernel.ml index 2e061d8..b4e89da 100644 --- a/src/kernel.ml +++ b/src/kernel.ml @@ -22,6 +22,7 @@ open Printf open Utils open Ext2fs open Fnmatch +open Glob let patt_of_cpu host_cpu = let models = @@ -60,7 +61,28 @@ let rec build_kernel debug host_cpu dtb_wildcard copy_kernel kernel dtb = let modpath = find_modpath debug kernel_version in kernel_env, kernel_name, kernel_version, modpath with Not_found -> - find_kernel debug host_cpu kernel in + let kernels = + let files = glob "/lib/modules/*/vmlinuz" [GLOB_NO...

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

...erlibguestfs: command: run: \ --verboselibguestfs: command: run: \ -f checksumlibguestfs: command: run: \ --host-cpu x86_64libguestfs: command: run: \ /usr/lib/guestfs/supermin.dsupermin helper [00000ms] whitelist = (not specified)supermin helper [00000ms] host_cpu = x86_64supermin helper [00000ms] dtb_wildcard = (not specified)supermin helper [00000ms] inputs:supermin helper [00000ms] inputs[0] = /usr/lib/guestfs/supermin.dsupermin helper [00000ms] outputs:supermin helper [00000ms] kernel = (none)supermin helper [00000ms] dtb = (none)supermin helper [00000ms] initrd = (none)supermin helper [00000ms] appl...

...uestfs: command: run: \ --verbose libguestfs: command: run: \ -f checksum libguestfs: command: run: \ --host-cpu x86_64 libguestfs: command: run: \ /usr/lib/guestfs/supermin.d supermin helper [00000ms] whitelist = (not specified) supermin helper [00000ms] host_cpu = x86_64 supermin helper [00000ms] dtb_wildcard = (not specified) supermin helper [00000ms] inputs: supermin helper [00000ms] inputs[0] = /usr/lib/guestfs/supermin.d supermin helper [00000ms] outputs: supermin helper [00000ms] kernel = (none) supermin helper [00000ms] dtb = (none) supermin helper [00000ms] initrd = (none) supermin helper [00000m...

...uestfs: command: run: \ --verbose libguestfs: command: run: \ -f checksum libguestfs: command: run: \ --host-cpu x86_64 libguestfs: command: run: \ /usr/lib/guestfs/supermin.d supermin helper [00000ms] whitelist = (not specified) supermin helper [00000ms] host_cpu = x86_64 supermin helper [00000ms] dtb_wildcard = (not specified) supermin helper [00000ms] inputs: supermin helper [00000ms] inputs[0] = /usr/lib/guestfs/supermin.d supermin helper [00000ms] outputs: supermin helper [00000ms] kernel = (none) supermin helper [00000ms] dtb = (none) supermin helper [00000ms] initrd = (none) supermin helper [00000m...

...uestfs: command: run: \ --verbose libguestfs: command: run: \ -f checksum libguestfs: command: run: \ --host-cpu x86_64 libguestfs: command: run: \ /usr/lib/guestfs/supermin.d supermin helper [00000ms] whitelist = (not specified) supermin helper [00000ms] host_cpu = x86_64 supermin helper [00000ms] dtb_wildcard = (not specified) supermin helper [00000ms] inputs: supermin helper [00000ms] inputs[0] = /usr/lib/guestfs/supermin.d supermin helper [00000ms] outputs: supermin helper [00000ms] kernel = (none) supermin helper [00000ms] dtb = (none) supermin helper [00000ms] initrd = (none) supermin helper [00000m...

...' && 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 -> - le...

* 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

On Thu, Dec 04, 2014 at 04:53:21PM +0800, cuimingwen@incito.com.cn wrote: > Hello， Richard， > I run command as example： " virt-df -d `virsh domuuid 5`" > some errors show : > libguestfs: warning: supermin-helper -f checksum returned a short string > libguestfs: error: cannot find any suitable libguestfs supermin, fixed or old-style appliance on

...uestfs: command: run: \ --verbose libguestfs: command: run: \ -f checksum libguestfs: command: run: \ --host-cpu x86_64 libguestfs: command: run: \ /usr/lib/guestfs/supermin.d supermin helper [00000ms] whitelist = (not specified) supermin helper [00000ms] host_cpu = x86_64 supermin helper [00000ms] dtb_wildcard = (not specified) supermin helper [00000ms] inputs: supermin helper [00000ms] inputs[0] = /usr/lib/guestfs/supermin.d supermin helper [00000ms] outputs: supermin helper [00000ms] kernel = (none) supermin helper [00000ms] dtb = (none) supermin helper [00000ms] initrd = (none) supermin helper [00000m...

...: command: run: \ --verbose libguestfs: command: run: \ -f checksum libguestfs: command: run: \ --host-cpu x86_64 libguestfs: command: run: \ /usr/lib/guestfs/supermin.d supermin helper [00000ms] whitelist = (not specified) supermin helper [00000ms] host_cpu = x86_64 supermin helper [00000ms] dtb_wildcard = (not specified) supermin helper [00000ms] inputs: supermin helper [00000ms] inputs[0] = /usr/lib/guestfs/supermin.d supermin helper [00000ms] outputs: supermin helper [00000ms] kernel = (none) supermin helper [00000ms] dtb = (none) supermin helper [00000ms] initrd = (none) supermin helper...

...uestfs: command: run: \ --verbose libguestfs: command: run: \ -f checksum libguestfs: command: run: \ --host-cpu x86_64 libguestfs: command: run: \ /usr/lib/guestfs/supermin.d supermin helper [00000ms] whitelist = (not specified) supermin helper [00000ms] host_cpu = x86_64 supermin helper [00000ms] dtb_wildcard = (not specified) supermin helper [00000ms] inputs: supermin helper [00000ms] inputs[0] = /usr/lib/guestfs/supermin.d supermin helper [00000ms] outputs: supermin helper [00000ms] kernel = (none) supermin helper [00000ms] dtb = (none) supermin helper [00000ms] initrd = (none) supermin helper [00000m...

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

...t; | _ when 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 -&...