Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 5f75f6e64b | |||
| 9fd7ce2582 | |||
| a62baaf0ea | |||
| bf78080418 | |||
| 218dfa9dcd | |||
| 575ec04147 |
@@ -40,6 +40,7 @@ my $remote_overlay = $ENV{REMOTE_OVERLAY};
|
|||||||
my $qualityassurance_checks = $ENV{QA_CHECKS} // 0;
|
my $qualityassurance_checks = $ENV{QA_CHECKS} // 0;
|
||||||
my $remote_conf_portdir = $ENV{REMOTE_CONF_PORTDIR};
|
my $remote_conf_portdir = $ENV{REMOTE_CONF_PORTDIR};
|
||||||
my $remote_portdir = $ENV{REMOTE_PORTDIR};
|
my $remote_portdir = $ENV{REMOTE_PORTDIR};
|
||||||
|
my $pretend = $ENV{PRETEND} // 0;
|
||||||
|
|
||||||
my $make_conf = $ENV{MAKE_CONF};
|
my $make_conf = $ENV{MAKE_CONF};
|
||||||
|
|
||||||
@@ -523,7 +524,8 @@ if ($use_equo) {
|
|||||||
safe_call("equo i $equo_install_args --bdeps $_")
|
safe_call("equo i $equo_install_args --bdeps $_")
|
||||||
for ( @packages_deps, @equo_install )
|
for ( @packages_deps, @equo_install )
|
||||||
; ## bail out here, if installs fails. emerge will compile a LOT of stuff
|
; ## bail out here, if installs fails. emerge will compile a LOT of stuff
|
||||||
if ( @equo_remove > 0 ) {
|
if ( @equo_remove > 0 and !$pretend) {
|
||||||
|
say "Removing with equo: @equo_remove";
|
||||||
system("equo rm --nodeps $_") for (@equo_remove);
|
system("equo rm --nodeps $_") for (@equo_remove);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -548,12 +550,19 @@ if ( $qualityassurance_checks == 1 ) {
|
|||||||
|
|
||||||
say "*** Ready to compile, finger crossed ***";
|
say "*** Ready to compile, finger crossed ***";
|
||||||
|
|
||||||
|
if($pretend){
|
||||||
|
say "----> PRETEND mode <----";
|
||||||
|
$equo_install_args.=" -p";
|
||||||
|
$emerge_defaults_args.=" -p"
|
||||||
|
}
|
||||||
|
|
||||||
system("emerge --info")
|
system("emerge --info")
|
||||||
; #always give detailed information about the building environment, helpful to debug
|
; #always give detailed information about the building environment, helpful to debug
|
||||||
|
|
||||||
my $rt;
|
my $rt;
|
||||||
|
|
||||||
if ( $emerge_remove and $emerge_remove ne "" ) {
|
if ( $emerge_remove and $emerge_remove ne "" and !$pretend) {
|
||||||
|
say "Removing with emerge: $emerge_remove";
|
||||||
system("emerge -C $_") for split( / /, $emerge_remove );
|
system("emerge -C $_") for split( / /, $emerge_remove );
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -570,7 +579,7 @@ my $return = $rt >> 8;
|
|||||||
# best effort -B
|
# best effort -B
|
||||||
compile_packs( "injected_targets", @injected_packages );
|
compile_packs( "injected_targets", @injected_packages );
|
||||||
|
|
||||||
if ($preserved_rebuild) {
|
if ($preserved_rebuild and !$pretend) {
|
||||||
|
|
||||||
system("emerge -j $jobs --buildpkg \@preserved-rebuild");
|
system("emerge -j $jobs --buildpkg \@preserved-rebuild");
|
||||||
system("revdep-rebuild");
|
system("revdep-rebuild");
|
||||||
|
|||||||
@@ -56,6 +56,7 @@ docker_volumes=( -v "$OUTPUT_DIR:/usr/portage/packages" )
|
|||||||
[ -z "$REMOTE_CONF_PORTDIR" ] || docker_env+=(-e "REMOTE_CONF_PORTDIR=$REMOTE_CONF_PORTDIR")
|
[ -z "$REMOTE_CONF_PORTDIR" ] || docker_env+=(-e "REMOTE_CONF_PORTDIR=$REMOTE_CONF_PORTDIR")
|
||||||
[ -z "$REMOTE_PORTDIR" ] || docker_env+=(-e "REMOTE_PORTDIR=$REMOTE_PORTDIR")
|
[ -z "$REMOTE_PORTDIR" ] || docker_env+=(-e "REMOTE_PORTDIR=$REMOTE_PORTDIR")
|
||||||
[ -z "$ETP_NOCACHE" ] || docker_env+=(-e "ETP_NOCACHE=$ETP_NOCACHE")
|
[ -z "$ETP_NOCACHE" ] || docker_env+=(-e "ETP_NOCACHE=$ETP_NOCACHE")
|
||||||
|
[ -z "$PRETEND" ] || docker_env+=(-e "PRETEND=$PRETEND")
|
||||||
[ -d "$LOCAL_OVERLAY" ] && docker_volumes+=(-v "$LOCAL_OVERLAY:/usr/local/local_portage")
|
[ -d "$LOCAL_OVERLAY" ] && docker_volumes+=(-v "$LOCAL_OVERLAY:/usr/local/local_portage")
|
||||||
|
|
||||||
if [ -e $MAKE_CONF ]; then
|
if [ -e $MAKE_CONF ]; then
|
||||||
|
|||||||
Reference in New Issue
Block a user