Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b07d658d88 | |||
| 18148617ea | |||
| 11f56726d5 |
@@ -7,13 +7,14 @@ my $jobs = $ENV{BUILDER_JOBS} // 1;
|
||||
my $use_equo = $ENV{USE_EQUO} // 1;
|
||||
my $preserved_rebuild = $ENV{PRESERVED_REBUILD} // 0;
|
||||
my $emerge_defaults_args = $ENV{EMERGE_DEFAULTS_ARGS}
|
||||
// "--accept-properties=-interactive --verbose --oneshot --nospinner --quiet-build=y --complete-graph --buildpkg";
|
||||
// "--accept-properties=-interactive --verbose --oneshot --complete-graph --buildpkg";
|
||||
$ENV{FEATURES} = $ENV{FEATURES}
|
||||
// "parallel-fetch protect-owned compressdebug splitdebug -userpriv";
|
||||
|
||||
my $equo_install_atoms = $ENV{EQUO_INSTALL_ATOMS} // 1;
|
||||
my $equo_install_version = $ENV{EQUO_INSTALL_VERSION} // 0;
|
||||
my $equo_split_install = $ENV{EQUO_SPLIT_INSTALL} // 0;
|
||||
my $entropy_repository = $ENV{ENTROPY_REPOSITORY} // "main"; # Can be weekly, main, testing
|
||||
my $artifacts_folder = $ENV{ARTIFACTS_DIR};
|
||||
|
||||
my $make_conf = $ENV{MAKE_CONF};
|
||||
@@ -163,6 +164,16 @@ system("layman -S;emerge --sync");
|
||||
qx|eselect profile set $profile|;
|
||||
qx{ls /usr/portage/licenses -1 | xargs -0 > /etc/entropy/packages/license.accept}
|
||||
; #HAHA
|
||||
|
||||
if ($use_equo && $entropy_repository eq "weekly" ) {
|
||||
qx|equo repo disable sabayonlinux.org|;
|
||||
qx|equo repo enable sabayon-weekly|;
|
||||
} elsif( $use_equo && $entropy_repository eq "testing") {
|
||||
qx|equo repo disable sabayon-weekly|;
|
||||
qx|equo repo enable sabayonlinux.org|;
|
||||
qx|equo repo enable sabayon-limbo|;
|
||||
}
|
||||
|
||||
system("equo repo mirrorsort sabayonlinux.org;equo up && equo u")
|
||||
if $use_equo; # Better don't be behind
|
||||
|
||||
|
||||
+1
-3
@@ -7,7 +7,7 @@ entropysrv=$(mktemp)
|
||||
createrepo=$(mktemp)
|
||||
REPOSITORY_NAME="${REPOSITORY_NAME:-default}"
|
||||
REPOSITORY_DESCRIPTION="${REPOSITORY_DESCRIPTION:-My Sabayon repository}"
|
||||
DOCKER_IMAGE="${DOCKER_IMAGE:-sabayon/builder-amd64}"
|
||||
DOCKER_IMAGE="${DOCKER_IMAGE:-sabayon/eit-amd64}"
|
||||
PORTAGE_ARTIFACTS="${PORTAGE_ARTIFACTS:-$SAB_WORKSPACE/portage_artifacts}"
|
||||
OUTPUT_DIR="${OUTPUT_DIR:-$SAB_WORKSPACE/entropy_artifacts}"
|
||||
|
||||
@@ -44,8 +44,6 @@ cat >$createrepo <<EOF
|
||||
set -e
|
||||
built_pkgs=\$(find /usr/portage/packages -name "*.tbz2" | xargs)
|
||||
repo="\${REPOSITORY:-default}"
|
||||
|
||||
equo i entropy-server
|
||||
mkdir -p /sabayon/artifacts
|
||||
|
||||
[[ -z "\${built_pkgs}" ]] && echo "ERROR: no tbz2s found" && exit 2
|
||||
|
||||
Reference in New Issue
Block a user