X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=libguestfs_upstream.ml;h=0d41d336ca6fc87706ff46aaecfbca6af5fcad7d;hb=428096c1c01b9942c62105e547eaa6c7d44e6ce1;hp=06bf83b7c0bab5b8ea1baa3d7764270b8796ee64;hpb=2b5c3a7099d0ef718c466be184eec162f7030eb5;p=goaljobs-goals.git

diff --git a/libguestfs_upstream.ml b/libguestfs_upstream.ml
index 06bf83b..0d41d33 100644
--- a/libguestfs_upstream.ml
+++ b/libguestfs_upstream.ml
@@ -91,12 +91,9 @@ 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 website WEBSITEDIR=%s
+    make V=1
+    make maintainer-upload-website WEBSITEDIR=%s
   " buildtmp version.tarball
     version.package_version
     (quote (libguestfs_localconfigure `Tarball))
@@ -122,7 +119,7 @@ and tarball_tested version =
     echo %s > localenv
 
     ./localconfigure
-    make
+    make V=1
     make check-release
   " buildtmp version.tarball
     version.package_version
@@ -138,6 +135,13 @@ and tarball_created version =
 
   let repodir = sprintf "%s/repos/%s-%s" buildtmp package version.branch in
 
+  (* Branches <= 1.32 are tagged with "1.32.11",
+   * branches >= 1.33 are tagged with "v1.33.11".
+   *)
+  let version_tag =
+    if version.minor >= 33 then "v" ^ version.version
+    else version.version in
+
   sh "
     cp -a %s libguestfs
     cd libguestfs
@@ -154,13 +158,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
+    version_tag
     (quote (libguestfs_localconfigure `Git))
     (quote (libguestfs_localenv (supermin version)))
+    version.tarball
     version.tarball buildtmp version.tarball
 
 (* Goal: test a commit. *)
@@ -189,7 +199,7 @@ and commit_tested branch commit =
     echo %s > localenv
 
     ./localconfigure
-    make
+    make V=1
     make check-release
   " repodir
     commit