similar to: [PATCH] Eliminate duplicate entries from package list

--- src/febootstrap_debian.ml | 65 +++++++++++++++++++++++++++++++++++++------- 1 files changed, 54 insertions(+), 11 deletions(-) diff --git a/src/febootstrap_debian.ml b/src/febootstrap_debian.ml index 23f3593..bb10f15 100644 --- a/src/febootstrap_debian.ml +++ b/src/febootstrap_debian.ml @@ -28,6 +28,9 @@ open Febootstrap_cmdline (* Create a temporary directory for use by all the

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

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.

[CC also to libguestfs mailing list] On Tue, May 17, 2011 at 08:11:10PM +0200, Guido G?nther wrote: > As to binary debs: I wonder if we can't just get away by adding the > needed packages as build-depends (so they end up installed on the buildd > before the package built) and modify febootstrap to look at the > _installed_ files instead of at the downloaded debs. > >

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 Mar 22 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 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 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 *

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-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 27 20:00:01 BST 2011 ----- + git pull --rebase git://git.annexia.org/git/febootstrap.git master >From git://git.annexia.org/git/febootstrap *

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

This is copied from supermin. --- mllib/common_utils.ml | 16 ++++++++++++++++ mllib/common_utils.mli | 6 ++++++ 2 files changed, 22 insertions(+) diff --git a/mllib/common_utils.ml b/mllib/common_utils.ml index 13e9256..5fb7183 100644 --- a/mllib/common_utils.ml +++ b/mllib/common_utils.ml @@ -267,6 +267,22 @@ let rec assoc ?(cmp = compare) ~default x = function | (y, y') :: _ when

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 =

Simple code motion. --- mllib/common_utils.ml | 9 +++++++++ mllib/common_utils.mli | 6 ++++++ v2v/utils.ml | 9 --------- v2v/utils.mli | 3 --- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/mllib/common_utils.ml b/mllib/common_utils.ml index 81d8202..78618f5 100644 --- a/mllib/common_utils.ml +++ b/mllib/common_utils.ml @@ -297,6 +297,15 @@ let sort_uniq

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 Jun 7 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 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 7 12:22:48 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 Dec 10 22:00:01 GMT 2010 ----- + git pull --rebase git://git.annexia.org/git/febootstrap.git master >From git://git.annexia.org/git/febootstrap * branch