X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=libguestfs_upstream.ml;h=dd69b25dd452737525457d976c4a2635e2e57dbd;hb=5ef65f7d418d25974089a8cb19715221a2d52f68;hp=42f9897a63b7316345adc4470b8c936c6f7d94e0;hpb=900fee3f7ed1b95f5bb18fda1c31917f72128c77;p=goaljobs-goals.git

diff --git a/libguestfs_upstream.ml b/libguestfs_upstream.ml
index 42f9897..dd69b25 100644
--- a/libguestfs_upstream.ml
+++ b/libguestfs_upstream.ml
@@ -91,16 +91,13 @@ and website_built version =
     chmod +x localconfigure
     echo %s > localenv
 
-    # Copy in the builder/website templates.
-    cp -a $HOME/d/libguestfs/builder/website/*.xz builder/website/
-
     ./localconfigure
-    make
+    make V=1
     make website WEBSITEDIR=%s
   " buildtmp version.tarball
     version.package_version
     (quote (libguestfs_localconfigure `Tarball))
-    (quote libguestfs_localenv)
+    (quote (libguestfs_localenv (supermin version)))
     (quote libguestfs_website_repo)
 
 (* Goal: the tarball has passed the required set of tests before
@@ -122,12 +119,12 @@ and tarball_tested version =
     echo %s > localenv
 
     ./localconfigure
-    make
+    make V=1
     make check-release
   " buildtmp version.tarball
     version.package_version
     (quote (libguestfs_localconfigure `Tarball))
-    (quote libguestfs_localenv)
+    (quote (libguestfs_localenv (supermin version)))
 
 (* Goal: the tarball has been created from git. *)
 and tarball_created version =
@@ -154,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)
+    (quote (libguestfs_localenv (supermin version)))
+    version.tarball
     version.tarball buildtmp version.tarball
 
 (* Goal: test a commit. *)
@@ -189,12 +192,12 @@ and commit_tested branch commit =
     echo %s > localenv
 
     ./localconfigure
-    make
+    make V=1
     make check-release
   " repodir
     commit
     (quote (libguestfs_localconfigure `Git))
-    (quote libguestfs_localenv)
+    (quote (libguestfs_localenv None))
 
 and repo_up_to_date branch =
   git_force branch