[sabayon-buildpackages] adding support for REMOVE_REMOTE_OVERLAY REMOVE_LAYMAN_OVERLAY

README.md

@@ -92,6 +92,8 @@ you can override the Architecture folder in which files are placed specifying in
 - DOCKER_PULL_IMAGE -- tells the script to update the docker image before compiling, enable it with 1, disable with 0
 - OUTPUT_DIR -- optional, default to "portage_artifacts" in your current working directory, it is the path where emerge generated tbz2 are stored (absolute path)
 - LOCAL_OVERLAY -- optional, you can specify the path to your local overlay (absolute path)
+- REMOTE_OVERLAY -- optional, a space separated list of overlays that can be cloned with git.
+
  The arguments are the packages that you want compile, they can be also in the complete form *e.g. =foo-bar/misc-1.2*
 
 

builder

@@ -25,13 +25,17 @@ 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 $emerge_remove             = $ENV{EMERGE_REMOVE};
 my $remove_enman_repositories = $ENV{REMOVE_ENMAN_REPOSITORIES};
+my $remove_remote_overlay     = $ENV{REMOVE_REMOTE_OVERLAY};
+my $remove_layman_overlay     = $ENV{REMOVE_LAYMAN_OVERLAY};
 my $prune_virtuals            = $ENV{PRUNE_VIRTUALS} // 0;
 my $repository_name           = $ENV{REPOSITORY_NAME};
-my $enman_add_self            = $ENV{ENMAN_ADD_SELF} // 1;
+my $enman_add_self            = $ENV{ENMAN_ADD_SELF} // 0;
 my $build_injected_args       = $ENV{BUILD_INJECTED_ARGS};
 my $equo_masks                = $ENV{EQUO_MASKS};
 my $equo_unmasks              = $ENV{EQUO_UNMASKS};
+my $remote_overlay            = $ENV{REMOTE_OVERLAY};
 
 my $make_conf = $ENV{MAKE_CONF};
 
