Make F22 and F23 follow 1.30

[goaljobs-goals.git] / libguestfs_upstream.ml

diff --git a/libguestfs_upstream.ml b/libguestfs_upstream.ml
index 48fda80..dd69b25 100644 (file)
--- a/libguestfs_upstream.ml
+++ b/libguestfs_upstream.ml
@@ -92,7 +92,7 @@ and website_built version =
     echo %s > localenv
 
     ./localconfigure
-    make
+    make V=1
     make website WEBSITEDIR=%s
   " buildtmp version.tarball
     version.package_version
@@ -119,7 +119,7 @@ and tarball_tested version =
     echo %s > localenv
 
     ./localconfigure
-    make
+    make V=1
     make check-release
   " buildtmp version.tarball
     version.package_version
@@ -151,13 +151,19 @@ and tarball_created version =
     rm po-docs/podfiles
     make -C po-docs update-po
 
-    make
+    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. *)
@@ -186,7 +192,7 @@ and commit_tested branch commit =
     echo %s > localenv
 
     ./localconfigure
-    make
+    make V=1
     make check-release
   " repodir
     commit