Compare revisions

boklm · boklm · boklm · a9d745a2 · a9d745a2 · a9d745a2
--- a/README
+++ b/README
@@ -12,6 +12,9 @@ newuidmap and newgidmap commands.
 The sources of most components are downloaded using git, which needs to
 be installed. The mercurial package is also needed.

+Zstandard (zstd) is used to compress some tarballs and needs to be
+installed. You'll also need tar >= 1.31, for zstd support.
+
 You also need a few perl modules installed:
 - YAML::XS
 - File::Basename
@@ -40,7 +43,7 @@ If you are running Debian or Ubuntu, you can install them with:
                  libstring-shellquote-perl libsort-versions-perl \
                  libdigest-sha-perl libdata-uuid-perl libdata-dump-perl \
                  libfile-copy-recursive-perl libfile-slurp-perl git \
-                  mercurial uidmap
+                  mercurial uidmap zstd

 If you are running an Arch based system, you should be able to install them with:

@@ -49,7 +52,8 @@ If you are running an Arch based system, you should be able to install them with
            perl-file-copy-recursive perl-string-shellquote \
            perl-sort-versions perl-data-uuid perl-data-dump perl-json \
            perl-digest-sha1 perl-io-all perl-file-slurp perl-sys-syscall \
-            perl-parallel-forkmanager perl-xml-libxml perl-lwp-protocol-https
+            perl-parallel-forkmanager perl-xml-libxml perl-lwp-protocol-https \
+            zstd

 On Arch based systems you also need to generate some .ph files RBM expects:


--- a/projects/aiohttp/build
+++ b/projects/aiohttp/build
 #!/bin/bash
 [% c("var/set_default_env") -%]

-tar xvf [% project %]-[% c('version') %].tar.gz
+tar -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %]

 mkdir -p /var/tmp/dist/[% project %]
 cd /var/tmp/dist/
@@ -10,5 +10,5 @@ cp -a $rootdir/[% project %]*/[% project %]/*.py ./[% project %]/

 [% c('tar', {
        tar_src => '.',
-        tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
+        tar_args => '-caf ' _ dest_dir _ '/' _ c('filename'),
        }) %]
--- a/projects/aiohttp/config
+++ b/projects/aiohttp/config
@@ -3,7 +3,7 @@ version: 3.5.4
 git_url: https://github.com/aio-libs/aiohttp.git
 git_hash: f6f647eb828fa738610d61481f11fa51e42599e9
 # TODO: This Git repo doesn't use GPG sigs.  We should pester them about that.
-filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].tar.gz"
+filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].tar.[% c('compress_tar') %]"
 container:
  use_container: 1
 input_files:

--- a/projects/aiohttp_socks/build
+++ b/projects/aiohttp_socks/build
 #!/bin/bash
 [% c("var/set_default_env") -%]

-tar xvf [% project %]-[% c('version') %].tar.gz
+tar -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %]

 mkdir -p /var/tmp/dist/
 cd /var/tmp/dist/
@@ -10,5 +10,5 @@ cp -a $rootdir/[% project %]*/[% project %] ./[% project %]

 [% c('tar', {
        tar_src => '.',
-        tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
+        tar_args => '-caf ' _ dest_dir _ '/' _ c('filename'),
        }) %]
--- a/projects/aiohttp_socks/config
+++ b/projects/aiohttp_socks/config
@@ -3,7 +3,7 @@ version: 0.2.2
 git_url: https://github.com/romis2012/aiohttp-socks.git
 git_hash: 3252f4bdd37fb9a7360481977f800189cb3e3aca
 # TODO: This Git repo doesn't use GPG sigs.  We should pester them about that.
-filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].tar.gz"
+filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].tar.[% c('compress_tar') %]"
 container:
  use_container: 1
 input_files:

--- a/projects/aiorpcx/build
+++ b/projects/aiorpcx/build
 #!/bin/bash
 [% c("var/set_default_env") -%]

-tar xvf [% project %]-[% c('version') %].tar.gz
+tar -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %]

 mkdir -p /var/tmp/dist/
 cd /var/tmp/dist/
@@ -10,5 +10,5 @@ cp -a $rootdir/[% project %]*/[% project %] ./[% project %]

 [% c('tar', {
        tar_src => '.',
-        tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
+        tar_args => '-caf ' _ dest_dir _ '/' _ c('filename'),
        }) %]
--- a/projects/aiorpcx/config
+++ b/projects/aiorpcx/config
@@ -3,7 +3,7 @@ version: 0.18.3
 git_url: https://github.com/kyuupichan/aiorpcX.git
 git_hash: 4f39366e5dee3fd0a857e53f383c628807cd2715
 # TODO: This Git repo doesn't use GPG sigs.  We should pester them about that.
-filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].tar.gz"
+filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].tar.[% c('compress_tar') %]"
 container:
  use_container: 1
 input_files:

--- a/projects/android-components/build
+++ b/projects/android-components/build
@@ -31,7 +31,7 @@ mkdir /var/tmp/build
  # according to the Gradle dependencies list.
  cp -rf $distdir/application-services/maven/org $gradle_repo
 [% END %]
-tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
+tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %]

 cd $builddir-[% c('version') %]


