[sabayon-createrepo] don't import keys if already exists

Allow virtual dependency pruning to be controlled by env var

builder

@@ -1,6 +1,8 @@
 #!/usr/bin/env perl
 
 use Getopt::Long;
+use v5.10;
+no feature "say";
 
 my $profile           = $ENV{BUILDER_PROFILE}   // 3;
 my $jobs              = $ENV{BUILDER_JOBS}      // 1;
@@ -15,17 +17,27 @@ 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 $entropy_repository   = $ENV{ENTROPY_REPOSITORY}   // "main"; # Can be weekly, main, testing
+my $entropy_repository   = $ENV{ENTROPY_REPOSITORY}
+  // "main";    # Can be weekly, main, testing
 my $artifacts_folder     = $ENV{ARTIFACTS_DIR};
-my $dep_scan_depth = $ENV{DEPENDENCY_SCAN_DEPTH} // 2;
-my $skip_portage_sync = $ENV{SKIP_PORTAGE_SYNC} // 0;
-my $webrsync = $ENV{WEBRSYNC} // 0;
+my $dep_scan_depth       = $ENV{DEPENDENCY_SCAN_DEPTH} // 2;
+my $skip_portage_sync    = $ENV{SKIP_PORTAGE_SYNC} // 0;
+my $emerge_split_install = $ENV{EMERGE_SPLIT_INSTALL} // 0;
+my $webrsync             = $ENV{WEBRSYNC} // 0;
+my $enman_repositories   = $ENV{ENMAN_REPOSITORIES};
+my $prune_virtuals       = $ENV{PRUNE_VIRTUALS} // 0;
+my $repository_name      = $ENV{REPOSITORY_NAME};
+my $enman_add_self       = $ENV{ENMAN_ADD_SELF} // 1;
 
 my $make_conf = $ENV{MAKE_CONF};
 
 my @overlays;
 
