Extract common func to setup perms, fix git3 perms

- Also print a short summary of compilation result
- Add KEEP_GOING env variable,
  if disabled a failure in split install makes the build fail

AUTHORS

@@ -0,0 +1,6 @@
+
+Copyright authors:
+------
+Ettore Di Giacinto <mudler@gentoo.org> ( original author )
+Ben Roberts <optiz0r@sabayon.org>
+Daniele Rondina <geaaru@sabayon.org>

builder

@@ -1,23 +1,38 @@
 #!/usr/bin/env perl
 
+# Copyright 2016-2018 See AUTHORS file
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
 use Getopt::Long;
 use v5.10;
 no feature "say";
 use Storable 'dclone';
 
-my $profile           = $ENV{BUILDER_PROFILE}   // 16;
-my $jobs              = $ENV{BUILDER_JOBS}      // 1;
-my $use_equo          = $ENV{USE_EQUO}          // 1;
-my $preserved_rebuild = $ENV{PRESERVED_REBUILD} // 0;
+my $profile              = $ENV{BUILDER_PROFILE} // 16;
+my $jobs                 = $ENV{BUILDER_JOBS} // 1;
+my $use_equo             = $ENV{USE_EQUO} // 1;
+my $preserved_rebuild    = $ENV{PRESERVED_REBUILD} // 0;
 my $emerge_defaults_args = $ENV{EMERGE_DEFAULTS_ARGS}
-    // "--accept-properties=-interactive --verbose --oneshot --complete-graph --buildpkg";
+    // "--accept-properties=-interactive --quiet --oneshot --complete-graph --buildpkg";
 $ENV{FEATURES} = $ENV{FEATURES}
     // "parallel-fetch protect-owned compressdebug splitdebug -userpriv";
 
-my $equo_install_atoms   = $ENV{EQUO_INSTALL_ATOMS}   // 1;
+my $equo_install_atoms   = $ENV{EQUO_INSTALL_ATOMS} // 1;
 my $equo_install_version = $ENV{EQUO_INSTALL_VERSION} // 0;
-my $equo_split_install   = $ENV{EQUO_SPLIT_INSTALL}   // 0;
-my $equo_mirrorsort      = $ENV{EQUO_MIRRORSORT}      // 1;
+my $equo_split_install   = $ENV{EQUO_SPLIT_INSTALL} // 0;
+my $equo_mirrorsort      = $ENV{EQUO_MIRRORSORT} // 1;
 my $entropy_repository   = $ENV{ENTROPY_REPOSITORY}
     // "main";    # Can be weekly, main, testing
 my $artifacts_folder          = $ENV{ARTIFACTS_DIR};
@@ -45,6 +60,7 @@ my $pretend                   = $ENV{PRETEND} // 0;
 my $obsoleted                 = $ENV{DETECT_OBSOLETE} // 0;
 my $target_overlay            = $ENV{TARGET_OVERLAY};
 my $verbose                   = $ENV{BUILDER_VERBOSE} // 0;
+my $keep_going                = $ENV{KEEP_GOING} // 1;
 
 my $make_conf = $ENV{MAKE_CONF};
 
@@ -66,6 +82,16 @@ $ENV{ACCEPT_LICENSE} = "*";    # we can use wildcard since entropy 302
 # A barely print replacement
 sub say { print join( "\n", @_ ) . "\n"; }
 