--- a/projects/application-services/build
+++ b/projects/application-services/build
@@ -30,7 +30,7 @@ export JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-amd64
  cp -r $gradle_repo/maven2/* $gradle_repo
 [% END %]

-tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
+tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %]

 # Prepare the offline build.
 # Move the directory for hardcoding the path in .cargo/config.
@@ -111,6 +111,6 @@ export RUST_ANDROID_GRADLE_PYTHON_COMMAND=python3
  cd /var/tmp/dist
  [% c('tar', {
      tar_src => [ project ],
-      tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
+      tar_args => '-caf ' _ dest_dir _ '/' _ c('filename'),
  }) %]
 [% END %]
--- a/projects/application-services/config
+++ b/projects/application-services/config
 # vim: filetype=yaml sw=2
-filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
+filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]'
 # Remember to update the Cargo vendor archive, when updating
 version: 93.1.0
 git_hash: ae2bb5ae89f9818230bbc003819fc7b9775aae26

--- a/projects/async_timeout/build
+++ b/projects/async_timeout/build
 #!/bin/bash
 [% c("var/set_default_env") -%]

-tar xvf [% project %]-[% c('version') %].tar.gz
+tar -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %]

 mkdir -p /var/tmp/dist/[% project %]
 cd /var/tmp/dist/
@@ -10,5 +10,5 @@ cp -a $rootdir/[% project %]*/[% project %]/*.py ./[% project %]/

 [% c('tar', {
        tar_src => '.',
-        tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
+        tar_args => '-caf ' _ dest_dir _ '/' _ c('filename'),
        }) %]
--- a/projects/async_timeout/config
+++ b/projects/async_timeout/config
@@ -3,7 +3,7 @@ version: 3.0.1
 git_url: https://github.com/aio-libs/async-timeout.git
 git_hash: 992fd174a5282258228b74127914f4b8135bf30a
 # TODO: This Git repo doesn't use GPG sigs.  We should pester them about that.
-filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].tar.gz"
+filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].tar.[% c('compress_tar') %]"
 container:
  use_container: 1
 input_files:

--- a/projects/attr/build
+++ b/projects/attr/build
 #!/bin/bash
 [% c("var/set_default_env") -%]

-tar xvf [% project %]-[% c('version') %].tar.gz
+tar -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %]

 mkdir -p /var/tmp/dist/[% project %]
 cd /var/tmp/dist/
@@ -10,5 +10,5 @@ cp -a $rootdir/[% project %]*/src/[% project %]/*.py ./[% project %]

 [% c('tar', {
        tar_src => '.',
-        tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
+        tar_args => '-caf ' _ dest_dir _ '/' _ c('filename'),
        }) %]
--- a/projects/attr/config
+++ b/projects/attr/config
@@ -3,7 +3,7 @@ version: 19.1.0
 git_url: https://github.com/python-attrs/attrs.git
 git_hash: 0356f0603eb5d8d4e7bae132ab80847fff4abcfc
 # TODO: This Git repo uses GPG sigs; we should switch from commit hash to GPG verification.
-filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].tar.gz"
+filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].tar.[% c('compress_tar') %]"
 container:
  use_container: 1
 input_files:

--- a/projects/binutils/build
+++ b/projects/binutils/build
@@ -16,5 +16,5 @@ make install MAKEINFO=true
 cd /var/tmp/dist
 [% c('tar', {
        tar_src => [ project ],
-        tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
+        tar_args => '-caf ' _ dest_dir _ '/' _ c('filename'),
        }) %]
--- a/projects/binutils/config
+++ b/projects/binutils/config
 # vim: filetype=yaml sw=2
 version: 2.39
-filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
+filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]'
 container:
  use_container: 1
 var:

--- a/projects/browser/build
+++ b/projects/browser/build
@@ -170,13 +170,13 @@ RBM_TB_EOF
  cp $rootdir/gtk3-settings.ini $GTK_SETTINGS_DIR/settings.ini
 [% END %]

-tar -C ${TB_STAGE_DIR} -xf [% c('input_files_by_name/firefox') %]/browser.tar.gz
+tar -C ${TB_STAGE_DIR} -xf [% c('input_files_by_name/firefox') %]/browser.tar.[% c("compress_tar") %]

 [% IF c("var/macos_universal") -%]
  # Use symlink in tmp dir to extract "Tor Browser.app" to "Tor Browser-aarch64.app"
  ff_aarch64=$(mktemp -d)
  ln -s "$TBDIR_AARCH64" "$ff_aarch64/[% c("var/Project_Name") %].app"
-  tar -C $ff_aarch64 -xf [% c('input_files_by_name/firefox-aarch64') %]/browser.tar.gz
+  tar -C $ff_aarch64 -xf [% c('input_files_by_name/firefox-aarch64') %]/browser.tar.[% c("compress_tar") %]
 [% END %]

 [% IF c("var/tor-browser") -%]

--- a/projects/browser/config
+++ b/projects/browser/config
@@ -10,11 +10,7 @@ var:
    - python3
    - libparallel-forkmanager-perl
    - libfile-slurp-perl
-    - zip
-    - unzip
    - bzip2
-    - xz-utils
-    - patch

 targets:
  linux:

--- a/projects/cbindgen/build
+++ b/projects/cbindgen/build
@@ -9,7 +9,7 @@ export PATH="/var/tmp/dist/rust/bin:$PATH"
  export LD_LIBRARY_PATH="/var/tmp/dist/rust/lib:$LD_LIBRARY_PATH"
 [% END -%]
 mkdir -p /var/tmp/build
-tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
+tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %]

 # Now prepare the offline build
 # Move the directory for hardcoding the path in .cargo/config
@@ -31,5 +31,5 @@ mv target/x86_64-unknown-linux-gnu/release/cbindgen $distdir/[% project %]
 cd $distdir
 [% c('tar', {
        tar_src => [ project ],
-        tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
+        tar_args => '-caf ' _ dest_dir _ '/' _ c('filename'),
    }) %]
--- a/projects/cbindgen/config
+++ b/projects/cbindgen/config
@@ -7,7 +7,7 @@ container:

 steps:
  build:
-    filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
+    filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]'
    input_files:
      - project: container-image
      - name: rust
No results found