diff options
| author |  Kelvin M. Klann <kmk3.code@protonmail.com> | 2024-02-07 08:28:22 -0300 |
|---|---|---|
| committer | Kelvin M. Klann <kmk3.code@protonmail.com> | 2024-02-07 09:45:33 -0300 |
| commit | 97d5a790303ca31c70f8cc557fdf0ee4ce578f2d (patch) | |
| tree | 33e5848b4d8862299cc65e3c27bd7adda14c864e /test | |
| parent | landlock: fix inconsistent error msg format in create (diff) | |
| download | firejail-97d5a790303ca31c70f8cc557fdf0ee4ce578f2d.tar.gz firejail-97d5a790303ca31c70f8cc557fdf0ee4ce578f2d.tar.zst firejail-97d5a790303ca31c70f8cc557fdf0ee4ce578f2d.zip | |
build: prevent make clean error if compile.sh --clean fails
In the `debian_ci` job in .gitlab-ci.yml, dpkg-deb calls `make
distclean` before calling ./configure, which makes `make clean` fail due
to test/compile/compile.sh not being able to source config.mk (which is
created by ./configure):
dpkg-source -i -I --before-build .
[...]
dh_auto_clean
make -j2 distclean
make[1]: Entering directory '/builds/Firejail/firejail_ci'
error: run ./configure to generate config.mk
[...]
cd compile && ./compile.sh --clean
./compile.sh: line 15: ./../../config.sh: No such file or directory
make[2]: *** [Makefile:24: clean] Error 1
This amends commit 152a21f15 ("build: simplify clean target",
2023-07-29) / PR #6186.
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/Makefile b/test/Makefile index 2ac6e4c6f..52fada86c 100644 --- a/test/Makefile +++ b/test/Makefile | |||
| @@ -21,4 +21,4 @@ clean: | |||
| 21 | rm -f utils/index.html* | 21 | rm -f utils/index.html* |
| 22 | rm -f utils/lstesting | 22 | rm -f utils/lstesting |
| 23 | rm -f utils/wget-log | 23 | rm -f utils/wget-log |
| 24 | cd compile && ./compile.sh --clean | 24 | cd compile && (./compile.sh --clean || true) |