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
Use installed goaljobs package.
[goaljobs-goals.git]
/
libguestfs_upstream.ml
diff --git
a/libguestfs_upstream.ml
b/libguestfs_upstream.ml
index
42f9897
..
0d41d33
100644
(file)
--- a/
libguestfs_upstream.ml
+++ b/
libguestfs_upstream.ml
@@
-91,16
+91,13
@@
and website_built version =
chmod +x localconfigure
echo %s > localenv
chmod +x localconfigure
echo %s > localenv
- # Copy in the builder/website templates.
- cp -a $HOME/d/libguestfs/builder/website/*.xz builder/website/
-
./localconfigure
./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))
" 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
(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
echo %s > localenv
./localconfigure
- make
+ make
V=1
make check-release
" buildtmp version.tarball
version.package_version
(quote (libguestfs_localconfigure `Tarball))
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 =
(* Goal: the tarball has been created from git. *)
and tarball_created version =
@@
-138,6
+135,13
@@
and tarball_created version =
let repodir = sprintf "%s/repos/%s-%s" buildtmp package version.branch in
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
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
rm po-docs/podfiles
make -C po-docs update-po
- make
+ make
V=1
make dist
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
mv %s %s/tarballs/%s
" repodir
- version
.version
+ version
_tag
(quote (libguestfs_localconfigure `Git))
(quote (libguestfs_localconfigure `Git))
- (quote libguestfs_localenv)
+ (quote (libguestfs_localenv (supermin version)))
+ version.tarball
version.tarball buildtmp version.tarball
(* Goal: test a commit. *)
version.tarball buildtmp version.tarball
(* Goal: test a commit. *)
@@
-189,12
+199,12
@@
and commit_tested branch commit =
echo %s > localenv
./localconfigure
echo %s > localenv
./localconfigure
- make
+ make
V=1
make check-release
" repodir
commit
(quote (libguestfs_localconfigure `Git))
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
and repo_up_to_date branch =
git_force branch