X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=config.ml;h=80f116b16964fea6de3878e4cf556aa5c8cce6c2;hb=0519caba284c69db7bd520094d169fac7b50ce07;hp=87d53bd860c56d4882c8d2a640abfbd259081431;hpb=f09dc0ceb2051e5aca81ac77883636c940b05352;p=goaljobs-goals.git

diff --git a/config.ml b/config.ml
index 87d53bd..80f116b 100644
--- a/config.ml
+++ b/config.ml
@@ -29,8 +29,8 @@ let libguestfs_localconfigure source =
 #!/bin/bash -
 . localenv
 
-# NB: --enable-valgrind-daemon is disabled because we
-# should be checking production builds.
+# erlang is disabled because it is broken in Rawhide:
+# https://bugzilla.redhat.com/show_bug.cgi?id=1316206
 
 %s \\
   --prefix /usr \\
@@ -39,12 +39,16 @@ let libguestfs_localconfigure source =
   --enable-werror \\
   --enable-gtk-doc \\
   --disable-golang \\
+  --disable-erlang \\
   -C \\
   \"$@\"
 " configure
 
 let libguestfs_localenv supermin =
   "\
+# Use the real virt-builder configuration from /etc.
+export XDG_CONFIG_DIRS=/etc
+
 # Fails under valgrind because of a leak in the fuse library,
 # although I could not work out exactly why.
 export SKIP_TEST_PARALLEL_MOUNT_LOCAL=1
@@ -82,6 +86,9 @@ export SKIP_TEST_INOTIFY_ADD_WATCH=1
 # libguestfs: error: mkfs_btrfs: /dev/sda1: not enough free space
 # (RHBZ#1291715).
 export SKIP_TEST_BTRFS_IMAGE_0=1
+
+# Yawn, btrfs broken again. RHBZ#1372037
+export SKIP_TEST_BTRFS_DEVICES_SH=1
 " ^
     match supermin with
     | None -> ""