sabayondevkit-functions.sh: add -u as default emerge option to build_category_installed and build_obsolete

Package_deps returned the target package in the output which is not
strictly true (the package is not a dependency of itself really).
In calcuate_missing also means we install the package once using entropy
(if available), and then immediately replace it with portage,
which just wastes effort.

It breaks installation in the cases where the older equo version blocks the
new portage version (e.g. change of slot).

This should remove the target package from the list of packages to be
installed with entropy.

Makefile

@@ -23,10 +23,10 @@ install:
 
 	install -d $(DESTDIR)/$(USBINDIR)
 	install -m 0755 builder $(DESTDIR)/$(USBINDIR)/
+
+	install -d $(DESTDIR)/$(UBINDIR)
 	install -m 0755 depcheck $(DESTDIR)/$(UBINDIR)/
 	install -m 0755 dynlink-scanner $(DESTDIR)/$(UBINDIR)/
 	gcc try_dlopen.c -o try_dlopen -ldl
 	install -m 0755 try_dlopen $(DESTDIR)/$(UBINDIR)/
-
-	install -d $(DESTDIR)/$(UBINDIR)
 	install -m 0755 sabayon-* $(DESTDIR)/$(UBINDIR)/

builder

@@ -15,7 +15,7 @@ $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}   // 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
@@ -37,7 +37,7 @@ my $equo_masks                = $ENV{EQUO_MASKS};
 my $equo_unmasks              = $ENV{EQUO_UNMASKS};
 my $equo_install_args         = $ENV{EQUO_INSTALL_ARGS} // "--multifetch=10";
 my $remote_overlay            = $ENV{REMOTE_OVERLAY};
-my $repoman_check             = $ENV{QA_CHECKS} // 0;
+my $qualityassurance_checks   = $ENV{QA_CHECKS} // 0;
 my $remote_conf_portdir       = $ENV{REMOTE_CONF_PORTDIR};
 my $remote_portdir            = $ENV{REMOTE_PORTDIR};
 
@@ -123,17 +123,17 @@ auto-sync = yes' > /etc/portage/repos.conf/$reponame.conf
 }
 
 # Input: package, depth, and atom. Package: sys-fs/foobarfs, Depth: 1 (depth of the package tree) , Atom: 1/0 (enable disable atom output)
+my %package_dep_cache;
 sub package_deps {
     my $package = shift;
     my $depth   = shift // 1;    # defaults to 1 level of depthness of the tree
     my $atom    = shift // 0;
 
 # 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} ) {
+    if ( !exists $package_dep_cache{$cache_key} ) {
-        @dependencies =
+        my @dependencies =
           qx/equery -C -q g --depth=$depth $package/;    #depth=0 it's all
         chomp @dependencies;
 
@@ -148,10 +148,10 @@ sub package_deps {
               @dependencies
         );
 
-        $cache{$cache_key} = \@dependencies;
+        $package_dep_cache{$cache_key} = \@dependencies;
     }
 
-    return @{ $cache{$cache_key} };
+    return @{ $package_dep_cache{$cache_key} };
 }
 
 #Input: nothing
