add sabayon-tbz2extract and sabayon-xpakextract

Makefile

@@ -25,5 +25,4 @@ install:
 	install -m 0755 builder $(DESTDIR)/$(USBINDIR)/
 
 	install -d $(DESTDIR)/$(UBINDIR)
-	install -m 0755 sabayon-buildpackages $(DESTDIR)/$(UBINDIR)/
-	install -m 0755 sabayon-createrepo $(DESTDIR)/$(UBINDIR)/
+	install -m 0755 sabayon-* $(DESTDIR)/$(UBINDIR)/

builder

@@ -7,20 +7,21 @@ 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};
 
 my @overlays;
 
-GetOptions( 'layman|overlay:s{,}' => \@overlays, 'equo|install:s{,}' => \@equo_install  );
+GetOptions( 'layman|overlay:s{,}' => \@overlays, 'equo|install:s{,}' => \@equo_install,'equorm|remove:s{,}' => \@equo_remove );
 
 if ( @ARGV == 0 ) {
     help();
@@ -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
 
@@ -186,9 +197,15 @@ if ($use_equo) {
     say "", "[install] Installing missing dependencies with equo", @packages_deps, "";
     if ($equo_split_install) {
         system("equo i --bdeps $_") for (@packages_deps,@equo_install);
+        if (@equo_remove > 0){
+          system("equo rm --nodeps $_") for (@equo_remove);
+        }
     }
     else {
         system("equo i --bdeps @packages_deps @equo_install");
+        if (@equo_remove > 0){
+          system("equo rm --nodeps @equo_remove");
+        }
     }
 }
 

sabayon-brokenlibs

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+PACKAGES=()
+bin=$1
+
+. /sbin/sabayondevkit-functions.sh
+
+[ -z "$bin" ] && die "No Arg given"
+
+# Getting linked libraries
+for i in $(ldd $1 | cut -d \( -f1 | cut -d \> -f2 | grep "/" | xargs echo)
+do
+  package=$(equo q belongs -q $i)
+  [ -z "$package" ] && die "borked: $i"
+  PACKAGES+=($package)
+done
+
+# Unique and ordered
+U_PACKAGES=$(echo "${PACKAGES[@]}" | tr ' ' '\n' | sort -u | tr '\n' ' ')
+
+if [ "${#PACKAGES}" -ne 0 ]; then
+	for i in ${U_PACKAGES[@]}
+	do
+	  echo " $i"
+	done
+fi

sabayon-buildpackages

@@ -7,6 +7,9 @@ DOCKER_PULL_IMAGE="${DOCKER_PULL_IMAGE:-0}"
 MAKE_CONF="${MAKE_CONF:-$SAB_WORKSPACE/specs/make.conf}"
 OUTPUT_DIR="${OUTPUT_DIR:-$SAB_WORKSPACE/portage_artifacts/}"
 LOCAL_OVERLAY="${LOCAL_OVERLAY:-$SAB_WORKSPACE/local_overlay}"
+ENTROPY_REPOSITORY="${ENTROPY_REPOSITORY:-main}" # Can be weekly, main, testing
+DOCKER_OPTS="${DOCKER_OPTS:--ti --rm}"
+TEMPDIR=$(mktemp -d)
 
 . /sbin/sabayondevkit-functions.sh
 
@@ -19,6 +22,7 @@ fi
 docker_env=(-e "LC_ALL=en_US.UTF-8")
 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_JOBS" ] || docker_env+=(-e "BUILDER_JOBS=$BUILDER_JOBS")
 [ -z "$USE_EQUO" ] || docker_env+=(-e "USE_EQUO=$USE_EQUO")
@@ -28,6 +32,21 @@ docker_volumes=( -v "$OUTPUT_DIR:/usr/portage/packages" )
 [ -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")
+[ -z "$ENTROPY_REPOSITORY" ] || docker_env+=(-e "ENTROPY_REPOSITORY=$ENTROPY_REPOSITORY")
+[ -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
+  git clone "$REMOTE_OVERLAY" "$TEMPDIR"
+  LOCAL_OVERLAY=$TEMPDIR
+fi
+
+function cleanup {
+	rm -rf "$TEMPDIR"
+}
+
+trap cleanup EXIT
+
 [ -d "$LOCAL_OVERLAY" ] && docker_volumes+=(-v "$LOCAL_OVERLAY:/usr/local/portage")
 
 if [ -e $MAKE_CONF ]; then
@@ -52,6 +71,6 @@ fi
 
 echo "Spawning the package builder container for '$@'."
 echo ""
-echo "docker run --rm ${docker_env[@]} ${docker_volumes[@]} -ti $DOCKER_IMAGE $@"
+echo "docker run $DOCKER_OPTS ${docker_env[@]} ${docker_volumes[@]} $DOCKER_IMAGE $@"
 
-docker run --rm "${docker_env[@]}" "${docker_volumes[@]}"	-ti $DOCKER_IMAGE $@
+docker run $DOCKER_OPTS "${docker_env[@]}" "${docker_volumes[@]}" $DOCKER_IMAGE $@

sabayon-bz2brokenlibs

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+. /sbin/sabayondevkit-functions.sh
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+# the temp directory used, within $DIR
+WORK_DIR=`mktemp -d -p "$DIR"`
+
+# deletes the temp directory
+function cleanup {
+  rm -rf "$WORK_DIR"
+}
+
+# register the cleanup function to be called on the EXIT signal
+trap cleanup EXIT
+
+tbz=$1
+
+[ -z "$tbz" ] && die "No Arg given"
+
+tar xjf "$tbz" -C "$WORK_DIR"
+
+for file in $(find "$WORK_DIR" | xargs echo)
+do
+  [ -f "$file" ] && /usr/bin/sabayon-brokenlibs "$file"
+done

sabayon-createrepo

@@ -10,6 +10,7 @@ REPOSITORY_DESCRIPTION="${REPOSITORY_DESCRIPTION:-My Sabayon repository}"
 DOCKER_IMAGE="${DOCKER_IMAGE:-sabayon/eit-amd64}"
 PORTAGE_ARTIFACTS="${PORTAGE_ARTIFACTS:-$SAB_WORKSPACE/portage_artifacts}"
 OUTPUT_DIR="${OUTPUT_DIR:-$SAB_WORKSPACE/entropy_artifacts}"
+DOCKER_OPTS="${DOCKER_OPTS:--ti --rm}"
 
 args=("$@")
 EDITOR=cat
@@ -88,12 +89,19 @@ default-repository = $REPOSITORY_NAME
 repository=$REPOSITORY_NAME|$REPOSITORY_DESCRIPTION|file:///sabayon/artifacts
 EOF
 
-echo "docker run --rm --entrypoint /bin/bash ${docker_env[@]} ${docker_volumes[@]} -ti $DOCKER_IMAGE /sabayon/bin/create_repo.sh"
+function cleanup {
+  rm -rf $createrepo
+  rm -rf $entropysrv
+}
 
-docker run --rm --entrypoint /bin/bash "${docker_env[@]}" "${docker_volumes[@]}" -ti $DOCKER_IMAGE /sabayon/bin/create_repo.sh || true
+trap cleanup EXIT
 
-if [ -d "$SAB_WORKSPACE/entropy_artifacts/standard" ]; then
-  echo "The Sabayon repository files are in $SAB_WORKSPACE/entropy_artifacts"
+echo "docker $DOCKER_OPTS  ${docker_env[@]} ${docker_volumes[@]} $DOCKER_IMAGE /sabayon/bin/create_repo.sh"
+
+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
+  echo "The Sabayon repository files are in $OUTPUT_DIR"
   echo "Now you can upload its content where you want"
 
   echo ""
@@ -102,9 +110,9 @@ if [ -d "$SAB_WORKSPACE/entropy_artifacts/standard" ]; then
   echo "
   [$REPOSITORY_NAME]
   desc = $REPOSITORY_DESCRIPTION
-  repo=file://$SAB_WORKSPACE/entropy_artifacts#bz2
+  repo=file://$OUTPUT_DIR#bz2
   enabled = true
-  pkg = file://$SAB_WORKSPACE/entropy_artifacts
+  pkg = file://$OUTPUT_DIR
   "
 else
   echo "Something failed :("

sabayon-createrepo-cleanup

@@ -0,0 +1,93 @@
+#!/bin/bash
+set -e
+. /sbin/sabayondevkit-functions.sh
+
+SAB_WORKSPACE="${SAB_WORKSPACE:-$PWD}"
+entropysrv=$(mktemp)
+createrepo=$(mktemp)
+REPOSITORY_NAME="${REPOSITORY_NAME:-default}"
+REPOSITORY_DESCRIPTION="${REPOSITORY_DESCRIPTION:-My Sabayon repository}"
+DOCKER_IMAGE="${DOCKER_IMAGE:-sabayon/eit-amd64}"
+PORTAGE_ARTIFACTS="${PORTAGE_ARTIFACTS:-$SAB_WORKSPACE/portage_artifacts}"
+OUTPUT_DIR="${OUTPUT_DIR:-$SAB_WORKSPACE/entropy_artifacts}"
+
+args=("$@")
+EDITOR=cat
+
+docker_env=(-e "EDITOR=$EDITOR"
+            -e "REPOSITORY=$REPOSITORY_NAME"
+            -e "LC_ALL=en_US.UTF-8")
+
+docker_volumes=(
+            -v "$OUTPUT_DIR:/sabayon/artifacts"
+            -v "$createrepo:/sabayon/bin/create_repo.sh"
+            -v "$entropysrv:/etc/entropy/server.conf"
+            -v "$PORTAGE_ARTIFACTS:/usr/portage/packages" )
+
+
+check_docker_requirements
+
+echo "Repository: $REPOSITORY_NAME"
+echo "Repository Description: $REPOSITORY_DESCRIPTION"
+echo "Remove: ${args[@]}"
+
+# Creating the building script on-the-fly
+cat >$createrepo <<EOF
+#!/bin/bash
+set -e
+repo="\${REPOSITORY:-default}"
+
+if [ -d "/sabayon/artifacts/standard" ]; then
+  eit unlock \$repo || true
+  eit pull --quick $repo || true
+  #eit sync \$repo
+else
+  echo "ouch no repository there" && exit 3;
+fi
+
+eit clean --quick || { echo "ouch unable to remove" && exit 3; }
+eit vacuum --quick || { echo "ouch unable to remove" && exit 3; }
+
+echo "Yes Yes Yes" | eit commit --quick
+eit push --quick --force
+
+EOF
+chmod +x $createrepo
+
+# Creating the entropy repository configuration on-the-fly
+cat >$entropysrv <<EOF
+# expiration-days = <internal value>
+community-mode = enable
+weak-package-files = disable
+database-format = bz2
+# sync-speed-limit =
+# server-basic-languages = en_US C
+# disabled-eapis = 1,2
+# expiration-based-scope = disable
+# nonfree-packages-directory-support = disable
+rss-feed = disable
+changelog = disable
+rss-name = packages.rss
+rss-base-url = http://packages.sabayon.org/?quicksearch=
+rss-website-url = http://www.sabayon.org/
+max-rss-entries = 10000
+# max-rss-light-entries = 100
+rss-light-name = updates.rss
+managing-editor =
+broken-reverse-deps = disable
+default-repository = $REPOSITORY_NAME
+repository=$REPOSITORY_NAME|$REPOSITORY_DESCRIPTION|file:///sabayon/artifacts
+EOF
+
+
+function cleanup {
+  rm -rf $createrepo
+  rm -rf $entropysrv
+}
+
+trap cleanup EXIT
+
+
+echo "docker run --rm --entrypoint /bin/bash ${docker_env[@]} ${docker_volumes[@]} -ti $DOCKER_IMAGE /sabayon/bin/create_repo.sh"
+
+docker run --rm --entrypoint /bin/bash "${docker_env[@]}" "${docker_volumes[@]}" -ti $DOCKER_IMAGE /sabayon/bin/create_repo.sh || true

sabayon-createrepo-remove

@@ -0,0 +1,91 @@
+#!/bin/bash
+set -e
+. /sbin/sabayondevkit-functions.sh
+
+SAB_WORKSPACE="${SAB_WORKSPACE:-$PWD}"
+entropysrv=$(mktemp)
+createrepo=$(mktemp)
+REPOSITORY_NAME="${REPOSITORY_NAME:-default}"
+REPOSITORY_DESCRIPTION="${REPOSITORY_DESCRIPTION:-My Sabayon repository}"
+DOCKER_IMAGE="${DOCKER_IMAGE:-sabayon/eit-amd64}"
+PORTAGE_ARTIFACTS="${PORTAGE_ARTIFACTS:-$SAB_WORKSPACE/portage_artifacts}"
+OUTPUT_DIR="${OUTPUT_DIR:-$SAB_WORKSPACE/entropy_artifacts}"
+
+args=("$@")
+EDITOR=cat
+
+docker_env=(-e "EDITOR=$EDITOR"
+            -e "REPOSITORY=$REPOSITORY_NAME"
+            -e "LC_ALL=en_US.UTF-8")
+
+docker_volumes=(
+            -v "$OUTPUT_DIR:/sabayon/artifacts"
+            -v "$createrepo:/sabayon/bin/create_repo.sh"
+            -v "$entropysrv:/etc/entropy/server.conf"
+            -v "$PORTAGE_ARTIFACTS:/usr/portage/packages" )
+
+
+check_docker_requirements
+
+echo "Repository: $REPOSITORY_NAME"
+echo "Repository Description: $REPOSITORY_DESCRIPTION"
+echo "Remove: ${args[@]}"
+
+# Creating the building script on-the-fly
+cat >$createrepo <<EOF
+#!/bin/bash
+set -e
+repo="\${REPOSITORY:-default}"
+
+if [ -d "/sabayon/artifacts/standard" ]; then
+  eit unlock \$repo || true
+  eit pull --quick $repo || true
+  #eit sync \$repo
+else
+  echo "ouch no repository there" && exit 3;
+fi
+
+echo "Yes" | eit rm --from \$repo ${args[@]} || { echo "ouch unable to remove" && exit 3; }
+echo "Yes Yes Yes" | eit commit --quick
+eit push --quick --force
+
+EOF
+chmod +x $createrepo
+
+# Creating the entropy repository configuration on-the-fly
+cat >$entropysrv <<EOF
+# expiration-days = <internal value>
+community-mode = enable
+weak-package-files = disable
+database-format = bz2
+# sync-speed-limit =
+# server-basic-languages = en_US C
+# disabled-eapis = 1,2
+# expiration-based-scope = disable
+# nonfree-packages-directory-support = disable
+rss-feed = disable
+changelog = disable
+rss-name = packages.rss
+rss-base-url = http://packages.sabayon.org/?quicksearch=
+rss-website-url = http://www.sabayon.org/
+max-rss-entries = 10000
+# max-rss-light-entries = 100
+rss-light-name = updates.rss
+managing-editor =
+broken-reverse-deps = disable
+default-repository = $REPOSITORY_NAME
+repository=$REPOSITORY_NAME|$REPOSITORY_DESCRIPTION|file:///sabayon/artifacts
+EOF
+
+
+function cleanup {
+  rm -rf $createrepo
+  rm -rf $entropysrv
+}
+
+trap cleanup EXIT
+
+
+echo "docker run --rm --entrypoint /bin/bash ${docker_env[@]} ${docker_volumes[@]} -ti $DOCKER_IMAGE /sabayon/bin/create_repo.sh"
+
+docker run --rm --entrypoint /bin/bash "${docker_env[@]}" "${docker_volumes[@]}" -ti $DOCKER_IMAGE /sabayon/bin/create_repo.sh || true

sabayon-entropypreservedlibs

@@ -0,0 +1,34 @@
+#!/usr/bin/perl
+# Author: mudler@sabayonlinux.org, skullbocks@sabayonlinux.org
+
+use strict;
+use DBI;
+use feature 'say';
+
+my $arch = $ENV{ARCH} // "amd64";
+
+my $dbh = DBI->connect(
+    "dbi:SQLite:dbname=/var/lib/entropy/client/database/$arch/equo.db",
+    "", "", { RaiseError => 1 },
+) or die $DBI::errstr;
+my $to_build = {};
+
+my $sth = $dbh->prepare(
+"SELECT DISTINCT baseinfo.category, baseinfo.name, baseinfo.version FROM baseinfo JOIN needed_libs ON baseinfo.idpackage = needed_libs.idpackage JOIN preserved_libs ON needed_libs.soname = preserved_libs.library"
+);
+$sth->execute();
+
+my $row;
+while ( $row = $sth->fetchrow_arrayref() ) {
+    $to_build->{"@$row[0]/@$row[1]-@$row[2]"}++;
+}
+$sth->finish();
+
+my $to_install = join( " ", keys %{$to_build} );
+if ( $to_install ne "" ) {
+    say "Those packages seems to request libs no longer available: $to_install";
+}
+else {
+    say "No packages request outdated libs";
+}
+$dbh->disconnect();

sabayon-tbz2extract

@@ -0,0 +1,39 @@
+#!/usr/bin/python
+# mudler <mudler@sabayon.org>
+# Edit: create a truncated tbz2 with just data
+import os
+import sys
+from portage import xpak
+
+def usage():
+        sys.stderr.write("usage: %s <tbz2_file>\n" % os.path.basename(sys.argv[0]))
+
+def main():
+        if len(sys.argv) != 2:
+                usage()
+                return 1
+
+        input_file = sys.argv[1]
+
+        if not os.path.isfile(input_file):
+                usage()
+                return 1
+
+        output_file = input_file
+        if output_file.endswith('.tbz2'):
+                output_file = output_file[:-5]
+        output_file += '.truncated'
+
+        t = xpak.tbz2(input_file)
+        t.scan()
+        f = open(input_file, 'rb')
+        data = f.read(os.stat(input_file).st_size  - t.xpaksize)
+        f.close()
+
+        f = open(output_file, 'wb')
+        f.write(data)
+        f.close()
+        return 0
+
+if __name__ == '__main__':
+        sys.exit(main())

sabayon-xpakextract

@@ -0,0 +1,39 @@
+#!/usr/bin/python
+
+import os
+import sys
+from portage import xpak
+
+def usage():
+        sys.stderr.write("usage: %s <tbz2_file>\n" % os.path.basename(sys.argv[0]))
+
+def main():
+        if len(sys.argv) != 2:
+                usage()
+                return 1
+
+        input_file = sys.argv[1]
+
+        if not os.path.isfile(input_file):
+                usage()
+                return 1
+
+        output_file = input_file
+        if output_file.endswith('.tbz2'):
+                output_file = output_file[:-5]
+        output_file += '.xpak'
+
+        t = xpak.tbz2(input_file)
+        t.scan()
+        f = open(input_file, 'rb')
+        f.seek(-t.xpaksize, 2)
+        data = f.read()
+        f.close()
+
+        f = open(output_file, 'wb')
+        f.write(data)
+        f.close()
+        return 0
+
+if __name__ == '__main__':
+        sys.exit(main())

sabayondevkit-functions.sh

@@ -7,6 +7,8 @@ check_docker_requirements(){
   ps aux | grep -q '[d]ocker' || echo "--> Be sure to have the docker daemon running (sudo systemctl start docker) of configure it to run on boot (sudo systemctl enable docker). Trying to start it anyway" && sudo systemctl start docker
 }
 
+die() { echo "$@" 1>&2 ; exit 1; }
+
 build() {
 local SEARCH=$1
 local EMERGE_DEFAULT_ARGS=${2:---accept-properties=-interactive --verbose --oneshot --nospinner --quiet-build=y --quiet-fail --fail-clean=y --complete-graph --buildpkg}