search for: outputdir

...e given wildcard. You can use a wildcard such as C<vexpress-*a9*.dtb> which would match -C<vexpress-v2p-ca9.dtb>. +F<vexpress-v2p-ca9.dtb>. Notes: @@ -170,7 +170,7 @@ Possible formats are: A directory tree in the host filesystem. -The filesystem tree is written to C<OUTPUTDIR> (ie. the I<-o> option). +The filesystem tree is written to F<OUTPUTDIR> (ie. the I<-o> option). This is called a C<chroot> because you could literally L<chroot(1)> into this directory afterwards, although it's a better idea to use a @@ -183,13 +183,13 @@ as...

....ml index 9623229..3070b6b 100644 --- a/src/supermin.ml +++ b/src/supermin.ml @@ -186,6 +186,11 @@ let main () = eprintf "supermin: output directory (-o option) must be supplied\n"; exit 1 ); + (* 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

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

...permin 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 kernel/initrd/root as outputs (RHBZ#1813809) src/mode_build.ml | 22 ++++++++++++-- src/mode_build.mli | 4 +++ src/mode_prepare.ml | 9 +++++- src/mode_prepare.mli | 4 +++ src/supermin.ml | 11 ++++...

...ello, I would like to be able to write all files produced on one day to an output directory with that date stamp, or alternatively stamp the date in the filename. So that if i run the same code the next day the files will not be overwritten. here's what i have to start with: baseDir = getwd() outputDir = paste(baseDir,"/OutputData-", Sys.Date(),sep="") and lets say i want to write the table "test.table" to a file: write.table(test.table, "test.table.txt", sep="\t") How do i make this write to outputDir? Thanks. -- View this message in context...

...d0781..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" in let kernel_version, modpath = Kernel.build_kernel debug host_cpu dtb_wildcard cop...

...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 and patch with the build mode files together Pino Toscano (4): build: factor ext2 filenames Tighten Unix_error check for missing outputdir Act on --if-newer only for build mode build: check for outputs in --if-newer check (RHBZ#1813809) src/mode_build.ml | 22 ++++++++++++-- src/mode_build.mli | 4 +++ src/supermin.ml | 10 ++++--- tests/Makefile.am | 3 +- tests/test-if-newer-ext2.sh |...

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

...c/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 * string * bool * int64 option * bool) -> string list -> string -> unit (** [build debug (args...) inputs outputdir] performs the [supermin --build] subcommand. *) + +val get_outputs : (bool * Types.format * string * string option * string * bool * int64 option * bool) -> string list -> string list +(** [get_outputs (args...) inputs] gets the potential outputs for the + appliance. *) diff --git a/s...

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

...b/usr/klibc/socketcalls.pl index 3dac096..9df5949 100644 --- a/usr/klibc/socketcalls.pl +++ b/usr/klibc/socketcalls.pl @@ -42,44 +42,27 @@ while ( defined($line = <FILE>) ) { $nargs = $i; print " \\\n\t${name}.o"; - if ( $arch eq 'i386' ) { - open(OUT, "> ${outputdir}/${name}.S") - or die "$0: Cannot open ${outputdir}/${name}.S\n"; + open(OUT, "> ${outputdir}/${name}.c") + or die "$0: Cannot open ${outputdir}/${name}.c\n"; - print OUT "#include <sys/socketcalls.h>\n"; - print OUT "\n&quot...

...+165,24 @@ read the man page virt-get-kernel(1). if kernels = [] then error (f_"no kernel found"); + let dest_filename fn = + let fn = Filename.basename fn in + if unversioned then fst (string_split "-" fn) + else fn in + (* Download the latest. *) let outputdir = match output with | None -> Filename.current_dir_name | Some dir -> dir in let kernel_in = List.hd kernels in - let kernel_out = outputdir // Filename.basename kernel_in in + let kernel_out = outputdir // dest_filename kernel_in in printf "download: %s -> %s\n...

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

--- src/chroot.ml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/chroot.ml b/src/chroot.ml index b5c1e53..9e522d9 100644 --- a/src/chroot.ml +++ b/src/chroot.ml @@ -26,7 +26,9 @@ let build_chroot debug files outputdir = List.iter ( fun file -> try - let path = file.ft_source_path in + let path = if file_exists file.ft_source_path + then file.ft_source_path + else file.ft_path in let st = lstat path in let opath = outputdir // file.ft_path in...

Simple refactoring, no actual behaviour changes. --- get-kernel/get_kernel.ml | 188 ++++++++++++++++++++++++----------------------- 1 file changed, 95 insertions(+), 93 deletions(-) diff --git a/get-kernel/get_kernel.ml b/get-kernel/get_kernel.ml index 8ca7ca0..3b27740 100644 --- a/get-kernel/get_kernel.ml +++ b/get-kernel/get_kernel.ml @@ -23,104 +23,106 @@ module G = Guestfs open Printf

...pen 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: not creating base.tar.gz\n%!"; > ) > + > +and get_outputs > + (copy_kern...

...line.ml +++ b/src/supermin_cmdline.ml @@ -16,12 +16,17 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *) open Printf +type 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,...

...c/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 * string * bool * int64 option * bool) -> string list -> string -> unit (** [build debug (args...) inputs outputdir] performs the [supermin --build] subcommand. *) + +val get_outputs : (bool * Types.format * string * string option * string * bool * int64 option * bool) -> string list -> string list +(** [get_outputs (args...) inputs] gets the potential outputs for the + appliance. *) diff --git a/s...

...------- 1 file changed, 48 insertions(+), 25 deletions(-) diff --git a/usr/klibc/arch/s390/sysstub.ph b/usr/klibc/arch/s390/sysstub.ph index 880a0da..79f3068 100644 --- a/usr/klibc/arch/s390/sysstub.ph +++ b/usr/klibc/arch/s390/sysstub.ph @@ -7,33 +7,56 @@ # sub make_sysstub($$$$$@) { my($outputdir, $fname, $type, $sname, $stype, @args) = @_; + my($t); + my($r, $llregs) = (0, ($typesize{'void *'} == 8) ? 1 : 2); - open(OUT, '>', "${outputdir}/${fname}.S"); - print OUT "#include <asm/unistd.h>\n"; - print OUT "\n"; - pr...

...rt by version to get the latest version as first element. *) - let kernels = List.rev (List.sort compare_version kernels) in - let initrds = List.rev (List.sort compare_version initrds) in - - if kernels = [] then - error (f_"no kernel found"); - - (* Download the latest. *) - let outputdir = - match output with - | None -> Filename.current_dir_name - | Some dir -> dir in - let kernel_in = List.hd kernels in - let kernel_out = outputdir // Filename.basename kernel_in in - printf "download: %s -> %s\n%!" kernel_in kernel_out; - g#download kernel_in kerne...