[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,32 +19,37 @@ 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 $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 $repository_name      = $ENV{REPOSITORY_NAME};
-my $enman_add_self       = $ENV{ENMAN_ADD_SELF} // 1;
+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 $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 $prune_virtuals            = $ENV{PRUNE_VIRTUALS} // 0;
+my $repository_name           = $ENV{REPOSITORY_NAME};
+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};
 
 my @overlays;
-
+my $help = 0;
 GetOptions(
     'layman|overlay:s{,}' => \@overlays,
     'equo|install:s{,}'   => \@equo_install,
-    'equorm|remove:s{,}'  => \@equo_remove
+    'equorm|remove:s{,}'  => \@equo_remove,
+    'help|?'              => \$help
 );
 
-if ( @ARGV == 0 ) {
-    help();
-    die();
-}
+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"; }
@@ -56,6 +61,51 @@ sub safe_call {
     exit($return) if ($rt);
 }
 
+sub append_to_file {
+    my ( $file_name, $package ) = @_;
+
+    if ( -f $file_name ) {
+
+        # Check that the package was not already there
+        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";
+        }
+        close $fh_ro;
+    }
+
+    open( my $fh_a, '>>', $file_name )
+      or die "Could not open file '$filename' $!";
+    print $fh_a $package . "\n";
+    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;
@@ -161,6 +211,7 @@ sub help {
 "You can supply multiple overlays as well: $0 plasma-meta --layman kde plab",
       "The documentation is available at https://github.com/Sabayon/devkit",
       "";
+    exit 0;
 }
 
 say "****************************************************";
@@ -182,21 +233,19 @@ 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";
 
 # 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 ( !-f "/usr/local/portage/profiles/repo_name" ) {
     system("mkdir -p /usr/local/portage/{metadata,profiles}");
     system("echo 'LocalOverlay' > /usr/local/portage/profiles/repo_name");
     system("echo 'masters = gentoo' > /usr/local/portage/metadata/layout.conf");