+sub loud {
+    say;
+    say "===" x 4;
+    say "===" x 4;
+    say @_;
+    say "===" x 4;
+    say "===" x 4;
+    say;
+}
+
 sub safe_call {
     my $cmd    = shift;
     my $rt     = _system($cmd);
@@ -102,6 +128,11 @@ sub parse_overlays {
     map { $_ =~ s/.*?\:\://g; $_ } grep {/\:\:/} @{ dclone( \@_ ) };
 }
 
+sub hook_script {
+    my $s = shift;
+    _system("chmod +x ${s};${s}") if -e $s;
+}
+
 sub add_portage_repository {
     my $repo = $_[0];
     my $reponame;
@@ -236,6 +267,12 @@ sub calculate_missing {
     return @to_install;
 }
 
+sub portage_perms {
+    my $dir = shift;
+    _system("chown -R portage:portage $dir");
+    _system("chmod -R ug+w,a+rX $dir");
+}
+
 # Input : complete gentoo package (sys-fs/foobarfs-1.9.2)
 # Output: atom form (sys-fs/foobarfs)
 sub atom { s/-[0-9]{1,}.*$//; }
@@ -271,9 +308,9 @@ sub detect_useflags {
 sub compile_packs {
     my ( $target, @packages ) = @_;
     my $extra_arg;
+    my $compiled = {};
     $extra_arg = "-B" if $target eq "injected_targets";
     my $package_counter = 0;
-    my $return;
     for my $pack (@packages) {
         my $tmp_rt;
         say "\n" x 2, "==== Compiling $pack ====", "\n" x 2;
@@ -300,12 +337,9 @@ sub compile_packs {
                 "emerge $emerge_defaults_args -j $jobs $extra_arg '$pack'");
         }
         $package_counter++;
-
-        $return = $tmp_rt
-            if ( $? == -1 or $? & 127 or !$rt )
-            ;    # if one fails, the build should be considered failed!
+        $compiled->{$pack} = $tmp_rt;
     }
-    return $return;
+    return $compiled;
 }
 
 sub help {
@@ -339,11 +373,11 @@ if ( @overlays > 0 ) {
     }
 }
 
-say "[*] Installing:";
+say "[*] Compiling:";
 
 say "\t* " . $_ for @ARGV;
 
-say "[*] Syncing configurations files, Layman and Portage";
+loud "Setup phase start";
 
 if ($pretend) {
     say "[*] PRETEND enabled, no real action will be performed.";
@@ -360,8 +394,7 @@ system("echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen");    #be sure about that.
 if ( $remote_conf_portdir ne "" ) {
     _system("rm -rf /etc/portage");
     _system("git clone $remote_conf_portdir /etc/portage");
-    _system("chown -R portage:portage /etc/portage");
-    _system("chmod -R ug+w,a+rX /etc/portage");
+    portage_perms('/etc/portage');
 }
 else {
     _system("cd /etc/portage/;git checkout master; git stash; git pull");
@@ -371,9 +404,8 @@ else {
 if ( $remote_portdir ne "" ) {
     _system("rm -rf /usr/portage");
     _system("git clone $remote_portdir /usr/portage");
-    _system("chown -R portage:portage /usr/portage");
-    _system("chmod -R ug+w,a+rX /usr/portage");
 }
+
 _system("mkdir /var/lib/layman") if ( !-d "/var/lib/layman" );
 _system("touch /var/lib/layman/make.conf && layman-updater -R")
     if ( !-e "/var/lib/layman/make.conf" );
@@ -400,8 +432,7 @@ else {
     chomp(@FILE);
     $reponame = $FILE[0];
 }
-_system("chown -R portage:portage /usr/local/portage");
-_system("chmod -R 755 /usr/local/portage");
+portage_perms('/usr/local/portage');
 
 qx{
 echo '[$reponame]
@@ -427,6 +458,7 @@ if ( $remove_remote_overlay and $remove_remote_overlay ne "" ) {
 }
 
 _system("mkdir -p /usr/portage/distfiles/git3-src");
+portage_perms('/usr/portage');
 
 unless ( $skip_portage_sync == 1 ) {
 
@@ -436,7 +468,7 @@ unless ( $skip_portage_sync == 1 ) {
         _system("emerge-webrsync");
     }
     else {
-        _system("emerge --sync");
+        _system("emerge --sync --quiet");
     }
 }
 
@@ -459,34 +491,74 @@ if ($use_equo) {
 
     say "Devkit version:";
     _system("equo s -vq app-misc/sabayon-devkit");
+
+    _system("equo repo mirrorsort sabayonlinux.org") if $equo_mirrorsort;
+
+    # Try to use last enman version
+    _system("equo up && equo i enman --relaxed");
+
     _system("enman list --installed -q");
     my $enman_list_output = qx|enman list --installed -q|;
     chomp($enman_list_output);
-    my @installed_enman_repos = split( /\n/, $enman_list_output );
+    my @installed_enman_repos;
+
+    if ( $enman_list_output eq "No repositories were installed with enman" ) {
+        @installed_enman_repos = ();
+    }
+    else {
+        @installed_enman_repos = split( / /, $enman_list_output );
+    }
 
     if ( $enman_repositories and $enman_repositories ne "" ) {
-        my @enman_toadd = split( / /, $enman_repositories );
+        say "==================================";
+        my @enman_toadd;
+        if ( index( $enman_repositories, "\n" ) != -1 ) {
+            @enman_toadd = split( /\n/, $enman_repositories );
+        }
+        else {
+            @enman_toadd = split( / /, $enman_repositories );
+        }
+
         for my $enman_add (@enman_toadd) {
+            say "Check enman " . $enman_add;
             if ( !grep ( $enman_add, @installed_enman_repos ) ) {
-                safe_call("enman add $_");
+                say "Try to install " . $enman_add;
+                _system("enman add $enman_add");
+            }
+            else {
+                say "Already present: " . $enman_add;
             }
         }
+        say "==================================";
     }
 
     if ( $remove_enman_repositories and $remove_enman_repositories ne "" ) {
-        my @enman_toremove = split( / /, $remove_enman_repositories );
+        say "==================================";
+        my @enman_toremove;
+        if ( index( $remove_enman_repositories, "\n" ) != -1 ) {
+            @enman_toremove = split( /\n/, $remove_enman_repositories );
+        }
+        else {
+            @enman_toremove = split( / /, $remove_enman_repositories );
+        }
+
         for my $enman_remove (@enman_toremove) {
             if ( grep ( $enman_remove, @installed_enman_repos ) ) {
-                safe_call("enman remove $_");
+                say "Try to remove enamn repository " . $enman_remove;
+                _system("enman remove $enman_remove");
+            }
+            else {
+                say "Enman repository $enman_remove is not present.";
             }
         }
+        say "==================================";
     }
 
     _system("enman add $repository_name")
         if ($enman_add_self
         and $repository_name
         and $repository_name ne "" );
-    _system("equo repo mirrorsort sabayonlinux.org") if $equo_mirrorsort;
+
     _system("equo up && equo u");
 }
 
@@ -552,7 +624,7 @@ if ($use_equo) {
     say "", "[install] Those dependencies will be installed with equo :",
         @packages_deps, "";
     if ($equo_split_install) {
-        safe_call("equo i $equo_install_args --bdeps '$_'")
+        _system("equo i $equo_install_args --bdeps '$_'")
             for ( @packages_deps, @equo_install )
             ; ## bail out here, if installs fails. emerge will compile a LOT of stuff
         if ( @equo_remove > 0 and !$pretend ) {
@@ -563,42 +635,68 @@ if ($use_equo) {
     else {
         my @p = map {"'$_'"} ( @packages_deps, @equo_install );
         my @r = map {"'$_'"} @equo_remove;
-        safe_call("equo i $equo_install_args --bdeps @p")
+        _system("equo i $equo_install_args --bdeps @p")
             if ( @p > 0 )
             ; ## bail out here, if installs fails. emerge will compile a LOT of stuff
         _system("equo rm --nodeps @r") if ( @r > 0 );
     }
 }
 
-say "*** Ready to compile, finger crossed ***";
+loud "Pre-compilation phase start";
 
 _system("emerge --info")
     ; #always give detailed information about the building environment, helpful to debug
 
-my $rt;
-
 if ( $emerge_remove and $emerge_remove ne "" ) {
     say "Removing with emerge: $emerge_remove";
     _system("emerge -C '$_'") for split( / /, $emerge_remove );
 }
 
-_system("chmod +x /pre-script;./pre-script") if -e "/pre-script";
+hook_script("./pre-script");
+hook_script("/pre-script");
 
+loud "Compilation phase start";
+
+my $return = 0;
 if ($emerge_split_install) {
-    compile_packs( "targets", @packages );
-    $rt = 0;    #consider the build good anyway, like a "keep-going"
+    my $res = compile_packs( "targets", @packages );
+    loud "Compilation summary";
+    foreach my $k ( keys %{$res} ) {
+        my $c = $res->{$k} >> 8;
+        if ( $c != 0 ) {
+            say "$k : build failed ( Exit: $c )";
+            $return = 1 unless $keep_going;
+        }
+        else {
+            say "$k : build succeeded";
+        }
+    }
 }
 else {
     my @p = map {"'$_'"} @packages;
-    $rt = _system("emerge $emerge_defaults_args -j $jobs @p");
+    my $rt = _system("emerge $emerge_defaults_args -j $jobs @p");
+    $return = $rt >> 8;
 }
 
-my $return = $rt >> 8;
+if ( @injected_packages > 0 ) {
+    my $res = compile_packs( "injected_targets", @injected_packages );
+    loud "Compilation summary for injected_targets";
+    foreach my $k ( keys %{$res} ) {
+        my $c = $res->{$k} >> 8;
+        if ( $c != 0 ) {
+            say "$k : build failed ( Exit: $c )";
+            $return = 1 unless $keep_going;
+        }
+        else {
+            say "$k : build succeeded";
+        }
+    }
+}
 
-# best effort -B
-compile_packs( "injected_targets", @injected_packages );
+loud "Compilation phase end (Exit: $return)";
 
-_system("chmod +x /post-script;./post-script") if -e "/post-script";
+hook_script("./post-script");
+hook_script("/post-script");
 
 if ( $preserved_rebuild and !$pretend ) {
 
@@ -608,7 +706,7 @@ if ( $preserved_rebuild and !$pretend ) {
 }
 
 if ( $qualityassurance_checks == 1 ) {
-    say "*** Quality assurance ***";
+    loud "Quality assurance checks";
     foreach my $pn ( map { abs_atom; $_ } ( @packages, @injected_packages ) )
     {
         say ">> Running repoman on $pn";
@@ -623,7 +721,7 @@ if ( $qualityassurance_checks == 1 ) {
 }
 
 if ( $obsoleted and $target_overlay ) {
-    say "*** Detecting obsoletes ***";
+    loud "Obsoletes detection";
     _system("sabayon-detectobsolete --overlay ${target_overlay}");
 }
 

sabayon-brokenlibs

@@ -1,4 +1,18 @@
 #!/bin/bash
+# Copyright 2016-2018 See AUTHORS file
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 PACKAGES=()
 bin=$1

sabayon-buildpackages

@@ -1,4 +1,20 @@
 #!/bin/bash
+
+# Copyright 2016-2018 See AUTHORS file
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
 set -e
 SAB_WORKSPACE="${SAB_WORKSPACE:-$PWD}"
 DOCKER_IMAGE="${DOCKER_IMAGE:-sabayon/builder-amd64}"

sabayon-bz2brokenlibs

@@ -1,5 +1,20 @@
 #!/bin/bash
 
+# Copyright 2016-2018 See AUTHORS file
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
 . /sbin/sabayondevkit-functions.sh
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

sabayon-commit

@@ -1,5 +1,20 @@
 #!/usr/bin/perl
 
+# Copyright 2016-2018 See AUTHORS file
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
 use feature 'say';
 use Cwd;
 use File::Temp;

sabayon-createrepo

@@ -1,4 +1,20 @@
 #!/bin/bash
+
+# Copyright 2016-2018 See AUTHORS file
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
 set -e
 . /sbin/sabayondevkit-functions.sh
 
@@ -68,8 +84,8 @@ fi
 eit key import \$repo /etc/entropy/mykeys/private.key /etc/entropy/mykeys/key.pub && { eit key sign \$repo || true; } && { echo "=== Repository key imported successfully ==="; }
 
 echo "=== Injecting packages ==="
-echo "Yes" | eit inject \${built_pkgs} || { echo "ouch unable to inject" && exit 3; }
-echo "Yes Yes Yes" | eit commit --quick
+eit inject --quick \${built_pkgs} || { echo "ouch unable to inject" && exit 3; }
+eit commit --quick
 
 echo "=== Pushing built packages locally ==="
 eit push --quick --force

sabayon-createrepo-cleanup

@@ -1,4 +1,20 @@
 #!/bin/bash
+
+# Copyright 2016-2018 See AUTHORS file
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
 set -e
 . /sbin/sabayondevkit-functions.sh
 

sabayon-createrepo-remove

@@ -1,4 +1,20 @@
 #!/bin/bash
+
+# Copyright 2016-2018 See AUTHORS file
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
 set -e
 . /sbin/sabayondevkit-functions.sh
 

sabayon-maint-helper

@@ -1,4 +1,20 @@
 #!/bin/bash
+
+# Copyright 2016-2018 See AUTHORS file
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
 set -e
 . /sbin/sabayondevkit-functions.sh
 

sabayondevkit-functions.sh

@@ -2,6 +2,8 @@
 
 set -e
 
+export BUILD_DIR="${BUILD_DIR:-/opt/sabayon-build/}"
+
 check_docker_requirements(){
   if [ "$(id -u)" != "0" ]; then
     groups | grep -q docker || echo "--> If you are not running the script as root, your user should be in the docker group to use it. (sudo gpasswd -a $USER docker)"
@@ -15,7 +17,7 @@ build_sync() {
   layman -S
   emerge --sync
   eix-update
-  pushd /opt/sabayon-build/
+  pushd "${BUILD_DIR}"
     git stash
     git fetch --all || true
     git checkout master || true