[builder/buildpackages] adding REMOVE_ENMAN_REPOSITORIES

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`.
 

builder

@@ -19,18 +19,19 @@ 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 $remove_enman_repositories = $ENV{REMOVE_ENMAN_REPOSITORIES};
-my $repository_name      = $ENV{REPOSITORY_NAME};
+my $prune_virtuals            = $ENV{PRUNE_VIRTUALS} // 0;
-my $enman_add_self       = $ENV{ENMAN_ADD_SELF} // 1;
+my $repository_name           = $ENV{REPOSITORY_NAME};
-my $build_injected_args  = $ENV{BUILD_INJECTED_ARGS};
+my $enman_add_self            = $ENV{ENMAN_ADD_SELF} // 1;
-my $equo_masks           = $ENV{EQUO_MASKS};
+my $build_injected_args       = $ENV{BUILD_INJECTED_ARGS};
-my $equo_unmasks         = $ENV{EQUO_UNMASKS};
+my $equo_masks                = $ENV{EQUO_MASKS};
+my $equo_unmasks              = $ENV{EQUO_UNMASKS};
 
 my $make_conf = $ENV{MAKE_CONF};
 
@@ -60,12 +61,16 @@ sub safe_call {
 sub append_to_file {
     my ( $file_name, $package ) = @_;
 
-    # Check that the package was not already there
+    if ( -f $file_name ) {
-    open my $fh_ro, '<:encoding(UTF-8)', $file_name or die;
+
-    while ( my $line = <$fh_ro> ) {
+        # Check that the package was not already there
-        return if $line eq $package . "\n";
+        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;
     }
-    close $fh_ro;
 
     open( my $fh_a, '>>', $file_name )
       or die "Could not open file '$filename' $!";
@@ -272,6 +277,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;

sabayon-buildpackages

@@ -40,6 +40,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")

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;