summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChloe Kudryavtsev <toast@toastin.space>2019-01-29 00:54:21 -0500
committerAllan McRae <allan@archlinux.org>2019-01-30 10:06:55 +1000
commit776fbe1cde58739d0469d3efbc76cb13b80f18b3 (patch)
tree8960e83175404a149214078ce57d63bf77b695df
parent5bd54fa0c672d89fedc7995025cf8ea4b5e5e96b (diff)
downloadpacman-776fbe1cde58739d0469d3efbc76cb13b80f18b3.tar.xz
libmakepkg: Add lzip ext support
lzip is a lossless data compressor designed to replace gzip and bzip2 as the standard general-purpose compressed format. - add .lz (lzip) support to libmakepkg/util/compress.sh:compress_as - add COMPRESSLZ to makepkg.conf.in - document COMPRESSLZ - document PKGEXT with `.tar.lz` Signed-off-by: Chloe Kudryavtsev <toast@toastin.space> Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--doc/makepkg.conf.5.asciidoc3
-rw-r--r--etc/makepkg.conf.in1
-rw-r--r--scripts/libmakepkg/util/compress.sh.in1
3 files changed, 4 insertions, 1 deletions
diff --git a/doc/makepkg.conf.5.asciidoc b/doc/makepkg.conf.5.asciidoc
index 7d7796b7..6334db05 100644
--- a/doc/makepkg.conf.5.asciidoc
+++ b/doc/makepkg.conf.5.asciidoc
@@ -254,13 +254,14 @@ Options
**COMPRESSLRZ=**"(lrzip -q)"::
**COMPRESSLZ4=**"(lz4 -q)"::
**COMPRESSZ=**"(compress -c -f)"::
+**COMPRESSLZ=**"(lzip -c -f)"::
Sets the command and options used when compressing compiled or source
packages in the named format.
**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`, `.tar.zst`,
- `.tar.lzo`, `.tar.lrz`, `.tar.lz4`, and `.tar.Z`.
+ `.tar.lzo`, `.tar.lrz`, `.tar.lz4`, `.tar.lz` 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 a4321541..4d5cf4ea 100644
--- a/etc/makepkg.conf.in
+++ b/etc/makepkg.conf.in
@@ -135,6 +135,7 @@ COMPRESSLRZ=(lrzip -q)
COMPRESSLZO=(lzop -q)
COMPRESSZ=(compress -c -f)
COMPRESSLZ4=(lz4 -q)
+COMPRESSLZ=(lzip -c -f)
#########################################################################
# EXTENSION DEFAULTS
diff --git a/scripts/libmakepkg/util/compress.sh.in b/scripts/libmakepkg/util/compress.sh.in
index 3a43e8b5..3d4d88fd 100644
--- a/scripts/libmakepkg/util/compress.sh.in
+++ b/scripts/libmakepkg/util/compress.sh.in
@@ -42,6 +42,7 @@ compress_as() {
*tar.lzo) ${COMPRESSLZO[@]:-lzop -q} ;;
*tar.Z) ${COMPRESSZ[@]:-compress -c -f} ;;
*tar.lz4) ${COMPRESSLZ4[@]:-lz4 -q} ;;
+ *tar.lz) ${COMPRESSLZ[@]:-lzip -c -f} ;;
*tar) cat ;;
*) warning "$(gettext "'%s' is not a valid archive extension.")" \
"$ext"; cat ;;