enabling package signing

Don't install dependencies brought in by virtual packages

builder

@@ -14,8 +14,12 @@ $ENV{FEATURES} = $ENV{FEATURES}
 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 $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 $make_conf = $ENV{MAKE_CONF};
 
@@ -60,23 +64,36 @@ sub calculate_missing {
     my $package = shift;
     my $depth = shift;
 
+    my @Installed_Packages = @{+shift};
+    my @Available_Packages = @{+shift};
+
     # Getting the package dependencies and the installed packages
     say "[$package] Getting the package dependencies and the installed packages";
-    my @Packages = package_deps( $package, $depth, 1 );
-    my @Installed_Packages = qx/equo q --quiet list installed/;
-    chomp(@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;
 
     #taking only the 4th column of output as key of the hashmap
     my %installed_packs =
-      map { ( split( /\s/, $_ ) )[3] => 1 } @Installed_Packages;
-    my %available_packs = map { $_ => 1 } available_packages();
+      map { $_ => 1 } @Installed_Packages;
+    my %available_packs = map { $_ => 1 } @Available_Packages;
 
 # 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{$_}, @Packages ) ) );
+        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;
+  #  say "[$package] packages that will be installed with equo: @to_install" if @to_install>0;
 
     return @to_install;
 }
@@ -157,8 +174,15 @@ auto-sync = no' > /etc/portage/repos.conf/local.conf
 
 system("mkdir -p /usr/portage/distfiles/git3-src");
 
-# sync portage and overlays
-system("layman -S;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
 qx|eselect profile set $profile|;
@@ -174,8 +198,10 @@ if ($use_equo  && $entropy_repository eq "weekly" ) {
   qx|equo repo enable sabayon-limbo|;
 }
 
-system("equo repo mirrorsort sabayonlinux.org;equo up && equo u")
-  if $use_equo;    # Better don't be behind
+if ($use_equo) {
+  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;
 
@@ -185,11 +211,14 @@ my @packages = @ARGV;
 
 if ($use_equo) {
     my @packages_deps;
+    my @Installed_Packages = qx/equo q list installed --quiet/;
+    my @Available_Packages = available_packages();
+    chomp(@Installed_Packages);
     foreach my $p (@packages) {
       say "[$p] Getting the package dependencies which aren't already installed on the system.. ";
-        push( @packages_deps, calculate_missing( $p , 2) )
+        push( @packages_deps, calculate_missing( $p , $dep_scan_depth,\@Installed_Packages,\@Available_Packages) )
           if $equo_install_atoms;
-        push( @packages_deps, package_deps( $p, 2, 0 ) )
+        push( @packages_deps, package_deps( $p, $dep_scan_depth, 0 ) )
           if $equo_install_version;
       say "[$p] Done"
     }
@@ -202,10 +231,8 @@ if ($use_equo) {
         }
     }
     else {
-        system("equo i --bdeps @packages_deps @equo_install");
-        if (@equo_remove > 0){
-          system("equo rm --nodeps @equo_remove");
-        }
+        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);
     }
 }
 

sabayon-buildpackages

@@ -28,11 +28,14 @@ docker_volumes=( -v "$OUTPUT_DIR:/usr/portage/packages" )
 [ -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 "$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 "$WEBRSYNC" ] || docker_env+=(-e "WEBRSYNC=$WEBRSYNC")
 [ -z "$DISTFILES" ] || docker_volumes+=(-v "$DISTFILES:/usr/portage/distfiles")
 [ -z "$ENTROPY_DOWNLOADED_PACKAGES" ] || docker_volumes+=(-v "$ENTROPY_DOWNLOADED_PACKAGES:/var/lib/entropy/client/packages")
 

sabayon-createrepo

@@ -25,6 +25,10 @@ docker_volumes=(
             -v "$entropysrv:/etc/entropy/server.conf"
 )
 
+[ -z "$PUBKEY" ] || docker_volumes+=(-v "$PUBKEY:/etc/entropy/mykeys/key.pub")
+[ -z "$PRIVATEKEY" ] || docker_volumes+=(-v "$PRIVATEKEY:/etc/entropy/mykeys/private.key")
+
+
 if [ $# -eq 0 ]
 then
  docker_volumes+=(-v "$PORTAGE_ARTIFACTS:/usr/portage/packages" )
@@ -51,7 +55,7 @@ mkdir -p /sabayon/artifacts
 
 if [ -d "/sabayon/artifacts/standard" ]; then
   eit unlock \$repo || true
-  eit pull --quick $repo || true
+  eit pull --quick \$repo || true
   #eit sync \$repo
 else
   echo "Yes" | eit init --quick \$repo
@@ -59,6 +63,10 @@ fi
 
 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