[builder/sabayon-buildpackages] passing REMOTE_OVERLAY to builder and adding repos as listed https://github.com/Sabayon/community-buildspec/issues/9
This commit is contained in:
@@ -33,6 +33,7 @@ my $enman_add_self = $ENV{ENMAN_ADD_SELF} // 0;
|
||||
my $build_injected_args = $ENV{BUILD_INJECTED_ARGS};
|
||||
my $equo_masks = $ENV{EQUO_MASKS};
|
||||
my $equo_unmasks = $ENV{EQUO_UNMASKS};
|
||||
my $remote_overlay = $ENV{REMOTE_OVERLAY};
|
||||
|
||||
my $make_conf = $ENV{MAKE_CONF};
|
||||
|
||||
@@ -259,6 +260,11 @@ priority=9999
|
||||
auto-sync = no' > /etc/portage/repos.conf/local.conf
|
||||
}; # Declaring the repo and giving priority
|
||||
|
||||
if ($remote_overlay and $remote_overlay ne "") {
|
||||
add_portage_repository( $_ )
|
||||
for ( split( / /, $remote_overlay ) );
|
||||
}
|
||||
|
||||
system("mkdir -p /usr/portage/distfiles/git3-src");
|
||||
|
||||
unless ( $skip_portage_sync == 1 ) {
|
||||
|
||||
+1
-12
@@ -50,18 +50,7 @@ docker_volumes=( -v "$OUTPUT_DIR:/usr/portage/packages" )
|
||||
[ -z "$EQUO_MASKS" ] || docker_env+=(-e "EQUO_MASKS=$EQUO_MASKS")
|
||||
[ -z "$EQUO_UNMASKS" ] || docker_env+=(-e "EQUO_UNMASKS=$EQUO_UNMASKS")
|
||||
[ -z "$EMERGE_REMOVE" ] || docker_env+=(-e "EMERGE_REMOVE=$EMERGE_REMOVE")
|
||||
|
||||
if [ -n "$REMOTE_OVERLAY" ]; then
|
||||
git clone "$REMOTE_OVERLAY" "$TEMPDIR"
|
||||
LOCAL_OVERLAY=$TEMPDIR
|
||||
fi
|
||||
|
||||
function cleanup {
|
||||
rm -rf "$TEMPDIR"
|
||||
}
|
||||
|
||||
trap cleanup EXIT
|
||||
|
||||
[ -z "$REMOTE_OVERLAY" ] || docker_env+=(-e "REMOTE_OVERLAY=$REMOTE_OVERLAY")
|
||||
[ -d "$LOCAL_OVERLAY" ] && docker_volumes+=(-v "$LOCAL_OVERLAY:/usr/local/local_portage")
|
||||
|
||||
if [ -e $MAKE_CONF ]; then
|
||||
|
||||
Reference in New Issue
Block a user