| Message ID | 20171008065024.12604-2-eschwartz@archlinux.org |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | [pacman-dev,v2,1/3] makepkg: refactor archive compression for reusability | expand |
On 08/10/17 16:50, Eli Schwartz wrote: > Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> > --- > doc/makepkg.conf.5.txt | 3 ++- > etc/makepkg.conf.in | 1 + > scripts/libmakepkg/util/compress.sh.in | 1 + > 3 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt > index 7ff29401..b50423a0 100644 > --- a/doc/makepkg.conf.5.txt > +++ b/doc/makepkg.conf.5.txt > @@ -243,6 +243,7 @@ Options > **COMPRESSGZ=**"(gzip -c -f -n)":: > **COMPRESSBZ2=**"(bzip2 -c -f)":: > **COMPRESSXZ=**"(xz -c -z -)":: > +**COMPRESSZST=**"(zstd -c -z -)":: > **COMPRESSLZO**"(lzop -q)":: > **COMPRESSLRZ=**"(lrzip -q)":: > **COMPRESSZ=**"(compress -c -f)":: > @@ -251,7 +252,7 @@ Options > > **PKGEXT=**".pkg.tar.gz", **SRCEXT=**".src.tar.gz":: > Sets the compression used when making compiled or source packages. > - Valid suffixes are `.tar`, `.tar.gz`, `.tar.bz2`, `.tar.xz`, > + Valid suffixes are `.tar`, `.tar.gz`, `.tar.bz2`, `.tar.xz`, `.tar.zst`, > `.tar.lzo`, `.tar.lrz`, and `.tar.Z`. > Do not touch these unless you know what you are doing. > > diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in > index dc27e33a..5f1394d3 100644 > --- a/etc/makepkg.conf.in > +++ b/etc/makepkg.conf.in > @@ -126,6 +126,7 @@ PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) > COMPRESSGZ=(gzip -c -f -n) > COMPRESSBZ2=(bzip2 -c -f) > COMPRESSXZ=(xz -c -z -) > +COMPRESSXZ=(zstd -c -z -q -) Typo. > COMPRESSLRZ=(lrzip -q) > COMPRESSLZO=(lzop -q) > COMPRESSZ=(compress -c -f) > diff --git a/scripts/libmakepkg/util/compress.sh.in b/scripts/libmakepkg/util/compress.sh.in > index 4e020e7f..b246197e 100644 > --- a/scripts/libmakepkg/util/compress.sh.in > +++ b/scripts/libmakepkg/util/compress.sh.in > @@ -37,6 +37,7 @@ compress_as() { > *tar.gz) ${COMPRESSGZ[@]:-gzip -c -f -n} ;; > *tar.bz2) ${COMPRESSBZ2[@]:-bzip2 -c -f} ;; > *tar.xz) ${COMPRESSXZ[@]:-xz -c -z -} ;; > + *tar.zst) ${COMPRESSZST[@]:-zstd -c -z -q -} ;; > *tar.lrz) ${COMPRESSLRZ[@]:-lrzip -q} ;; > *tar.lzo) ${COMPRESSLZO[@]:-lzop -q} ;; > *tar.Z) ${COMPRESSZ[@]:-compress -c -f} ;; >
diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 7ff29401..b50423a0 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -243,6 +243,7 @@ Options **COMPRESSGZ=**"(gzip -c -f -n)":: **COMPRESSBZ2=**"(bzip2 -c -f)":: **COMPRESSXZ=**"(xz -c -z -)":: +**COMPRESSZST=**"(zstd -c -z -)":: **COMPRESSLZO**"(lzop -q)":: **COMPRESSLRZ=**"(lrzip -q)":: **COMPRESSZ=**"(compress -c -f)":: @@ -251,7 +252,7 @@ Options **PKGEXT=**".pkg.tar.gz", **SRCEXT=**".src.tar.gz":: Sets the compression used when making compiled or source packages. - Valid suffixes are `.tar`, `.tar.gz`, `.tar.bz2`, `.tar.xz`, + Valid suffixes are `.tar`, `.tar.gz`, `.tar.bz2`, `.tar.xz`, `.tar.zst`, `.tar.lzo`, `.tar.lrz`, and `.tar.Z`. Do not touch these unless you know what you are doing. diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index dc27e33a..5f1394d3 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -126,6 +126,7 @@ PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) COMPRESSGZ=(gzip -c -f -n) COMPRESSBZ2=(bzip2 -c -f) COMPRESSXZ=(xz -c -z -) +COMPRESSXZ=(zstd -c -z -q -) COMPRESSLRZ=(lrzip -q) COMPRESSLZO=(lzop -q) COMPRESSZ=(compress -c -f) diff --git a/scripts/libmakepkg/util/compress.sh.in b/scripts/libmakepkg/util/compress.sh.in index 4e020e7f..b246197e 100644 --- a/scripts/libmakepkg/util/compress.sh.in +++ b/scripts/libmakepkg/util/compress.sh.in @@ -37,6 +37,7 @@ compress_as() { *tar.gz) ${COMPRESSGZ[@]:-gzip -c -f -n} ;; *tar.bz2) ${COMPRESSBZ2[@]:-bzip2 -c -f} ;; *tar.xz) ${COMPRESSXZ[@]:-xz -c -z -} ;; + *tar.zst) ${COMPRESSZST[@]:-zstd -c -z -q -} ;; *tar.lrz) ${COMPRESSLRZ[@]:-lrzip -q} ;; *tar.lzo) ${COMPRESSLZO[@]:-lzop -q} ;; *tar.Z) ${COMPRESSZ[@]:-compress -c -f} ;;
Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> --- doc/makepkg.conf.5.txt | 3 ++- etc/makepkg.conf.in | 1 + scripts/libmakepkg/util/compress.sh.in | 1 + 3 files changed, 4 insertions(+), 1 deletion(-)