add sabayon-tbz2truncate

builder

@@ -197,11 +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);
-        system("equo rm --nodeps $_") for (@equo_remove);
+        if (@equo_remove > 0){
+          system("equo rm --nodeps $_") for (@equo_remove);
+        }
     }
     else {
         system("equo i --bdeps @packages_deps @equo_install");
-        system("equo rm --nodeps @equo_remove");
+        if (@equo_remove > 0){
+          system("equo rm --nodeps @equo_remove");
+        }
     }
 }
 

sabayon-buildpackages

@@ -22,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")
@@ -33,6 +34,7 @@ docker_volumes=( -v "$OUTPUT_DIR:/usr/portage/packages" )
 [ -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"

sabayon-createrepo

@@ -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
 
 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 ""

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-tbz2truncate

@@ -0,0 +1,32 @@
+#!/usr/bin/python
+# mudler <mudler@sabayon.org>
+# Edit: truncate a 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
+
+        t = xpak.tbz2(input_file)
+        t.scan()
+        f = open(input_file, 'r+')
+        f.seek(-t.xpaksize, os.SEEK_END)
+        f.truncate()
+        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())