Compare commits

..

2 Commits

Author SHA1 Message Date
mudler b185a1536b [sabayon-buildpackages] typo fix 2016-04-11 21:35:19 +02:00
mudler b089771d17 [builder/sabayon-buildpackages] adding support for equo (un)mask 2016-04-11 21:27:33 +02:00
2 changed files with 16 additions and 2 deletions
+14 -2
View File
@@ -29,16 +29,18 @@ my $prune_virtuals = $ENV{PRUNE_VIRTUALS} // 0;
my $repository_name = $ENV{REPOSITORY_NAME}; my $repository_name = $ENV{REPOSITORY_NAME};
my $enman_add_self = $ENV{ENMAN_ADD_SELF} // 1; my $enman_add_self = $ENV{ENMAN_ADD_SELF} // 1;
my $build_injected_args = $ENV{BUILD_INJECTED_ARGS}; 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 $make_conf = $ENV{MAKE_CONF};
my @overlays; my @overlays;
my $help=0; my $help = 0;
GetOptions( GetOptions(
'layman|overlay:s{,}' => \@overlays, 'layman|overlay:s{,}' => \@overlays,
'equo|install:s{,}' => \@equo_install, 'equo|install:s{,}' => \@equo_install,
'equorm|remove:s{,}' => \@equo_remove, 'equorm|remove:s{,}' => \@equo_remove,
'help|?' => \$help 'help|?' => \$help
); );
help() if $help; help() if $help;
@@ -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 ***"; say "*** Ready to compile, finger crossed ***";
system("emerge --info") system("emerge --info")
+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 "${PRUNE_VIRTUALS}" ] || docker_env+=(-e "PRUNE_VIRTUALS=$PRUNE_VIRTUALS")
[ -z "$REPOSITORY_NAME" ] || docker_env+=(-e "REPOSITORY_NAME=$REPOSITORY_NAME") [ -z "$REPOSITORY_NAME" ] || docker_env+=(-e "REPOSITORY_NAME=$REPOSITORY_NAME")
[ -z "$ENMAN_ADD_SELF" ] || docker_env+=(-e "ENMAN_ADD_SELF=$ENMAN_ADD_SELF") [ -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 if [ -n "$REMOTE_OVERLAY" ]; then
git clone "$REMOTE_OVERLAY" "$TEMPDIR" git clone "$REMOTE_OVERLAY" "$TEMPDIR"