aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2022-09-01 17:52:21 +0200
committerDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2023-02-17 17:59:49 +0100
commit2214aec2f359c60fa48bafe160977c14ff3c0251 (patch)
tree6f6ab31d20b2f53a57238ee4eb548247230342de
parent93dca7892c512c34f45c1abe4ca3e06dc7957560 (diff)
downloadhardware_replicant_libsamsung-ipc-2214aec2f359c60fa48bafe160977c14ff3c0251.tar.gz
hardware_replicant_libsamsung-ipc-2214aec2f359c60fa48bafe160977c14ff3c0251.tar.bz2
hardware_replicant_libsamsung-ipc-2214aec2f359c60fa48bafe160977c14ff3c0251.zip
scripts: manifest.scm: fix missing bzip2, gzip, tar and xz
In configure.ac we already build xz, bzip2 and gzip archives as we have the following: AM_INIT_AUTOMAKE([dist-bzip2 dist-xz subdir-objects]) and that in the commit aedf4ffd7d16721b522df2d20b1f41f8574c3940 ("Add tests for builds using tarballs") we automatically built these archives during make check. But we forgot to add the required utilities in scripts/manifest.scm. Without tar and xz, when running make check with 'guix shell --pure --container -f scripts/manifest.scm', we have the following error: tardir=libsamsung-ipc-0.7.0 && ${TAR-tar} chof - "$tardir" | \ XZ_OPT=${XZ_OPT--e} xz -c >libsamsung-ipc-0.7.0.tar.xz /bin/sh: line 1: xz: command not found /bin/sh: line 1: tar: command not found And if we don't add bzip2 we still have the following error: 'guix shell --pure --container -f scripts/manifest.scm', we have the following error: tardir=libsamsung-ipc-0.7.0 && ${TAR-tar} chof - "$tardir" | \ BZIP2=${BZIP2--9} bzip2 -c >libsamsung-ipc-0.7.0.tar.bz2 /bin/sh: line 1: bzip2: command not found And we also need gzip: tardir=libsamsung-ipc-0.7.0 && ${TAR-tar} chof - "$tardir" | \ eval GZIP= gzip --best -c >libsamsung-ipc-0.7.0.tar.gz /bin/sh: line 1: gzip: command not found Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
-rw-r--r--scripts/manifest.scm7
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/manifest.scm b/scripts/manifest.scm
index b9b8386..afe4ca5 100644
--- a/scripts/manifest.scm
+++ b/scripts/manifest.scm
@@ -24,6 +24,7 @@
(gnu packages autotools)
(gnu packages base)
(gnu packages commencement)
+ (gnu packages compression)
(gnu packages curl)
(gnu packages disk)
(gnu packages gawk)
@@ -35,12 +36,14 @@
(list
autoconf
automake
+ bzip2
coreutils
curl
ddrescue
diffutils
findutils
gawk
+ gzip
gcc-toolchain
grep
libtool
@@ -49,4 +52,6 @@
pkg-config
python
python-sh
- sed)
+ sed
+ tar
+ xz)