Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ea3d87a48a | |||
| d1481e915f | |||
| b185a1536b | |||
| b089771d17 |
@@ -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;
|
||||
@@ -262,6 +264,17 @@ qx|echo 'ACCEPT_LICENSE="*"' >> /etc/portage/make.conf|; #just plain evil
|
||||
my @packages = @ARGV;
|
||||
|
||||
if ($use_equo) {
|
||||
|
||||
# best effort mask
|
||||
if ($equo_masks) {
|
||||
system("equo mask $_") for ( split( / /, $equo_masks ) );
|
||||
}
|
||||
|
||||
# best effort unmask
|
||||
if ($equo_unmasks) {
|
||||
system("equo unmask $_") for ( split( / /, $equo_unmasks ) );
|
||||
}
|
||||
|
||||
my @packages_deps;
|
||||
my @Installed_Packages = qx/equo q list installed --quiet/;
|
||||
my @Available_Packages = available_packages();
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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; }
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user