-    system("chown -R portage:portage /usr/local/portage");
 }
 else {
     open FILE, "</usr/local/portage/profiles/repo_name";
@@ -205,6 +254,8 @@ else {
     chomp(@FILE);
     $reponame = $FILE[0];
 }
+system("chown -R portage:portage /usr/local/portage");
+system("chmod -R 755 /usr/local/portage");
 
 qx{
 echo '[$reponame]
@@ -214,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 ) {
@@ -249,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;
@@ -262,6 +322,19 @@ qx|echo 'ACCEPT_LICENSE="*"' >> /etc/portage/make.conf|;    #just plain evil
 my @packages = @ARGV;
 
 if ($use_equo) {
+
+    # best effort mask
+    if ($equo_masks) {
+        append_to_file( "/etc/entropy/packages/package.mask", $_ )
+          for ( split( / /, $equo_masks ) );
+    }
+
+    # best effort unmask
+    if ($equo_unmasks) {
+        append_to_file( "/etc/entropy/packages/package.unmask", $_ )
+          for ( split( / /, $equo_unmasks ) );
+    }
+
     my @packages_deps;
     my @Installed_Packages = qx/equo q list installed --quiet/;
     my @Available_Packages = available_packages();
@@ -316,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!
@@ -330,6 +408,12 @@ else {
 
 my $return = $rt >> 8;
 
+# best effort -B
+if ($build_injected_args) {
+    system("emerge $emerge_defaults_args -j $jobs -B $_")
+      for ( split( / /, $build_injected_args ) );
+}
+
 if ($preserved_rebuild) {
 
     system("emerge -j $jobs --buildpkg \@preserved-rebuild");

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,25 +39,18 @@ 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")
 [ -z "${PRUNE_VIRTUALS}" ] || docker_env+=(-e "PRUNE_VIRTUALS=$PRUNE_VIRTUALS")
 [ -z "$REPOSITORY_NAME" ] || docker_env+=(-e "REPOSITORY_NAME=$REPOSITORY_NAME")
 [ -z "$ENMAN_ADD_SELF" ] || docker_env+=(-e "ENMAN_ADD_SELF=$ENMAN_ADD_SELF")
-
-if [ -n "$REMOTE_OVERLAY" ]; then
-  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/portage")
+[ -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")
+[ -z "$REMOTE_OVERLAY" ] || docker_env+=(-e "REMOTE_OVERLAY=$REMOTE_OVERLAY")
+[ -d "$LOCAL_OVERLAY" ] && docker_volumes+=(-v "$LOCAL_OVERLAY:/usr/local/local_portage")
 
 if [ -e $MAKE_CONF ]; then
   echo "You specified a make.conf. I hope you know what are you doing"

sabayon-createrepo

@@ -54,19 +54,24 @@ mkdir -p /sabayon/artifacts
 [[ -z "\${built_pkgs}" ]] && echo "ERROR: no tbz2s found" && exit 2
 
 if [ -d "/sabayon/artifacts/standard" ]; then
+  echo "=== Repository already exists, syncronizing ==="
   eit unlock \$repo || true
   eit pull --quick \$repo || true
   #eit sync \$repo
 else
+  echo "=== Repository is empty, intializing ==="
   echo "Yes" | eit init --quick \$repo
+  eit push --quick --force
 fi
 
-[ -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 || true; }
+[ -f "/etc/entropy/mykeys/key.pub" ] && [ -f "/etc/entropy/mykeys/private.key" ] && { ! eit key status \$repo; } && \
+eit key import \$repo /etc/entropy/mykeys/private.key /etc/entropy/mykeys/key.pub && { eit key sign \$repo || true; } && { echo "=== Repository key imported successfully ==="; }
 
+echo "=== Injecting packages ==="
 echo "Yes" | eit inject \${built_pkgs} || { echo "ouch unable to inject" && exit 3; }
 echo "Yes Yes Yes" | eit commit --quick
 
+echo "=== Pushing built packages locally ==="
 eit push --quick --force
 
 EOF

sabayon-createrepo-cleanup

@@ -25,6 +25,8 @@ docker_volumes=(
             -v "$entropysrv:/etc/entropy/server.conf"
             -v "$PORTAGE_ARTIFACTS:/usr/portage/packages" )
 
+[ -z "$PUBKEY" ] || docker_volumes+=(-v "$PUBKEY:/etc/entropy/mykeys/key.pub")
+[ -z "$PRIVATEKEY" ] || docker_volumes+=(-v "$PRIVATEKEY:/etc/entropy/mykeys/private.key")
 
 check_docker_requirements
 
@@ -40,12 +42,15 @@ 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;
 fi
 
+[ -f "/etc/entropy/mykeys/key.pub" ] && [ -f "/etc/entropy/mykeys/private.key" ] && { ! eit key status \$repo; } && \
+eit key import \$repo /etc/entropy/mykeys/private.key /etc/entropy/mykeys/key.pub && { eit key sign \$repo || true; } && { echo "=== Repository key imported successfully ==="; }
+
 eit clean --quick || { echo "ouch unable to remove" && exit 3; }
 eit vacuum --quick || { echo "ouch unable to remove" && exit 3; }
 

sabayon-createrepo-remove

@@ -24,7 +24,8 @@ docker_volumes=(
             -v "$createrepo:/sabayon/bin/create_repo.sh"
             -v "$entropysrv:/etc/entropy/server.conf"
             -v "$PORTAGE_ARTIFACTS:/usr/portage/packages" )
-
+[ -z "$PUBKEY" ] || docker_volumes+=(-v "$PUBKEY:/etc/entropy/mykeys/key.pub")
+[ -z "$PRIVATEKEY" ] || docker_volumes+=(-v "$PRIVATEKEY:/etc/entropy/mykeys/private.key")
 
 check_docker_requirements
 
@@ -40,12 +41,15 @@ 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;
 fi
 
+[ -f "/etc/entropy/mykeys/key.pub" ] && [ -f "/etc/entropy/mykeys/private.key" ] && { ! eit key status \$repo; } && \
+eit key import \$repo /etc/entropy/mykeys/private.key /etc/entropy/mykeys/key.pub && { eit key sign \$repo || true; } && { echo "=== Repository key imported successfully ==="; }
+
 echo "Yes" | eit rm --from \$repo ${args[@]} || { echo "ouch unable to remove" && exit 3; }
 echo "Yes Yes Yes" | eit commit --quick
 eit push --quick --force

sabayon-help-info

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+sudo bash << EOF
+echo "Grabbing system informations, the url to share will happear in a minute"
+(echo 'lspci'; lspci; echo 'network'; ifconfig -a; echo 'drivers'; lsmod; find /lib/modules; echo 'kernel'; uname -a) | pastebunz
+EOF