@@ -46,7 +50,8 @@ GetOptions(
 
 help() if $help;
 
-$ENV{LC_ALL} = "en_US.UTF-8";    #here be dragons
+$ENV{LC_ALL}             = "en_US.UTF-8";    #here be dragons
+$ENV{ETP_NONINTERACTIVE} = 1;
 
 # A barely print replacement
 sub say { print join( "\n", @_ ) . "\n"; }
@@ -78,6 +83,40 @@ sub append_to_file {
     close $fh_a;
 }
 
+sub add_portage_repository {
+    my $repo = $_[0];
+    my $reponame;
+    my $sync_type;
+    my @repodef = split( /\|/, $repo );
+    ( $reponame, $repo ) = @repodef if ( @repodef == 2 );
+    ( $reponame, $sync_type, $repo ) = @repodef if ( @repodef == 3 );
+
+    # try to detect sync-type
+    if ( !$sync_type ) {
+        $sync_type = ( split( /\:/, $repo ) )[0];
+        $sync_type = "git"
+          if $repo =~ /github|bitbucket/
+          or $sync_type eq "https"
+          or $sync_type eq "http";
+        $sync_type = "svn" if $repo =~ /\/svn\//;
+    }
+    $reponame = ( split( /\//, $repo ) )[-1] if !$reponame;
+    $reponame =~ s/\.|//g;    #clean
+    system("mkdir -p /etc/portage/repos.conf/")
+      if ( !-d "/etc/portage/repos.conf/" );
+
+    say "==== Adding $reponame ====";
+    qx{
+echo '[$reponame]
+location = /usr/local/overlay/$reponame
+sync-type = $sync_type
+sync-uri = $repo
+auto-sync = yes' > /etc/portage/repos.conf/$reponame.conf
+};                            # Declaring the repo and giving priority
+
+    system("emaint sync -r $reponame");
+}
+
 # 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;
@@ -205,11 +244,6 @@ say "[*] Syncing configurations files, Layman and Portage";
 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");
 
-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;
 
 my $reponame = "LocalOverlay";
@@ -217,7 +251,7 @@ my $reponame = "LocalOverlay";
 # Setting up a local overlay if doesn't exists
 system(
 "rm -rf /usr/local/portage;cp -rf /usr/local/local_portage /usr/local/portage"
-);
+) if ( -d "/usr/local/local_portage" );
 
 if ( !-f "/usr/local/portage/profiles/repo_name" ) {
     system("mkdir -p /usr/local/portage/{metadata,profiles}");
@@ -242,6 +276,21 @@ priority=9999
 auto-sync = no' > /etc/portage/repos.conf/local.conf
 };    # Declaring the repo and giving priority
 
+if ( $remote_overlay and $remote_overlay ne "" ) {
+    add_portage_repository($_) for ( split( / /, $remote_overlay ) );
+}
+
+if ( $remove_layman_overlay and $remove_layman_overlay ne "" ) {
+    say "===== Removing overlays: $remove_remote_overlay =====";
+
+    system("layman -d $_") for ( split( / /, $remove_layman_overlay ) );
+}
+if ( $remove_remote_overlay and $remove_remote_overlay ne "" ) {
+    say "===== Removing overlays: $remove_remote_overlay =====";
+    system( "rm -rfv /etc/portage/" . $_ . ".conf" )
+      for ( split( / /, $remote_overlay ) );
+}
+
 system("mkdir -p /usr/portage/distfiles/git3-src");
 
 unless ( $skip_portage_sync == 1 ) {
@@ -362,8 +411,13 @@ system("equo s -vq app-misc/sabayon-devkit");
 
 my $rt;
 
+if ( $emerge_remove and $emerge_remove ne "" ) {
+    system("emerge -C $_") for split( / /, $emerge_remove );
+}
+
 if ($emerge_split_install) {
     for my $pack (@packages) {
+        say "\n" x 2, "==== Compiling $pack ====", "\n" x 2;
         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!

sabayon-buildpackages

@@ -9,7 +9,6 @@ OUTPUT_DIR="${OUTPUT_DIR:-$SAB_WORKSPACE/portage_artifacts/}"
 LOCAL_OVERLAY="${LOCAL_OVERLAY:-$SAB_WORKSPACE/local_overlay}"
 ENTROPY_REPOSITORY="${ENTROPY_REPOSITORY:-main}" # Can be weekly, main, testing
 DOCKER_OPTS="${DOCKER_OPTS:--ti --rm}"
-TEMPDIR=$(mktemp -d)
 
 . /sbin/sabayondevkit-functions.sh
 
@@ -49,17 +48,10 @@ docker_volumes=( -v "$OUTPUT_DIR:/usr/portage/packages" )
 [ -z "$ENMAN_ADD_SELF" ] || docker_env+=(-e "ENMAN_ADD_SELF=$ENMAN_ADD_SELF")
 [ -z "$EQUO_MASKS" ] || docker_env+=(-e "EQUO_MASKS=$EQUO_MASKS")
 [ -z "$EQUO_UNMASKS" ] || docker_env+=(-e "EQUO_UNMASKS=$EQUO_UNMASKS")
-
-if [ -n "$REMOTE_OVERLAY" ]; then
-  git clone "$REMOTE_OVERLAY" "$TEMPDIR"
-  LOCAL_OVERLAY=$TEMPDIR
-fi
-
-function cleanup {
-	rm -rf "$TEMPDIR"
-}
-
-trap cleanup EXIT
+[ -z "$EMERGE_REMOVE" ] || docker_env+=(-e "EMERGE_REMOVE=$EMERGE_REMOVE")
+[ -z "$REMOTE_OVERLAY" ] || docker_env+=(-e "REMOTE_OVERLAY=$REMOTE_OVERLAY")
+[ -z "$REMOVE_LAYMAN_OVERLAY" ] || docker_env+=(-e "REMOVE_LAYMAN_OVERLAY=$REMOVE_LAYMAN_OVERLAY")
+[ -z "$REMOVE_REMOTE_OVERLAY" ] || docker_env+=(-e "REMOVE_REMOTE_OVERLAY=$REMOVE_REMOTE_OVERLAY")
 
 [ -d "$LOCAL_OVERLAY" ] && docker_volumes+=(-v "$LOCAL_OVERLAY:/usr/local/local_portage")