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
7e32e53
..
0d41d33
100644
(file)
--- a/
libguestfs_upstream.ml
+++ b/
libguestfs_upstream.ml
@@
-39,7
+39,7
@@
let rec goal website_updated version =
if not version.is_stable then
require (website_built version);
if not version.is_stable then
require (website_built version);
- require (website_c
vs_c
hecked_in version);
+ require (website_checked_in version);
require (website_rsync_done version)
(* Goal: website has been rsync'd. *)
require (website_rsync_done version)
(* Goal: website has been rsync'd. *)
@@
-50,11
+50,11
@@
and website_rsync_done version =
sh "
cd %s
./.rsync
sh "
cd %s
./.rsync
- " libguestfs_website_
cvs
+ " libguestfs_website_
repo
-(* Goal: Tarball added to
CVS and CVS
checked in. *)
-and website_c
vs_c
hecked_in version =
- let key = sprintf "libguestfs_website_c
vs_c
hecked_in_%s" version.version in
+(* Goal: Tarball added to
repository and
checked in. *)
+and website_checked_in version =
+ let key = sprintf "libguestfs_website_checked_in_%s" version.version in
target (memory_exists key);
onrun (fun () -> memory_set key "1");
target (memory_exists key);
onrun (fun () -> memory_set key "1");
@@
-64,16
+64,17
@@
and website_cvs_checked_in version =
sh "
cd %s
cp %s/tarballs/%s %s
sh "
cd %s
cp %s/tarballs/%s %s
- cvs add -kb %s
- cvs ci -m \"Version %s\"
- " libguestfs_website_cvs
+ git add %s
+ git add *.txt *.html
+ git commit -m \"Version %s\"
+ " libguestfs_website_repo
buildtmp version.tarball version.urlpath
version.urlpath
version.version
(* Goal: website (local copy) has been built. *)
and website_built version =
buildtmp version.tarball version.urlpath
version.urlpath
version.version
(* Goal: website (local copy) has been built. *)
and website_built version =
- let index_file = sprintf "%s/index.html" libguestfs_website_
cvs
in
+ let index_file = sprintf "%s/index.html" libguestfs_website_
repo
in
target (file_contains_string index_file version.version);
require (tarball_created version);
target (file_contains_string index_file version.version);
require (tarball_created version);
@@
-90,16
+91,14
@@
and website_built version =
chmod +x localconfigure
echo %s > localenv
chmod +x localconfigure
echo %s > localenv
- # Copy in the builder/website templates.
- cp $HOME/d/libguestfs/builder/website/*.xz builder/website/
-
./localconfigure
./localconfigure
- make
- make
website
+ 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
* a release is allowed.
(* Goal: the tarball has passed the required set of tests before
* a release is allowed.
@@
-120,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 =
@@
-136,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
@@
-146,13
+152,25
@@
and tarball_created version =
echo %s > localenv
./localconfigure
echo %s > localenv
./localconfigure
- make
+
+ # Ensure the po-docs are updated. Grrr this is ugly ...
+ make ||:
+ rm po-docs/podfiles
+ make -C po-docs update-po
+
+ 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. *)
@@
-181,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