Merge pull request #11 from optiz0r/feature_optional_prune_virtuals

Allow virtual dependency pruning to be controlled by env var

builder

@@ -24,6 +24,7 @@ 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 $make_conf = $ENV{MAKE_CONF};
 
@@ -87,24 +88,27 @@ sub available_packages {
 sub calculate_missing {
     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
     my @dependencies = package_deps( $package, $depth, 1 );
 
-    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\// );
+    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;
     }
-    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 =
@@ -241,9 +245,16 @@ 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) )
+        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;

sabayon-buildpackages

@@ -30,17 +30,20 @@ docker_volumes=( -v "$OUTPUT_DIR:/usr/portage/packages" )
 [ -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")
 
 if [ -n "$REMOTE_OVERLAY" ]; then
   git clone "$REMOTE_OVERLAY" "$TEMPDIR"
@@ -77,6 +80,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 $@