createrepo now accepts as argument the folder where to look for tbz2s, enhanced output

builder

@@ -16,6 +16,8 @@ my $equo_install_version = $ENV{EQUO_INSTALL_VERSION} // 0;
 my $equo_split_install   = $ENV{EQUO_SPLIT_INSTALL}   // 0;
 my $artifacts_folder     = $ENV{ARTIFACTS_DIR};
 
+my $make_conf = $ENV{MAKE_CONF};
+
 my @overlays;
 
 GetOptions( 'layman|overlay:s{,}' => \@overlays, 'equo|install:s{,}' => \@equo_install  );
@@ -163,6 +165,9 @@ qx{ls /usr/portage/licenses -1 | xargs -0 > /etc/entropy/packages/license.accept
   ;    #HAHA
 system("equo repo mirrorsort sabayonlinux.org;equo up && equo u")
   if $use_equo;    # Better don't be behind
+
+system("cp -rf $make_conf /etc/portage/make.conf") if $make_conf;
+
 qx|echo 'ACCEPT_LICENSE="*"' >> /etc/portage/make.conf|;    #just plain evil
 
 my @packages = @ARGV;
@@ -170,12 +175,12 @@ my @packages = @ARGV;
 if ($use_equo) {
     my @packages_deps;
     foreach my $p (@packages) {
-      say "[$p] Getting the package dependencies which aren't already installed on the system.. ''";
+      say "[$p] Getting the package dependencies which aren't already installed on the system.. ";
         push( @packages_deps, calculate_missing( $p , 2) )
           if $equo_install_atoms;
         push( @packages_deps, package_deps( $p, 2, 0 ) )
           if $equo_install_version;
-      say "[$p] Done ''"
+      say "[$p] Done"
     }
     @packages_deps = grep { defined() and length() } @packages_deps;   #cleaning
     say "", "[install] Installing missing dependencies with equo", @packages_deps, "";

sabayon-buildpackages

@@ -3,6 +3,8 @@ set -e
 SAB_WORKSPACE="${SAB_WORKSPACE:-$PWD}"
 DOCKER_IMAGE="${DOCKER_IMAGE:-sabayon/builder-amd64}"
 SAB_ARCH="${SAB_ARCH:-intel}"
+DOCKER_PULL_IMAGE="${DOCKER_PULL_IMAGE:-0}"
+
 . /sbin/sabayondevkit-functions.sh
 
 if [ $# -eq 0 ]
@@ -11,8 +13,30 @@ if [ $# -eq 0 ]
    exit 1
 fi
 
+docker_env=(-e "LC_ALL=en_US.UTF-8")
+docker_volumes=(-v "$SAB_WORKSPACE/local_overlay:/usr/local/portage"
+              -v "$SAB_WORKSPACE/portage_artifacts:/usr/portage/packages"
+              -v "$SAB_WORKSPACE/specs/custom.unmask:/opt/sabayon-build/conf/$SAB_ARCH/portage/package.unmask/99-custom.unmask"
+              -v "$SAB_WORKSPACE/specs/custom.mask:/opt/sabayon-build/conf/$SAB_ARCH/portage/package.mask/99-custom.mask"
+              -v "$SAB_WORKSPACE/specs/custom.use:/opt/sabayon-build/conf/$SAB_ARCH/portage/package.use/99-custom.use"
+            	-v "$SAB_WORKSPACE/specs/custom.env:/opt/sabayon-build/conf/$SAB_ARCH/portage/package.env/99-custom.env"
+            	-v "$SAB_WORKSPACE/specs/custom.keywords:/opt/sabayon-build/conf/$SAB_ARCH/portage/package.keywords/99-custom.keywords"
+              )
+
+[ -z "$BUILDER_PROFILE" ] || docker_env+=(-e "BUILDER_PROFILE=$BUILDER_PROFILE")
+[ -z "$BUILDER_JOBS" ] || docker_env+=(-e "BUILDER_JOBS=$BUILDER_JOBS")
+[ -z "$USE_EQUO" ] || docker_env+=(-e "USE_EQUO=$USE_EQUO")
+[ -z "$PRESERVED_REBUILD" ] || docker_env+=(-e "PRESERVED_REBUILD=$PRESERVED_REBUILD")
+[ -z "$EQUO_INSTALL_ATOMS" ] || docker_env+=(-e "EQUO_INSTALL_ATOMS=$EQUO_INSTALL_ATOMS")
+[ -z "$EMERGE_DEFAULTS_ARGS" ] || docker_env+=(-e "EMERGE_DEFAULTS_ARGS=$EMERGE_DEFAULTS_ARGS")
+[ -z "$EQUO_INSTALL_VERSION" ] || docker_env+=(-e "EQUO_INSTALL_VERSION=$EQUO_INSTALL_VERSION")
+[ -z "$EQUO_SPLIT_INSTALL" ] || docker_env+=(-e "EQUO_SPLIT_INSTALL=$EQUO_SPLIT_INSTALL")
+[ -z "$ARTIFACTS_DIR" ] || docker_env+=(-e "ARTIFACTS_DIR=$ARTIFACTS_DIR")
+
 check_docker_requirements
 
+[ $DOCKER_PULL_IMAGE -eq 1 ] && docker pull $DOCKER_IMAGE
+
 [ -d "$SAB_WORKSPACE"/specs ] || mkdir "$SAB_WORKSPACE"/specs/
 [ -e "$SAB_WORKSPACE"/specs/custom.mask ] || touch "$SAB_WORKSPACE"/specs/custom.mask
 [ -e "$SAB_WORKSPACE"/specs/custom.unmask ] || touch "$SAB_WORKSPACE"/specs/custom.unmask
@@ -20,12 +44,6 @@ check_docker_requirements
 [ -e "$SAB_WORKSPACE"/specs/custom.env ] || touch "$SAB_WORKSPACE"/specs/custom.env
 [ -e "$SAB_WORKSPACE"/specs/custom.keywords ] || touch "$SAB_WORKSPACE"/specs/custom.keywords
 
-docker run --rm \
+echo "docker run --rm ${docker_env[@]} ${docker_volumes[@]} -ti $DOCKER_IMAGE $@"
-	-v "$SAB_WORKSPACE"/local_overlay:/usr/local/portage \
+
-	-v "$SAB_WORKSPACE"/portage_artifacts:/usr/portage/packages \
+docker run --rm "${docker_env[@]}" "${docker_volumes[@]}"	-ti $DOCKER_IMAGE $@
-	-v "$SAB_WORKSPACE"/specs/custom.unmask:/opt/sabayon-build/conf/"$SAB_ARCH"/portage/package.unmask/custom.unmask \
-	-v "$SAB_WORKSPACE"/specs/custom.mask:/opt/sabayon-build/conf/"$SAB_ARCH"/portage/package.mask/custom.mask \
-	-v "$SAB_WORKSPACE"/specs/custom.use:/opt/sabayon-build/conf/"$SAB_ARCH"/portage/package.use/custom.use \
-	-v "$SAB_WORKSPACE"/specs/custom.env:/opt/sabayon-build/conf/"$SAB_ARCH"/portage/package.env/custom.env \
-	-v "$SAB_WORKSPACE"/specs/custom.keywords:/opt/sabayon-build/conf/"$SAB_ARCH"/portage/package.keywords/custom.keywords \
-	-ti $DOCKER_IMAGE $@

sabayon-createrepo

@@ -8,8 +8,27 @@ createrepo=$(mktemp)
 REPOSITORY_NAME="${REPOSITORY_NAME:-default}"
 REPOSITORY_DESCRIPTION="${REPOSITORY_DESCRIPTION:-My Sabayon repository}"
 DOCKER_IMAGE="${DOCKER_IMAGE:-sabayon/builder-amd64}"
+args=("$@")
 EDITOR=cat
 
+docker_env=(-e "EDITOR=$EDITOR"
+            -e "REPOSITORY=$REPOSITORY_NAME"
+            -e "LC_ALL=en_US.UTF-8")
+
+docker_volumes=(
+            -v "$SAB_WORKSPACE/entropy_artifacts:/sabayon/artifacts"
+            -v "$createrepo:/sabayon/bin/create_repo.sh"
+            -v "$entropysrv:/etc/entropy/server.conf"
+)
+
+if [ $# -eq 0 ]
+then
+ docker_volumes+=(-v "$SAB_WORKSPACE/portage_artifacts:/usr/portage/packages" )
+ else
+ echo "Packages directory: ${args[0]}"
+ docker_volumes+=(-v "$SAB_WORKSPACE/${args[0]}:/usr/portage/packages" )
+fi
+
 check_docker_requirements
 
 echo "Repository: $REPOSITORY_NAME"
@@ -26,7 +45,7 @@ repo="\${REPOSITORY:-default}"
 equo i entropy-server
 mkdir -p /sabayon/artifacts
 
-[[ -z "\${built_pkgs}" ]] && echo "ouch no pkgs found" && exit 2
+[[ -z "\${built_pkgs}" ]] && echo "ERROR: no tbz2s found" && exit 2
 
 if [ -d "/sabayon/artifacts/standard" ]; then
   eit unlock \$repo || true
@@ -68,11 +87,27 @@ default-repository = $REPOSITORY_NAME
 repository=$REPOSITORY_NAME|$REPOSITORY_DESCRIPTION|file:///sabayon/artifacts
 EOF
 
-docker run --rm --entrypoint /bin/bash -e REPOSITORY=$REPOSITORY_NAME -e EDITOR=cat -e LC_ALL=en_US.UTF-8 \
+echo "docker run --rm --entrypoint /bin/bash ${docker_env[@]} ${docker_volumes[@]} -ti $DOCKER_IMAGE /sabayon/bin/create_repo.sh"
-		-v "$SAB_WORKSPACE"/entropy_artifacts:/sabayon/artifacts \
+
-		-v $createrepo:/sabayon/bin/create_repo.sh \
+docker run --rm --entrypoint /bin/bash "${docker_env[@]}" "${docker_volumes[@]}" -ti $DOCKER_IMAGE /sabayon/bin/create_repo.sh || true
-		-v $entropysrv:/etc/entropy/server.conf \
+
-		-v "$SAB_WORKSPACE"/portage_artifacts:/usr/portage/packages \
+if [ -d "$SAB_WORKSPACE/entropy_artifacts/standard" ]; then
-		-ti $DOCKER_IMAGE /sabayon/bin/create_repo.sh || true
+  echo "The Sabayon repository files are in $SAB_WORKSPACE/entropy_artifacts"
+  echo "Now you can upload its content where you want"
+
+  echo ""
+  echo "Here it is the repository file how will look like "
+  echo "(if you plan to upload it to a webserver, modify the URI accordingly)"
+  echo "
+  [$REPOSITORY_NAME]
+  desc = $REPOSITORY_DESCRIPTION
+  repo=file://$SAB_WORKSPACE/entropy_artifacts#bz2
+  enabled = true
+  pkg = file://$SAB_WORKSPACE/entropy_artifacts
+  "
+else
+  echo "Something failed :("
+fi
+
 rm -rf $createrepo
 rm -rf $entropysrv