Compare commits

..

2 Commits

Author SHA1 Message Date
mudler ea3d87a48a [sabayon-createrepo-*] adding gpg key support 2016-04-14 23:28:25 +02:00
mudler d1481e915f [builder] equo (s)mask should be done before installing any packages 2016-04-13 16:08:36 +02:00
3 changed files with 21 additions and 11 deletions
+11 -10
View File
@@ -264,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();
@@ -308,16 +319,6 @@ 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")
+5
View File
@@ -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; }
+5 -1
View File
@@ -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