-GetOptions( 'layman|overlay:s{,}' => \@overlays, 'equo|install:s{,}' => \@equo_install,'equorm|remove:s{,}' => \@equo_remove );
+GetOptions(
+    'layman|overlay:s{,}' => \@overlays,
+    'equo|install:s{,}'   => \@equo_install,
+    'equorm|remove:s{,}'  => \@equo_remove
+);
 
 if ( @ARGV == 0 ) {
     help();
@@ -37,14 +49,43 @@ $ENV{LC_ALL} = "en_US.UTF-8";    #here be dragons
 # A barely print replacement
 sub say { print join( "\n", @_ ) . "\n"; }
 
+sub safe_call {
+    my $cmd    = shift;
+    my $rt     = system($cmd);
+    my $return = $rt >> 8;
+    exit($return) if ($rt);
+}
+
 # Input: package, depth, and atom. Package: sys-fs/foobarfs, Depth: 1 (depth of the package tree) , Atom: 1/0 (enable disable atom output)
 sub package_deps {
     my $package = shift;
-    my $depth   = shift // 1;  # defaults to 1 level of depthness of the tree
+    my $depth   = shift // 1;    # defaults to 1 level of depthness of the tree
     my $atom    = shift // 0;
-    return
-      map { $_ =~ s/\[.*\]|\s//g; &atom($_) if $atom; $_ }
-      qx/equery -C -q g --depth=$depth $package/;    #depth=0 it's all
+
+# Since we expect this sub to be called multiple times with the same arguments, cache the results
+    state %cache;
+    $cache_key = "${package}:${depth}:${atom}";
+
+    if ( !exists $cache{$cache_key} ) {
+        @dependencies =
+          qx/equery -C -q g --depth=$depth $package/;    #depth=0 it's all
+        chomp @dependencies;
+
+# If an unversioned atom is given, equery returns results for all versions in the portage tree
+# leading to duplicates. The sanest thing to do is dedup the list. This gives the superset of all
+# possible dependencies, which isn't perfectly accurate but should be good enough. For completely
+# accurate results, pass in a versioned atom.
+        @dependencies = uniq(
+            sort
+              grep { $_ }
+              map { $_ =~ s/\[.*\]|\s//g; &atom($_) if $atom; $_ }
+              @dependencies
+        );
+
+        $cache{$cache_key} = \@dependencies;
+    }
+
+    return @{ $cache{$cache_key} };
 }
 
 #Input: nothing
@@ -61,28 +102,31 @@ sub available_packages {
 # Input: package (sys-fs/foobarfs)
 # Output: Array of packages to be installed, that aren't installed in a Sabayon machine
 sub calculate_missing {
-    my $package = shift;
-    my $depth = shift;
-
-    my @Installed_Packages = @{+shift};
-    my @Available_Packages = @{+shift};
+    my $package            = shift;
+    my $depth              = shift;
+    my @Installed_Packages = @{ +shift };
+    my @Available_Packages = @{ +shift };
+    my $prune_virtuals     = 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 );
 
-    # XXX: Endless loop as for now.
-    # my %install_dependencies = map { $_ => 1 } @dependencies;
-    # # Look for any virtuals and remove its immediate dependencies to avoid
-    # # installing multiple conflicting packages one by one
-    # my @virtual_deps;
-    # for my $dep (@dependencies) {
-    #     push(@virtual_deps, package_deps( $dep, 1, 1 )) if ( $dep =~ /^virtual\// );
-    # }
-    # for my $dep (@virtual_deps) {
-    #     $install_dependencies{$dep} = 0 if ( $dep !~ /^virtual\// );
-    # }
-    # @dependencies = grep { $install_dependencies{$_} } @dependencies;
+    if ($prune_virtuals) {
+        say "[$package] Pruning dependencies of virtual packages";
+        my %install_dependencies = map { $_ => 1 } @dependencies;
+
+        # Look for any virtuals and remove its immediate dependencies to avoid
+        # installing multiple conflicting packages one by one
+        my @virtual_deps;
+        for my $dep (@dependencies) {
+            push( @virtual_deps, package_deps( $dep, 1, 1 ) )
+              if ( $dep =~ /^virtual\// );
+        }
+        for my $dep (@virtual_deps) {
+            $install_dependencies{$dep} = 0 if ( $dep !~ /^virtual\// );
+        }
+        @dependencies = grep { $install_dependencies{$_} } @dependencies;
+    }
 
     #taking only the 4th column of output as key of the hashmap
     my %installed_packs =
@@ -92,8 +136,9 @@ sub calculate_missing {
 # removing from packages the one that are already installed and keeping only the available in the entropy repositories
     my @to_install = grep( defined $available_packs{$_},
         uniq( grep( !defined $installed_packs{$_}, @dependencies ) ) );
-    @to_install=grep { length } @to_install;
-  #  say "[$package] packages that will be installed with equo: @to_install" if @to_install>0;
+    @to_install = grep { length } @to_install;
+    say "[$package] packages that will be installed with equo: @to_install"
+      if @to_install > 0;
 
     return @to_install;
 }
@@ -111,14 +156,14 @@ sub uniq {
 sub help {
     say "-> You should feed me with something", "", "Examples:", "",
       "\t$0 app-text/tree", "\t$0 plasma-meta --layman kde", "",
-      "\t$0 app-foo/foobar --equo foo-misc/foobar --equo net-foo/foobar --layman foo --layman bar foo",
+"\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 *************";
+say "****************************************************";
 
 if ( @overlays > 0 ) {
     say "Overlay(s) to add";
@@ -127,22 +172,19 @@ 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.
-system(
-"cd /etc/portage/;git checkout master; git stash; git pull"
-);
+system("cd /etc/portage/;git checkout master; git stash; git pull");
 
-if (`uname -m` eq "x86_64\n"){
-  system(
-  "cd /etc/portage/;rm -rfv make.conf;ln -s make.conf.amd64 make.conf"
-  );
+if ( `uname -m` eq "x86_64\n" ) {
+    system(
+        "cd /etc/portage/;rm -rfv make.conf;ln -s make.conf.amd64 make.conf");
 }
 
 system("echo 'y' | layman -f -a $_") for @overlays;
@@ -174,14 +216,16 @@ auto-sync = no' > /etc/portage/repos.conf/local.conf
 
 system("mkdir -p /usr/portage/distfiles/git3-src");
 
-unless($skip_portage_sync == 1){
-  # sync portage and overlays
-  system("layman -S");
-  if($webrsync == 1){
-   system("emerge-webrsync");
-  } else {
-   system("emerge --sync");
-  }
+unless ( $skip_portage_sync == 1 ) {
+
+    # sync portage and overlays
+    system("layman -S");
+    if ( $webrsync == 1 ) {
+        system("emerge-webrsync");
+    }
+    else {
+        system("emerge --sync");
+    }
 }
 
 # preparing for MOAR automation
@@ -189,18 +233,26 @@ qx|eselect profile set $profile|;
 qx{ls /usr/portage/licenses -1 | xargs -0 > /etc/entropy/packages/license.accept}
   ;    #HAHA
 
-if ($use_equo  && $entropy_repository eq "weekly" ) {
-  qx|equo repo disable sabayonlinux.org|;
-  qx|equo repo enable sabayon-weekly|;
-} elsif( $use_equo  &&  $entropy_repository eq "testing") {
-  qx|equo repo disable sabayon-weekly|;
-  qx|equo repo enable sabayonlinux.org|;
-  qx|equo repo enable sabayon-limbo|;
+if ( $use_equo && $entropy_repository eq "weekly" ) {
+    qx|equo repo disable sabayonlinux.org|;
+    qx|equo repo enable sabayon-weekly|;
+}
+elsif ( $use_equo && $entropy_repository eq "testing" ) {
+    qx|equo repo disable sabayon-weekly|;
+    qx|equo repo enable sabayonlinux.org|;
+    qx|equo repo enable sabayon-limbo|;
 }
 
 if ($use_equo) {
-  system("equo repo mirrorsort sabayonlinux.org") if $equo_mirrorsort;
-  system("equo up && equo u")
+    if ( $enman_repositories and $enman_repositories ne "" ) {
+        my @enman_toadd = split( / /, $enman_repositories );
+        safe_call("enman add $_") for @enman_toadd;
+    }
+
+    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");
 }
 
 system("cp -rf $make_conf /etc/portage/make.conf") if $make_conf;
@@ -214,37 +266,74 @@ if ($use_equo) {
     my @Installed_Packages = qx/equo q list installed --quiet/;
     my @Available_Packages = available_packages();
     chomp(@Installed_Packages);
+
+    my %installed_packs =
+      map { $_ => 1 } @Installed_Packages;
+
+# Remove any already installed packages from the list of entropy packages to install in the build spec
+    @equo_install = grep { !exists $installed_packs{$_} } @equo_install;
+
     foreach my $p (@packages) {
-      say "[$p] Getting the package dependencies which aren't already installed on the system.. ";
-        push( @packages_deps, calculate_missing( $p , $dep_scan_depth,\@Installed_Packages,\@Available_Packages) )
-          if $equo_install_atoms;
+        say
+"[$p] Getting the package dependencies which aren't already installed on the system.. ";
+        push(
+            @packages_deps,
+            calculate_missing(
+                $p,                   $dep_scan_depth,
+                \@Installed_Packages, \@Available_Packages,
+                $prune_virtuals
+            )
+        ) 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){
-          system("equo rm --nodeps $_") for (@equo_remove);
+        safe_call("equo i --bdeps $_")
+          for ( @packages_deps, @equo_install )
+          ; ## bail out here, if installs fails. emerge will compile a LOT of stuff
+        if ( @equo_remove > 0 ) {
+            system("equo rm --nodeps $_") for (@equo_remove);
         }
     }
     else {
-        system("equo i --bdeps @packages_deps @equo_install") if ( @packages_deps > 0 or @equo_install > 0);
-        system("equo rm --nodeps @equo_remove") if (@equo_remove > 0);
+        safe_call("equo i --bdeps @packages_deps @equo_install")
+          if ( @packages_deps > 0 or @equo_install > 0 )
+          ; ## bail out here, if installs fails. emerge will compile a LOT of stuff
+        system("equo rm --nodeps @equo_remove") if ( @equo_remove > 0 );
     }
 }
 
-say "* Ready to compile, finger crossed";
+say "*** Ready to compile, finger crossed ***";
 
-my $rt = system("emerge $emerge_defaults_args -j $jobs @packages");
+system("emerge --info")
+  ; #always give detailed information about the building environment, helpful to debug
+
+say "Devkit version:";
+system("equo s -vq app-misc/sabayon-devkit");
+
+my $rt;
+
+if ($emerge_split_install) {
+    for my $pack (@packages) {
+        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 = 0;    #consider the build good anyway, like a "keep-going"
+}
+else {
+    $rt = system("emerge $emerge_defaults_args -j $jobs @packages");
+}
 
 my $return = $rt >> 8;
 
 if ($preserved_rebuild) {
 
     system("emerge -j $jobs --buildpkg \@preserved-rebuild");
+    system("revdep-rebuild");
 
 }
 

sabayon-buildpackages

@@ -24,20 +24,28 @@ docker_volumes=( -v "$OUTPUT_DIR:/usr/portage/packages" )
 
 [ -z "$PORTAGE_CACHE" ] || docker_volumes+=(-v "$PORTAGE_CACHE:/usr/portage")
 [ -z "$BUILDER_PROFILE" ] || docker_env+=(-e "BUILDER_PROFILE=$BUILDER_PROFILE")
+[ -z "$EMERGE_SPLIT_INSTALL" ] || docker_env+=(-e "EMERGE_SPLIT_INSTALL=$EMERGE_SPLIT_INSTALL")
 [ -z "$BUILDER_JOBS" ] || docker_env+=(-e "BUILDER_JOBS=$BUILDER_JOBS")
 [ -z "$USE_EQUO" ] || docker_env+=(-e "USE_EQUO=$USE_EQUO")
 [ -z "$PRESERVED_REBUILD" ] || docker_env+=(-e "PRESERVED_REBUILD=$PRESERVED_REBUILD")
 [ -z "$EQUO_INSTALL_ATOMS" ] || docker_env+=(-e "EQUO_INSTALL_ATOMS=$EQUO_INSTALL_ATOMS")
 [ -z "$DEPENDENCY_SCAN_DEPTH" ] || docker_env+=(-e "DEPENDENCY_SCAN_DEPTH=$DEPENDENCY_SCAN_DEPTH")
+[ -z "$FEATURES" ] || docker_env+=(-e "FEATURES=$FEATURES")
 [ -z "$EMERGE_DEFAULTS_ARGS" ] || docker_env+=(-e "EMERGE_DEFAULTS_ARGS=$EMERGE_DEFAULTS_ARGS")
 [ -z "$EQUO_INSTALL_VERSION" ] || docker_env+=(-e "EQUO_INSTALL_VERSION=$EQUO_INSTALL_VERSION")
 [ -z "$EQUO_SPLIT_INSTALL" ] || docker_env+=(-e "EQUO_SPLIT_INSTALL=$EQUO_SPLIT_INSTALL")
 [ -z "$ARTIFACTS_DIR" ] || docker_env+=(-e "ARTIFACTS_DIR=$ARTIFACTS_DIR")
 [ -z "$ENTROPY_REPOSITORY" ] || docker_env+=(-e "ENTROPY_REPOSITORY=$ENTROPY_REPOSITORY")
 [ -z "$SKIP_PORTAGE_SYNC" ] || docker_env+=(-e "SKIP_PORTAGE_SYNC=$SKIP_PORTAGE_SYNC")
+[ -z "$EQUO_MIRRORSORT" ] || docker_env+=(-e "EQUO_MIRRORSORT=$EQUO_MIRRORSORT")
 [ -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 "$ENTROPY_DOWNLOADED_PACKAGES" ] || docker_volumes+=(-v "$ENTROPY_DOWNLOADED_PACKAGES:/var/lib/entropy/client/packages")
+[ -z "$DISTCC_HOSTS" ] || docker_env+=(-e "DISTCC_HOSTS=$DISTCC_HOSTS")
+[ -z "${PRUNE_VIRTUALS}" ] || docker_env+=(-e "PRUNE_VIRTUALS=$PRUNE_VIRTUALS")
+[ -z "$REPOSITORY_NAME" ] || docker_env+=(-e "REPOSITORY_NAME=$REPOSITORY_NAME")
+[ -z "$ENMAN_ADD_SELF" ] || docker_env+=(-e "ENMAN_ADD_SELF=$ENMAN_ADD_SELF")
 
 if [ -n "$REMOTE_OVERLAY" ]; then
   git clone "$REMOTE_OVERLAY" "$TEMPDIR"
@@ -74,6 +82,6 @@ fi
 
 echo "Spawning the package builder container for '$@'."
 echo ""
-echo "docker run $DOCKER_OPTS ${docker_env[@]} ${docker_volumes[@]} $DOCKER_IMAGE $@"
+#echo "docker run $DOCKER_OPTS ${docker_env[@]} ${docker_volumes[@]} $DOCKER_IMAGE $@"
 
 docker run $DOCKER_OPTS "${docker_env[@]}" "${docker_volumes[@]}" $DOCKER_IMAGE $@

sabayon-createrepo

@@ -61,12 +61,12 @@ else
   echo "Yes" | eit init --quick \$repo
 fi
 
+[ -f "/etc/entropy/mykeys/key.pub" ] && [ -f "/etc/entropy/mykeys/private.key" ] && { eit key status \$repo; } \
+eit key import \$repo /etc/entropy/mykeys/private.key /etc/entropy/mykeys/key.pub && { eit key sign \$repo || true; }
+
 echo "Yes" | eit inject \${built_pkgs} || { echo "ouch unable to inject" && exit 3; }
 echo "Yes Yes Yes" | eit commit --quick
 
-[ -f "/etc/entropy/mykeys/key.pub" ] && [ -f "/etc/entropy/mykeys/private.key" ] &&\
-eit key import \$repo /etc/entropy/mykeys/private.key /etc/entropy/mykeys/key.pub && eit key sign \$repo
-
 eit push --quick --force
 
 EOF

sabayon-createrepo-cleanup

@@ -10,6 +10,7 @@ REPOSITORY_DESCRIPTION="${REPOSITORY_DESCRIPTION:-My Sabayon repository}"
 DOCKER_IMAGE="${DOCKER_IMAGE:-sabayon/eit-amd64}"
 PORTAGE_ARTIFACTS="${PORTAGE_ARTIFACTS:-$SAB_WORKSPACE/portage_artifacts}"
 OUTPUT_DIR="${OUTPUT_DIR:-$SAB_WORKSPACE/entropy_artifacts}"
+DOCKER_OPTS="${DOCKER_OPTS:--ti --rm}"
 
 args=("$@")
 EDITOR=cat
@@ -88,6 +89,6 @@ function cleanup {
 trap cleanup EXIT
 
 
-echo "docker run --rm --entrypoint /bin/bash ${docker_env[@]} ${docker_volumes[@]} -ti $DOCKER_IMAGE /sabayon/bin/create_repo.sh"
+echo "docker run $DOCKER_OPTS --entrypoint /bin/bash ${docker_env[@]} ${docker_volumes[@]} $DOCKER_IMAGE /sabayon/bin/create_repo.sh"
 
-docker run --rm --entrypoint /bin/bash "${docker_env[@]}" "${docker_volumes[@]}" -ti $DOCKER_IMAGE /sabayon/bin/create_repo.sh || true
+docker run $DOCKER_OPTS  --entrypoint /bin/bash "${docker_env[@]}" "${docker_volumes[@]}" $DOCKER_IMAGE /sabayon/bin/create_repo.sh || true

sabayon-createrepo-remove

@@ -10,6 +10,7 @@ REPOSITORY_DESCRIPTION="${REPOSITORY_DESCRIPTION:-My Sabayon repository}"
 DOCKER_IMAGE="${DOCKER_IMAGE:-sabayon/eit-amd64}"
 PORTAGE_ARTIFACTS="${PORTAGE_ARTIFACTS:-$SAB_WORKSPACE/portage_artifacts}"
 OUTPUT_DIR="${OUTPUT_DIR:-$SAB_WORKSPACE/entropy_artifacts}"
+DOCKER_OPTS="${DOCKER_OPTS:--ti --rm}"
 
 args=("$@")
 EDITOR=cat
@@ -86,6 +87,6 @@ function cleanup {
 trap cleanup EXIT
 
 
-echo "docker run --rm --entrypoint /bin/bash ${docker_env[@]} ${docker_volumes[@]} -ti $DOCKER_IMAGE /sabayon/bin/create_repo.sh"
+echo "docker run $DOCKER_OPTS --entrypoint /bin/bash ${docker_env[@]} ${docker_volumes[@]} $DOCKER_IMAGE /sabayon/bin/create_repo.sh"
 
-docker run --rm --entrypoint /bin/bash "${docker_env[@]}" "${docker_volumes[@]}" -ti $DOCKER_IMAGE /sabayon/bin/create_repo.sh || true
+docker run $DOCKER_OPTS  --entrypoint /bin/bash "${docker_env[@]}" "${docker_volumes[@]}" $DOCKER_IMAGE /sabayon/bin/create_repo.sh || true