From b089771d17bfe3c2e06ec0d05371c956431b6f04 Mon Sep 17 00:00:00 2001 From: mudler Date: Mon, 11 Apr 2016 21:27:33 +0200 Subject: [PATCH] [builder/sabayon-buildpackages] adding support for equo (un)mask --- builder | 16 ++++++++++++++-- sabayon-buildpackages | 2 ++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/builder b/builder index 3c29649..009e917 100755 --- a/builder +++ b/builder @@ -29,16 +29,18 @@ 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; +my $help = 0; GetOptions( 'layman|overlay:s{,}' => \@overlays, 'equo|install:s{,}' => \@equo_install, 'equorm|remove:s{,}' => \@equo_remove, - 'help|?' => \$help + 'help|?' => \$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 ***"; system("emerge --info") diff --git a/sabayon-buildpackages b/sabayon-buildpackages index d9d8a4b..be78f50 100755 --- a/sabayon-buildpackages +++ b/sabayon-buildpackages @@ -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_MASKS=$EQUO_UNMASKS") if [ -n "$REMOTE_OVERLAY" ]; then git clone "$REMOTE_OVERLAY" "$TEMPDIR"