search for: use_installed

I just tried to get libguestfs to compile on Ubuntu 11.10 using the latest febootstrap, and the following patches were necessary for me. They are all just reasonable code cleanups *except* for patch 5/5 which is a gross hack for something I don't understand about how Ubuntu 11.10 multiarch support works. Rich.

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

...sertions(+), 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" in let kernel_ve...

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

...nklin 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, "regexp Exclude packages matching regexp"; - "--names", Arg.Set na...

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

...vant files/dirs should be copied into <rootdir> so that zypper can + * use the specified config. + *) open Unix open Printf @@ -34,15 +59,15 @@ let zypp_rpm_detect () = 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" + if use_installed then + eprintf "supermin: zypp_rpm driver assumes all packages are already installed when called with option --use-installed.\n...

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

...elated network tests to see the failure cause. It is worth saying that supermin upstream code builds and runs fine as far as I can tell, thus I couldn't figure it out much reading these errors: # ./test-build-bash.sh ./test-build-bash.sh: line 34: 83872 Aborted ../src/supermin -v --prepare $USE_INSTALLED bash -o $d1 # ./test-binaries-exist.sh ./test-binaries-exist.sh: line 29: 83886 Aborted ../src/supermin -v --prepare $USE_INSTALLED bash coreutils -o $d1 I will be honest and say that I didn't dig further understanding why the rpm_is_available check fails in ibm-powerkvm. The patch I sent i...

...(-) 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 * string * bool * int64 o...

...saying that supermin >> upstream code builds and runs fine as far as I can tell, thus I couldn't >> figure it out much reading >> these errors: >> >> # ./test-build-bash.sh >> ./test-build-bash.sh: line 34: 83872 Aborted ../src/supermin -v >> --prepare $USE_INSTALLED bash -o $d1 >> # ./test-binaries-exist.sh >> ./test-binaries-exist.sh: line 29: 83886 Aborted ../src/supermin -v >> --prepare $USE_INSTALLED bash coreutils -o $d1 > These errors tells me exactly what I was talking about: you are > building supermin on a rpm-based distributio...

...ds and runs fine as far as I can tell, thus I couldn't >>>> figure it out much reading >>>> these errors: >>>> >>>> # ./test-build-bash.sh >>>> ./test-build-bash.sh: line 34: 83872 Aborted ../src/supermin -v >>>> --prepare $USE_INSTALLED bash -o $d1 >>>> # ./test-binaries-exist.sh >>>> ./test-binaries-exist.sh: line 29: 83886 Aborted ../src/supermin -v >>>> --prepare $USE_INSTALLED bash coreutils -o $d1 >>> These errors tells me exactly what I was talking about: you are >>> buil...

...+), 1 deletion(-) diff --git a/tests/test-build-bash.sh b/tests/test-build-bash.sh index 44a8c89..0b75d8b 100755 --- a/tests/test-build-bash.sh +++ b/tests/test-build-bash.sh @@ -27,6 +27,7 @@ tmpdir=`mktemp -d` d1=$tmpdir/d1 d2=$tmpdir/d2 +d3=$tmpdir/d3 test "$USE_NETWORK" = 1 || USE_INSTALLED=--use-installed @@ -37,6 +38,8 @@ arch="$(uname -m)" # Check all supermin-helper formats work. ../src/supermin -v --build -f chroot --host-cpu $arch $d1 -o $d2 -../src/supermin -v --build -f ext2 --host-cpu $arch $d1 -o $d2 +../src/supermin -v --build -f ext2 --host-cpu $arch $d1 -o...

...cause. It is > worth saying that supermin > upstream code builds and runs fine as far as I can tell, thus I couldn't > figure it out much reading > these errors: > > # ./test-build-bash.sh > ./test-build-bash.sh: line 34: 83872 Aborted ../src/supermin -v > --prepare $USE_INSTALLED bash -o $d1 > # ./test-binaries-exist.sh > ./test-binaries-exist.sh: line 29: 83886 Aborted ../src/supermin -v > --prepare $USE_INSTALLED bash coreutils -o $d1 These errors tells me exactly what I was talking about: you are building supermin on a rpm-based distribution without librpm sup...

The one that got upstream does not work in ibm-powerkvm due to the rpm_is_avaiable verification in the detection (I've attached the wrong version in bugzilla). Thanks and sorry for the confusion, Daniel -------------- next part -------------- A non-text attachment was scrubbed... Name: 0001-Adding-ibm-powerkvm-distro-detection.patch Type: text/x-patch Size: 1306 bytes Desc: not available

...upstream code builds and runs fine as far as I can tell, thus I couldn't > >> figure it out much reading > >> these errors: > >> > >> # ./test-build-bash.sh > >> ./test-build-bash.sh: line 34: 83872 Aborted ../src/supermin -v > >> --prepare $USE_INSTALLED bash -o $d1 > >> # ./test-binaries-exist.sh > >> ./test-binaries-exist.sh: line 29: 83886 Aborted ../src/supermin -v > >> --prepare $USE_INSTALLED bash coreutils -o $d1 > > These errors tells me exactly what I was talking about: you are > > building supermin o...

...>>>>> couldn't >>>>> figure it out much reading >>>>> these errors: >>>>> >>>>> # ./test-build-bash.sh >>>>> ./test-build-bash.sh: line 34: 83872 Aborted ../src/supermin -v >>>>> --prepare $USE_INSTALLED bash -o $d1 >>>>> # ./test-binaries-exist.sh >>>>> ./test-binaries-exist.sh: line 29: 83886 Aborted ../src/supermin -v >>>>> --prepare $USE_INSTALLED bash coreutils -o $d1 >>>> These errors tells me exactly what I was talking about: you are &...

...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: not creating base.tar...

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

...; then distro=arch elif [ -f /etc/debian_version ]; then distro=debian @@ -63,6 +70,10 @@ case $distro in ibm-powerkvm) pkgs="augeas hivex tar" ;; + *) + echo "Unhandled distro '$distro'" + exit 77 + ;; esac test "$USE_NETWORK" = 1 || USE_INSTALLED=--use-installed -- 2.7.4