Compare commits

..

6 Commits

3 changed files with 9 additions and 3 deletions
+6 -2
View File
@@ -197,11 +197,15 @@ if ($use_equo) {
say "", "[install] Installing missing dependencies with equo", @packages_deps, ""; say "", "[install] Installing missing dependencies with equo", @packages_deps, "";
if ($equo_split_install) { if ($equo_split_install) {
system("equo i --bdeps $_") for (@packages_deps,@equo_install); system("equo i --bdeps $_") for (@packages_deps,@equo_install);
system("equo rm --nodeps $_") for (@equo_remove); if (@equo_remove > 0){
system("equo rm --nodeps $_") for (@equo_remove);
}
} }
else { else {
system("equo i --bdeps @packages_deps @equo_install"); system("equo i --bdeps @packages_deps @equo_install");
system("equo rm --nodeps @equo_remove"); if (@equo_remove > 0){
system("equo rm --nodeps @equo_remove");
}
} }
} }
+2
View File
@@ -22,6 +22,7 @@ fi
docker_env=(-e "LC_ALL=en_US.UTF-8") docker_env=(-e "LC_ALL=en_US.UTF-8")
docker_volumes=( -v "$OUTPUT_DIR:/usr/portage/packages" ) docker_volumes=( -v "$OUTPUT_DIR:/usr/portage/packages" )
[ -z "$PORTAGE_CACHE" ] || docker_volumes+=(-v "$PORTAGE_CACHE:/usr/portage")
[ -z "$BUILDER_PROFILE" ] || docker_env+=(-e "BUILDER_PROFILE=$BUILDER_PROFILE") [ -z "$BUILDER_PROFILE" ] || docker_env+=(-e "BUILDER_PROFILE=$BUILDER_PROFILE")
[ -z "$BUILDER_JOBS" ] || docker_env+=(-e "BUILDER_JOBS=$BUILDER_JOBS") [ -z "$BUILDER_JOBS" ] || docker_env+=(-e "BUILDER_JOBS=$BUILDER_JOBS")
[ -z "$USE_EQUO" ] || docker_env+=(-e "USE_EQUO=$USE_EQUO") [ -z "$USE_EQUO" ] || docker_env+=(-e "USE_EQUO=$USE_EQUO")
@@ -33,6 +34,7 @@ docker_volumes=( -v "$OUTPUT_DIR:/usr/portage/packages" )
[ -z "$ARTIFACTS_DIR" ] || docker_env+=(-e "ARTIFACTS_DIR=$ARTIFACTS_DIR") [ -z "$ARTIFACTS_DIR" ] || docker_env+=(-e "ARTIFACTS_DIR=$ARTIFACTS_DIR")
[ -z "$ENTROPY_REPOSITORY" ] || docker_env+=(-e "ENTROPY_REPOSITORY=$ENTROPY_REPOSITORY") [ -z "$ENTROPY_REPOSITORY" ] || docker_env+=(-e "ENTROPY_REPOSITORY=$ENTROPY_REPOSITORY")
[ -z "$DISTFILES" ] || docker_volumes+=(-v "$DISTFILES:/usr/portage/distfiles") [ -z "$DISTFILES" ] || docker_volumes+=(-v "$DISTFILES:/usr/portage/distfiles")
[ -z "$ENTROPY_DOWNLOADED_PACKAGES" ] || docker_volumes+=(-v "$ENTROPY_DOWNLOADED_PACKAGES:/var/lib/entropy/client/packages")
if [ -n "$REMOTE_OVERLAY" ]; then if [ -n "$REMOTE_OVERLAY" ]; then
git clone "$REMOTE_OVERLAY" "$TEMPDIR" git clone "$REMOTE_OVERLAY" "$TEMPDIR"
+1 -1
View File
@@ -101,7 +101,7 @@ echo "docker $DOCKER_OPTS ${docker_env[@]} ${docker_volumes[@]} $DOCKER_IMAGE /
docker run $DOCKER_OPTS --entrypoint /bin/bash "${docker_env[@]}" "${docker_volumes[@]}" $DOCKER_IMAGE /sabayon/bin/create_repo.sh || true docker run $DOCKER_OPTS --entrypoint /bin/bash "${docker_env[@]}" "${docker_volumes[@]}" $DOCKER_IMAGE /sabayon/bin/create_repo.sh || true
if [ -d "$OUTPUT_DIR/standard" ]; then if [ -d "$OUTPUT_DIR/standard" ]; then
echo "The Sabayon repository files are in $SAB_WORKSPACE/entropy_artifacts" echo "The Sabayon repository files are in $OUTPUT_DIR"
echo "Now you can upload its content where you want" echo "Now you can upload its content where you want"
echo "" echo ""