[builder/sabayon-buildpackages] safe copy /usr/local/portage

builder

@@ -57,6 +57,22 @@ sub safe_call {
     exit($return) if ($rt);
 }
 
+sub append_to_file {
+    my ( $file_name, $package ) = @_;
+
+    # Check that the package was not already there
+    open my $fh_ro, '<:encoding(UTF-8)', $file_name or die;
+    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;
+}
+
 # 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;
@@ -194,11 +210,14 @@ 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";
@@ -207,6 +226,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]
@@ -264,6 +285,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();
@@ -308,16 +342,6 @@ if ($use_equo) {
     }
 }
 
-# best effort -B
-if ($equo_masks) {
-    system("equo mask $_") for ( split( / /, $equo_masks ) );
-}
-
-# best effort -B
-if ($equo_unmasks) {
-    system("equo unmask $_") for ( split( / /, $equo_unmasks ) );
-}
-
 say "*** Ready to compile, finger crossed ***";
 
 system("emerge --info")

sabayon-buildpackages

@@ -60,7 +60,7 @@ function cleanup {
 
 trap cleanup EXIT
 
-[ -d "$LOCAL_OVERLAY" ] && docker_volumes+=(-v "$LOCAL_OVERLAY:/usr/local/portage")
+[ -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-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
 
@@ -46,6 +48,9 @@ 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
 
@@ -46,6 +47,9 @@ 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