@@ -178,18 +178,26 @@ sub calculate_missing {
     my @dependencies = package_deps( $package, $depth, 1 );
 
     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;
+        my @virtual_deps = ();
         for my $dep (@dependencies) {
-            push( @virtual_deps, package_deps( $dep, 1, 1 ) )
+            if ( $dep =~ /^virtual\// ) {
-              if ( $dep =~ /^virtual\// );
+                my @child_deps = package_deps($dep, 1, 1);
+                push( @virtual_deps, @child_deps );
+            }
         }
+
+        # Deduplicate the list
+        @virtual_deps = uniq(@virtual_deps);
+
+        # Prune the dependencies of the virtual packages from the dependencies list
         for my $dep (@virtual_deps) {
-            $install_dependencies{$dep} = 0 if ( $dep !~ /^virtual\// );
+            if ( $dep !~ /^virtual\// ) {
+                $install_dependencies{$dep} = 0;
+            }
         }
         @dependencies = grep { $install_dependencies{$_} } @dependencies;
     }
@@ -203,6 +211,10 @@ sub calculate_missing {
     my @to_install = grep( defined $available_packs{$_},
         uniq( grep( !defined $installed_packs{$_}, @dependencies ) ) );
     @to_install = grep { length } @to_install;
+
+    # Strip out the target package from the dependency list
+    @to_install = grep { to_atom($_) ne to_atom($package) } @to_install;
+
     say "[$package] packages that will be installed with equo: @to_install"
       if @to_install > 0;
 
@@ -212,6 +224,8 @@ sub calculate_missing {
 # Input : complete gentoo package (sys-fs/foobarfs-1.9.2)
 # Output: atom form (sys-fs/foobarfs)
 sub atom { s/-[0-9]{1,}.*$//; }
+# Same again as a function
+sub to_atom { my $p=shift; $p =~ s/-[0-9]{1,}.*$//; return $p; }
 
 # Input: Array
 # Output: array with unique elements
@@ -314,6 +328,8 @@ if ( $remote_portdir ne "" ) {
     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" );
 
 system("echo 'y' | layman -f -a $_") for @overlays;
 
@@ -377,7 +393,9 @@ unless ( $skip_portage_sync == 1 ) {
 }
 
 # preparing for MOAR automation
-qx|eselect profile set $profile|;
+say "Setting new profile to $profile" if defined $profile;
+qx|eselect profile set $profile| if defined $profile;
+system("eselect profile list") if defined $profile;
 
 if ( $use_equo && $entropy_repository eq "weekly" ) {
     qx|equo repo disable sabayonlinux.org|;
@@ -494,7 +512,7 @@ if ($use_equo) {
     }
 }
 
-if ( $repoman_check == 1 ) {
+if ( $qualityassurance_checks == 1 ) {
     say "*** Repoman checks ***";
     for ( @packages, @injected_packages ) {
         say "*** QA checks for $_";
@@ -534,6 +552,15 @@ if ($preserved_rebuild) {
 
 }
 
+if ( $qualityassurance_checks == 1 ) {
+    say "*** Missing dependencies checks ***";
+    for ( @packages ) {
+        say "*** DEPEND for $_";
+        system("dynlink-scanner $_");
+        system("depcheck $_");
+    }
+}
+
 # Copy files to artifacts folder
 system(
     "mkdir -p $artifacts_folder;cp -rfv /usr/portage/packages $artifacts_folder"

sabayon-buildpackages

@@ -76,11 +76,12 @@ if [ -d "$SAB_WORKSPACE"/specs ]; then
   [ -e "$SAB_WORKSPACE"/specs/custom.env ] && docker_volumes+=(-v "$SAB_WORKSPACE/specs/custom.env:/opt/sabayon-build/conf/$SAB_ARCH/portage/package.env")
   [ -e "$SAB_WORKSPACE"/specs/custom.keywords ] && docker_volumes+=(-v "$SAB_WORKSPACE/specs/custom.keywords:/opt/sabayon-build/conf/$SAB_ARCH/portage/package.keywords/99-custom.keywords")
   [ -d "$SAB_WORKSPACE"/specs/env ] && docker_volumes+=(-v "$SAB_WORKSPACE/specs/env/:/opt/sabayon-build/conf/$SAB_ARCH/portage/env/")
+  [ -d "/vagrant" ] && docker_volumes+=(-v "/vagrant:/vagrant")
 
 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

@@ -88,8 +88,8 @@ database-format = bz2
 # disabled-eapis = 1,2
 # expiration-based-scope = disable
 # nonfree-packages-directory-support = disable
-rss-feed = disable
+rss-feed = enable
-changelog = disable
+changelog = enable
 rss-name = packages.rss
 rss-base-url = http://packages.sabayon.org/?quicksearch=
 rss-website-url = http://www.sabayon.org/

sabayon-maint-helper

@@ -0,0 +1,94 @@
+#!/bin/bash
+set -e
+. /sbin/sabayondevkit-functions.sh
+
+help_msg() {
+
+   echo "
+ sabayon-maint-helper:
+
+Script for builder boxes maintenance.
+
+-h|--help        This message.
+--installed      Upgrades all the packages installed in the box.
+--obsolete       Upgrades ONLY the packages that are listed obsolete in eix-test-obsolete.
+--all            Tries to upgrade all package without any euristics
+--category       Tries to upgrade/install all the packages in the specified category
+                 e.g. sabayon-maint-helper 'app-office'
+
+Some options could be set also as environment variables:
+EMERGE_DEFAULT_ARGS     Default emerge options
+
+NOTE: This script MUST be execute as root.
+"
+}
+
+
+parse_args() {
+
+   local short_opts="h"
+   local long_opts="help arch: host-arch: unprivileged stagingdir: image-descr: image:"
+
+   $(set -- $(getopt -u -q -a -o "$short_opts" -l "$long_opts" -- "$@"))
+
+   while [ $# -gt 0 ] ; do
+      case "$1" in
+
+         -h|--help)
+            help_msg
+            exit 1
+            ;;
+         --installed)
+            echo "Trying to upgrade all the installed packages"
+            rebuild_all
+            ;;
+         --obsolete)
+            echo "Upgrading the packages that are marked as obsolete"
+            build_obsolete
+            ;;
+         --all)
+            echo "Upgrading/Installing everything available to install"
+            build_all_availables
+            ;;
+         --category)
+            echo "Upgrading/Installing everything inside the '$2' category"
+            build_category_installed "$2"
+            shift
+            ;;
+         --)
+            help_msg
+            exit 1
+            ;;
+         *)
+            echo "Invalid parameter $1."
+            exit 1
+            ;;
+
+      esac
+
+      shift
+   done
+
+   return 0
+}
+
+main() {
+
+  if [ "$(id -u)" != "0" ]; then
+     echo "This script must be run as root" 1>&2
+     exit 1
+  fi
+
+  [ -z "$@" ] && help_msg && exit 1
+
+  (
+    echo "Acquiring lock"
+    flock -x -w 10 200 || ( echo "Failed acquiring lock in 10 seconds" && exit 1 )
+
+    parse_args "$@"
+
+  ) 200>/var/lock/.repomaint
+
+}
+
+main "$@"

sabayondevkit-functions.sh

@@ -9,51 +9,76 @@ check_docker_requirements(){
 
 die() { echo "$@" 1>&2 ; exit 1; }
 
-build() {
-local SEARCH=$1
-local EMERGE_DEFAULT_ARGS=${2:---accept-properties=-interactive --verbose --oneshot --nospinner --noreplace --quiet-build=y --quiet-fail --fail-clean=y --complete-graph --buildpkg}
-for i in $(EIX_LIMIT=0 eix --only-names --pure-packages "$SEARCH/" | xargs echo | uniq);
-  do
-    echo "Building $i"
-    emerge $EMERGE_DEFAULT_ARGS -o $i && \
-    emerge $EMERGE_DEFAULT_ARGS $i
-  done
-}
-
-build_installed() {
-  local SEARCH=$1
-  local EMERGE_DEFAULT_ARGS=${2:---accept-properties=-interactive --newuse --noreplace --changed-use --update --verbose --oneshot --nospinner --quiet-build=y --quiet-fail --fail-clean=y --complete-graph --buildpkg}
-
-  for i in $(EIX_LIMIT=0 eix -I --only-names --pure-packages "$SEARCH/" | xargs echo | uniq);
-    do
-      echo "Building $i"
-      emerge $EMERGE_DEFAULT_ARGS $i
-    done
-}
-
-build_all_availables() {
-for i in $(cat /usr/portage/profiles/categories | xargs echo | uniq);
-  do
-    build "$i/"
-  done
-}
-
-rebuild_all() {
-for i in $(cat /usr/portage/profiles/categories | xargs echo | uniq);
-  do
-    build_installed "$i/"
-  done
-}
-
 build_sync() {
-  emerge-webrsync || exit 1
-  emerge --sync
   layman -S
+  emerge --sync
   eix-update || exit 1
   pushd /opt/sabayon-build/
     git stash
     git fetch --all
     git checkout master
-    git reset --heard origin/master
+    git reset --hard origin/master
   popd
 }
+
+build_category() {
+  local SEARCH=$1
+  build_sync
+  for i in $(EIX_LIMIT=0 eix --only-names --pure-packages "$SEARCH/" | xargs echo | uniq);
+    do
+      echo "Building $i"
+      emerge ${EMERGE_DEFAULT_ARGS:---accept-properties=-interactive --verbose --oneshot --nospinner --noreplace --quiet-build=y --quiet-fail --fail-clean=y --complete-graph --buildpkg} $i
+    done
+}
+
+build_obsolete() {
+  build_sync
+  for i in $(EIX_LIMIT=0 eix-test-obsolete | grep '\[U\]' | awk '{ print $2 }' | xargs echo | uniq);
+    do
+     echo "Build $i"
+     emerge ${EMERGE_DEFAULT_ARGS:---accept-properties=-interactive -u --verbose --oneshot --nospinner --quiet-build=y --quiet-fail --fail-clean=y --complete-graph --buildpkg --noreplace} $i
+    done
+}
+
+build_category_installed() {
+  local SEARCH=$1
+  build_sync
+  for i in $(EIX_LIMIT=0 eix -I --only-names --pure-packages "$SEARCH/" | xargs echo | uniq);
+    do
+      echo "Building $i"
+      emerge ${EMERGE_DEFAULT_ARGS:---accept-properties=-interactive -u --newuse --noreplace --changed-use --update --verbose --oneshot --nospinner --quiet-build=y --quiet-fail --fail-clean=y --complete-graph --buildpkg} $i
+    done
+}
+
+build_all_availables() {
+  for i in $(cat /usr/portage/profiles/categories | xargs echo | uniq);
+    do
+      build_category "$i/"
+    done
+}
+
+rebuild_all() {
+for i in $(cat /usr/portage/profiles/categories | xargs echo | uniq);
+  do
+    build_category_installed "$i/"
+  done
+}
+
+get_category() {
+  local CATEGORY=$1
+  local PACKS
+  for i in $(EIX_LIMIT=0 eix --only-names --pure-packages "$CATEGORY/" | xargs echo | uniq);
+    do
+      PACKS+="$i "
+    done
+    echo $PACKS
+}
+
+get_all_availables() {
+  local RES
+  for i in $(cat /usr/portage/profiles/categories | xargs echo | uniq);
+    do
+        RES+="$(get_category $i) "
+    done
+  echo $RES
+}