Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0831363686 | |||
| 0f776e4dd8 | |||
| 8261606b8b | |||
| 71403285a4 |
@@ -23,6 +23,7 @@ my $dep_scan_depth = $ENV{DEPENDENCY_SCAN_DEPTH} // 2;
|
|||||||
my $skip_portage_sync = $ENV{SKIP_PORTAGE_SYNC} // 0;
|
my $skip_portage_sync = $ENV{SKIP_PORTAGE_SYNC} // 0;
|
||||||
my $emerge_split_install = $ENV{EMERGE_SPLIT_INSTALL} // 0;
|
my $emerge_split_install = $ENV{EMERGE_SPLIT_INSTALL} // 0;
|
||||||
my $webrsync = $ENV{WEBRSYNC} // 0;
|
my $webrsync = $ENV{WEBRSYNC} // 0;
|
||||||
|
my $enman_repositories = $ENV{ENMAN_REPOSITORIES};
|
||||||
|
|
||||||
my $make_conf = $ENV{MAKE_CONF};
|
my $make_conf = $ENV{MAKE_CONF};
|
||||||
|
|
||||||
@@ -221,6 +222,10 @@ if ($use_equo && $entropy_repository eq "weekly" ) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ($use_equo) {
|
if ($use_equo) {
|
||||||
|
if ($enman_repositories and $enman_repositories ne "") {
|
||||||
|
my @enman_toadd=split(/ /,$enman_repositories);
|
||||||
|
system("enman add $_") for @enman_toadd;
|
||||||
|
}
|
||||||
system("equo repo mirrorsort sabayonlinux.org") if $equo_mirrorsort;
|
system("equo repo mirrorsort sabayonlinux.org") if $equo_mirrorsort;
|
||||||
system("equo up && equo u")
|
system("equo up && equo u")
|
||||||
}
|
}
|
||||||
@@ -266,8 +271,9 @@ my $rt;
|
|||||||
if ($emerge_split_install) {
|
if ($emerge_split_install) {
|
||||||
for my $pack (@packages){
|
for my $pack (@packages){
|
||||||
my $tmp_rt=system("emerge $emerge_defaults_args -j $jobs $pack");
|
my $tmp_rt=system("emerge $emerge_defaults_args -j $jobs $pack");
|
||||||
$rt=$tmp_rt if ($? == -1 or $? & 127 or !$rt); # if one fails, the build should be considered failed!
|
# $rt=$tmp_rt if ($? == -1 or $? & 127 or !$rt); # if one fails, the build should be considered failed!
|
||||||
}
|
}
|
||||||
|
$rt=0; #consider the build good anyway, like a "keep-going"
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$rt = system("emerge $emerge_defaults_args -j $jobs @packages");
|
$rt = system("emerge $emerge_defaults_args -j $jobs @packages");
|
||||||
|
|||||||
@@ -37,8 +37,10 @@ docker_volumes=( -v "$OUTPUT_DIR:/usr/portage/packages" )
|
|||||||
[ -z "$ENTROPY_REPOSITORY" ] || docker_env+=(-e "ENTROPY_REPOSITORY=$ENTROPY_REPOSITORY")
|
[ -z "$ENTROPY_REPOSITORY" ] || docker_env+=(-e "ENTROPY_REPOSITORY=$ENTROPY_REPOSITORY")
|
||||||
[ -z "$SKIP_PORTAGE_SYNC" ] || docker_env+=(-e "SKIP_PORTAGE_SYNC=$SKIP_PORTAGE_SYNC")
|
[ -z "$SKIP_PORTAGE_SYNC" ] || docker_env+=(-e "SKIP_PORTAGE_SYNC=$SKIP_PORTAGE_SYNC")
|
||||||
[ -z "$WEBRSYNC" ] || docker_env+=(-e "WEBRSYNC=$WEBRSYNC")
|
[ -z "$WEBRSYNC" ] || docker_env+=(-e "WEBRSYNC=$WEBRSYNC")
|
||||||
|
[ -z "$ENMAN_REPOSITORIES" ] || docker_env+=(-e "ENMAN_REPOSITORIES=$ENMAN_REPOSITORIES")
|
||||||
[ -z "$DISTFILES" ] || docker_volumes+=(-v "$DISTFILES:/usr/portage/distfiles")
|
[ -z "$DISTFILES" ] || docker_volumes+=(-v "$DISTFILES:/usr/portage/distfiles")
|
||||||
[ -z "$ENTROPY_DOWNLOADED_PACKAGES" ] || docker_volumes+=(-v "$ENTROPY_DOWNLOADED_PACKAGES:/var/lib/entropy/client/packages")
|
[ -z "$ENTROPY_DOWNLOADED_PACKAGES" ] || docker_volumes+=(-v "$ENTROPY_DOWNLOADED_PACKAGES:/var/lib/entropy/client/packages")
|
||||||
|
[ -z "$DISTCC_HOSTS" ] || docker_env+=(-e "DISTCC_HOSTS=$DISTCC_HOSTS")
|
||||||
|
|
||||||
if [ -n "$REMOTE_OVERLAY" ]; then
|
if [ -n "$REMOTE_OVERLAY" ]; then
|
||||||
git clone "$REMOTE_OVERLAY" "$TEMPDIR"
|
git clone "$REMOTE_OVERLAY" "$TEMPDIR"
|
||||||
|
|||||||
Reference in New Issue
Block a user