Compare commits

..

4 Commits

2 changed files with 26 additions and 6 deletions
+24 -6
View File
@@ -28,21 +28,22 @@ 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 $build_injected_args = $ENV{BUILD_INJECTED_ARGS};
my $equo_masks = $ENV{EQUO_MASKS};
my $equo_unmasks = $ENV{EQUO_UNMASKS};
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
@@ -161,6 +162,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 "****************************************************";
@@ -306,6 +308,16 @@ 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")
@@ -330,6 +342,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");
+2
View File
@@ -46,6 +46,8 @@ docker_volumes=( -v "$OUTPUT_DIR:/usr/portage/packages" )
[ -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")
[ -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"