git.annexia.org
/
goaljobs-goals.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adjust for new layout of the libguestfs website.
[goaljobs-goals.git]
/
config.ml
diff --git
a/config.ml
b/config.ml
index
87d53bd
..
25316f7
100644
(file)
--- a/
config.ml
+++ b/
config.ml
@@
-17,8
+17,14
@@
let fedora_specfile pkg branch =
(* libguestfs *)
let libguestfs_query_mins = 60
(* libguestfs *)
let libguestfs_query_mins = 60
+let websites_repo =
+ sprintf "%s/d/websites" (Sys.getenv "HOME")
let libguestfs_website_repo =
let libguestfs_website_repo =
- sprintf "%s/d/websites/libguestfs" (Sys.getenv "HOME")
+ sprintf "%s/libguestfs" websites_repo
+let libguestfs_builder_repo =
+ sprintf "%s/libguestfs-builder" websites_repo
+let libguestfs_download_repo =
+ sprintf "%s/libguestfs-download" websites_repo
let libguestfs_localconfigure source =
let configure =
let libguestfs_localconfigure source =
let configure =
@@
-29,8
+35,8
@@
let libguestfs_localconfigure source =
#!/bin/bash -
. localenv
#!/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 \\
%s \\
--prefix /usr \\
@@
-39,12
+45,16
@@
let libguestfs_localconfigure source =
--enable-werror \\
--enable-gtk-doc \\
--disable-golang \\
--enable-werror \\
--enable-gtk-doc \\
--disable-golang \\
+ --disable-erlang \\
-C \\
\"$@\"
" configure
let libguestfs_localenv supermin =
"\
-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
# 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
+92,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
# 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 -> ""
" ^
match supermin with
| None -> ""