similar to: [PATCH febootstrap] Some cleanups for Debian and Ubuntu

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

Joseph, Please try my modified versions of these patches. These are compile-tested on Fedora and they don't break any existing functionality, but I don't have either urpmi nor a statically-linked xz so I cannot fully test them. I have also fixed detection of zlib (2/3). Rich.

--- config.ml.in | 2 +- configure.ac | 2 +- febootstrap_debian.ml | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config.ml.in b/config.ml.in index a8c008a..262c913 100644 --- a/config.ml.in +++ b/config.ml.in @@ -22,7 +22,7 @@ let package_version = "@PACKAGE_VERSION@" let yum = "@YUM@" let rpm = "@RPM@"

This takes a list of package names, adding them to the image without pulling any dependencies. Only implemented for Debian at the moment. zypper wasn't build-tested because I don't have the dependency. --- src/.depend | 2 +- src/supermin.ml | 6 +++--- src/supermin_cmdline.ml | 13 ++++++++++--- src/supermin_cmdline.mli | 10

"apt-cache depends --recurse -i ..." on Ubuntu 12.04 (apt 0.8.16~exp12ubuntu3) outputs duplicate entries which broke the code that checks whether all package files have been successfully downloaded. I am not sure if this is a bug in apt. --- src/febootstrap_debian.ml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/febootstrap_debian.ml

Hi, this work makes supermin use the rpm library instead of invoking rpm directly. This, together with a needed refactoring of the dependency resolution, should help in make supermin faster on rpm-based systems. Surely the patches will still need polishing, especially for behaviours of newly added stuff, but at least it's a good starting point. Noting that you need rpm-devel on most of rpm

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

This is an automatic message generated by the builder on builder-ubuntu for febootstrap. Log files from the build follow below. Linux builder-ubuntu 2.6.35-22-generic #35-Ubuntu SMP Sat Oct 16 20:45:36 UTC 2010 x86_64 GNU/Linux Tue Dec 14 22:00:01 GMT 2010 ----- + git pull --rebase git://git.annexia.org/git/febootstrap.git master >From git://git.annexia.org/git/febootstrap * branch

This is an automatic message generated by the builder on builder-ubuntu for febootstrap. Log files from the build follow below. Linux builder-ubuntu 2.6.35-22-generic #35-Ubuntu SMP Sat Oct 16 20:45:36 UTC 2010 x86_64 GNU/Linux Fri Jan 14 22:00:01 GMT 2011 ----- + git pull --rebase git://git.annexia.org/git/febootstrap.git master >From git://git.annexia.org/git/febootstrap * branch

This is an automatic message generated by the builder on builder-ubuntu for febootstrap. Log files from the build follow below. Linux builder-ubuntu 2.6.35-22-generic #35-Ubuntu SMP Sat Oct 16 20:45:36 UTC 2010 x86_64 GNU/Linux Tue Feb 15 22:00:01 GMT 2011 ----- + git pull --rebase git://git.annexia.org/git/febootstrap.git master >From git://git.annexia.org/git/febootstrap * branch

This is an automatic message generated by the builder on builder-debian for febootstrap. Log files from the build follow below. Linux builder-debian.home.annexia.org 2.6.36-trunk-amd64 #1 SMP Wed Oct 27 14:28:29 UTC 2010 x86_64 GNU/Linux Fri Jan 14 20:00:01 GMT 2011 ----- + git pull --rebase git://git.annexia.org/git/febootstrap.git master >From git://git.annexia.org/git/febootstrap *

This is an automatic message generated by the builder on builder-debian for febootstrap. Log files from the build follow below. Linux builder-debian.home.annexia.org 2.6.36-trunk-amd64 #1 SMP Wed Oct 27 14:28:29 UTC 2010 x86_64 GNU/Linux Tue Feb 15 20:00:01 GMT 2011 ----- + git pull --rebase git://git.annexia.org/git/febootstrap.git master >From git://git.annexia.org/git/febootstrap *

This is an automatic message generated by the builder on builder-debian for febootstrap. Log files from the build follow below. Linux builder-debian.home.annexia.org 2.6.36-trunk-amd64 #1 SMP Wed Oct 27 14:28:29 UTC 2010 x86_64 GNU/Linux Tue Dec 14 20:00:01 GMT 2010 ----- + git pull --rebase git://git.annexia.org/git/febootstrap.git master >From git://git.annexia.org/git/febootstrap *

On those systems "$(OCAMLFIND) $(OCAMLBEST)" was resolved as "ocamlfind byte" which did not work. --- Makefile.am | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index 109d2c8..4dc6f12 100644 --- a/Makefile.am +++ b/Makefile.am @@ -56,18 +56,18 @@ SOURCES_ML = $(filter %.ml,$(SOURCES)) BOBJECTS =

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

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

This is an automatic message generated by the builder on builder-debian for febootstrap. Log files from the build follow below. Linux builder-debian.home.annexia.org 2.6.36-trunk-amd64 #1 SMP Wed Oct 27 14:28:29 UTC 2010 x86_64 GNU/Linux Fri May 13 20:00:01 BST 2011 ----- + git pull --rebase git://git.annexia.org/git/febootstrap.git master >From git://git.annexia.org/git/febootstrap *

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

Hi Pino, On 04/02/2015 05:23 AM, Pino Toscano wrote: > Hi Daniel, > > On Wednesday 01 April 2015 16:37:26 Daniel Henrique Barboza wrote: >> 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). > the new version of the patch is somehow confusing.

Hi Pino, On 04/02/2015 09:51 AM, Pino Toscano wrote: > Hi Daniel, > > On Thursday 02 April 2015 09:34:17 Daniel Henrique Barboza wrote: >> On 04/02/2015 05:23 AM, Pino Toscano wrote: >>> Hi Daniel, >>> >>> On Wednesday 01 April 2015 16:37:26 Daniel Henrique Barboza wrote: >>>> The one that got upstream does not work in ibm-powerkvm due to the