libguestfs: Ignore error: mkfs_btrfs: /dev/sda1: not enough free space.

[goaljobs-goals.git] / libguestfs_upstream.ml

diff --git a/libguestfs_upstream.ml b/libguestfs_upstream.ml
index ad46864..a3450eb 100644 (file)
--- a/libguestfs_upstream.ml
+++ b/libguestfs_upstream.ml
@@ -93,7 +93,7 @@ and website_built version =
 
     ./localconfigure
     make V=1
-    make website WEBSITEDIR=%s
+    make maintainer-upload-website WEBSITEDIR=%s
   " buildtmp version.tarball
     version.package_version
     (quote (libguestfs_localconfigure `Tarball))
@@ -153,11 +153,17 @@ and tarball_created version =
 
     make V=1
     make dist
+
+    # Ensure redhat hardening flags didn't leak into the tarball.
+    # https://bugzilla.redhat.com/show_bug.cgi?id=1214506
+    if zcat %s | grep -q redhat-hardened; then exit 1; fi
+
     mv %s %s/tarballs/%s
   " repodir
     version.version
     (quote (libguestfs_localconfigure `Git))
     (quote (libguestfs_localenv (supermin version)))
+    version.tarball
     version.tarball buildtmp version.tarball
 
 (* Goal: test a commit. *)