Compare commits

..

4 Commits

Author SHA1 Message Date
mudler dd53f6a35e keep our internal say() version 2016-03-23 16:01:41 +01:00
mudler 0e41fbd168 dumb fix 2016-03-23 15:55:11 +01:00
mudler ce0272bd29 enable emerge --info informations to be displayed *always* on build, it will not be parametrized on purpose 2016-03-23 15:54:24 +01:00
mudler 4eee9a7fbc [builder] adjust output 2016-03-23 15:48:49 +01:00
+9 -9
View File
@@ -2,6 +2,7 @@
use Getopt::Long;
use v5.10;
no feature "say";
my $profile = $ENV{BUILDER_PROFILE} // 3;
my $jobs = $ENV{BUILDER_JOBS} // 1;
@@ -90,7 +91,6 @@ sub calculate_missing {
my @Available_Packages = @{+shift};
# Getting the package dependencies and the installed packages
say "[$package] Getting the package dependencies and the installed packages";
my @dependencies = package_deps( $package, $depth, 1 );
my %install_dependencies = map { $_ => 1 } @dependencies;
@@ -135,11 +135,12 @@ sub help {
"\t$0 app-foo/foobar --equo foo-misc/foobar --equo net-foo/foobar --layman foo --layman bar foo",
"**************************", "",
"You can supply multiple overlays as well: $0 plasma-meta --layman kde plab",
"The documentation is available at https://github.com/Sabayon/devkit",
"";
}
say
"************* IF YOU WANT TO SUPPLY ADDITIONAL ARGS TO EMERGE, pass to docker EMERGE_DEFAULT_OPTS env with your options *************";
"****************************************************";
if ( @overlays > 0 ) {
say "Overlay(s) to add";
@@ -148,11 +149,11 @@ if ( @overlays > 0 ) {
}
}
say "Installing:";
say "[*] Installing:";
say "\t* " . $_ for @ARGV;
say "* Syncing stuff for you, if it's the first time, can take a while";
say "[*] Syncing configurations files, Layman and Portage";
# Syncronizing portage configuration and adding overlays
system("echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen"); #be sure about that.
@@ -241,10 +242,9 @@ if ($use_equo) {
if $equo_install_atoms;
push( @packages_deps, package_deps( $p, $dep_scan_depth, 0 ) )
if $equo_install_version;
say "[$p] Done"
}
@packages_deps = grep { defined() and length() } @packages_deps; #cleaning
say "", "[install] Installing missing dependencies with equo", @packages_deps, "";
say "", "[install] Those dependencies will be installed with equo :", @packages_deps, "";
if ($equo_split_install) {
system("equo i --bdeps $_") for (@packages_deps,@equo_install);
if (@equo_remove > 0){
@@ -257,7 +257,9 @@ if ($use_equo) {
}
}
say "* Ready to compile, finger crossed";
say "*** Ready to compile, finger crossed ***";
system("emerge --info"); #always give detailed information about the building environment, helpful to debug
my $rt;
@@ -271,8 +273,6 @@ else {
$rt = system("emerge $emerge_defaults_args -j $jobs @packages");
}
my $rt = system("emerge $emerge_defaults_args -j $jobs @packages");
my $return = $rt >> 8;
if ($preserved_rebuild) {