Compare commits

..

4 Commits

2 changed files with 18 additions and 8 deletions
+12 -6
View File
@@ -28,21 +28,20 @@ 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 $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 +160,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 "****************************************************";
@@ -330,6 +330,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");
+6 -2
View File
@@ -54,20 +54,24 @@ mkdir -p /sabayon/artifacts
[[ -z "\${built_pkgs}" ]] && echo "ERROR: no tbz2s found" && exit 2
if [ -d "/sabayon/artifacts/standard" ]; then
echo "=== Repository already exists, syncronizing ==="
eit unlock \$repo || true
eit pull --quick \$repo || true
#eit sync \$repo
else
echo "=== Repository is empty, intializing ==="
echo "Yes" | eit init --quick \$repo
eit push --quick --force
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; }
[ -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 "=== Injecting packages ==="
echo "Yes" | eit inject \${built_pkgs} || { echo "ouch unable to inject" && exit 3; }
echo "Yes Yes Yes" | eit commit --quick
echo "=== Pushing built packages locally ==="
eit push --quick --force
EOF