[builder] removing dots from repository name

README.md

@@ -11,7 +11,7 @@ sudo equo i sabayon-devkit
 ## Prerequisites
 
 * docker installed in the machine (`sudo equo i docker`), and the daemon started (`sudo systemctl start docker`)
-* if you don't want to run that as root, the user where are you running the script must be in the docker group (`sudo gpasswd -a $USER docker`)
+* if you don't want to run that as root, the user where are you running the script must be in the docker group (`sudo gpasswd -a $USER docker`), or granting permission to yourself adding your user to the sudoer file.
 
 Packages can be built in a clean environment with docker by running `sabayon-buildpackages`.
 
@@ -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

@@ -19,18 +19,21 @@ 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 $artifacts_folder          = $ENV{ARTIFACTS_DIR};
-my $dep_scan_depth       = $ENV{DEPENDENCY_SCAN_DEPTH} // 2;
+my $dep_scan_depth            = $ENV{DEPENDENCY_SCAN_DEPTH} // 2;
-my $skip_portage_sync    = $ENV{SKIP_PORTAGE_SYNC} // 0;
+my $skip_portage_sync         = $ENV{SKIP_PORTAGE_SYNC} // 0;
-my $emerge_split_install = $ENV{EMERGE_SPLIT_INSTALL} // 0;
+my $emerge_split_install      = $ENV{EMERGE_SPLIT_INSTALL} // 0;
-my $webrsync             = $ENV{WEBRSYNC} // 0;
+my $webrsync                  = $ENV{WEBRSYNC} // 0;
-my $enman_repositories   = $ENV{ENMAN_REPOSITORIES};
+my $enman_repositories        = $ENV{ENMAN_REPOSITORIES};
-my $prune_virtuals       = $ENV{PRUNE_VIRTUALS} // 0;
+my $emerge_remove             = $ENV{EMERGE_REMOVE};
-my $repository_name      = $ENV{REPOSITORY_NAME};
+my $remove_enman_repositories = $ENV{REMOVE_ENMAN_REPOSITORIES};
-my $enman_add_self       = $ENV{ENMAN_ADD_SELF} // 1;
+my $prune_virtuals            = $ENV{PRUNE_VIRTUALS} // 0;
-my $build_injected_args  = $ENV{BUILD_INJECTED_ARGS};
+my $repository_name           = $ENV{REPOSITORY_NAME};
-my $equo_masks           = $ENV{EQUO_MASKS};
+my $enman_add_self            = $ENV{ENMAN_ADD_SELF} // 0;
-my $equo_unmasks         = $ENV{EQUO_UNMASKS};
+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};
 
@@ -45,7 +48,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"; }
@@ -63,7 +67,8 @@ sub append_to_file {
     if ( -f $file_name ) {
 
         # Check that the package was not already there
-        open my $fh_ro, '<:encoding(UTF-8)', $file_name or die;
+        open my $fh_ro, '<:encoding(UTF-8)', $file_name
+          or die("Cannot open: $file_name");
         while ( my $line = <$fh_ro> ) {
             return if $line eq $package . "\n";
         }
@@ -76,6 +81,31 @@ sub append_to_file {
     close $fh_a;
 }
 
+sub add_portage_repository {
+    my $repo = $_[0];
+    my $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\//;
+    my $reponame = ( split( /\//, $repo ) )[-1];
+    $reponame =~ s/\.|//g;
+    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;
@@ -203,11 +233,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";
@@ -240,6 +265,10 @@ 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 ) );
+}
+
 system("mkdir -p /usr/portage/distfiles/git3-src");
 
 unless ( $skip_portage_sync == 1 ) {
@@ -275,6 +304,11 @@ if ($use_equo) {
         safe_call("enman add $_") for @enman_toadd;
     }
 
+    if ( $remove_enman_repositories and $remove_enman_repositories ne "" ) {
+        my @enman_toremove = split( / /, $remove_enman_repositories );
+        system("enman remove $_") for @enman_toremove;
+    }
+
     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;
@@ -355,8 +389,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 "==== Compiling $pack ====";
         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
 
@@ -40,6 +39,7 @@ docker_volumes=( -v "$OUTPUT_DIR:/usr/portage/packages" )
 [ -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 "$REMOVE_ENMAN_REPOSITORIES" ] || docker_env+=(-e "REMOVE_ENMAN_REPOSITORIES=$REMOVE_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")
@@ -48,18 +48,8 @@ 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")
-
+[ -z "$EMERGE_REMOVE" ] || docker_env+=(-e "EMERGE_REMOVE=$EMERGE_REMOVE")
-if [ -n "$REMOTE_OVERLAY" ]; then
+[ -z "$REMOTE_OVERLAY" ] || docker_env+=(-e "REMOTE_OVERLAY=$REMOTE_OVERLAY")
-  git clone "$REMOTE_OVERLAY" "$TEMPDIR"
-  LOCAL_OVERLAY=$TEMPDIR
-fi
-
-function cleanup {
-	rm -rf "$TEMPDIR"
-}
-
-trap cleanup EXIT
-
 [ -d "$LOCAL_OVERLAY" ] && docker_volumes+=(-v "$LOCAL_OVERLAY:/usr/local/local_portage")
 
 if [ -e $MAKE_CONF ]; then

sabayon-createrepo-cleanup

@@ -42,7 +42,7 @@ repo="\${REPOSITORY:-default}"
 
 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 "ouch no repository there" && exit 3;

sabayon-createrepo-remove

@@ -41,7 +41,7 @@ repo="\${REPOSITORY:-default}"
 
 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 "ouch no repository there" && exit 3;