From 8664357eb907ffb170f295fd6163050d62acdaa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A6titia=20Delvaux?= Date: Sat, 4 Nov 2023 18:27:32 +0100 Subject: [PATCH] Some archives have symlinks that needs to be extracted with full path (pyrsistent). --- docker-envs/Dockerfile-d12 | 1 + unibuild-package/unibuild-package/unibuild-deb.make | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-envs/Dockerfile-d12 b/docker-envs/Dockerfile-d12 index 3975908..ec53016 100644 --- a/docker-envs/Dockerfile-d12 +++ b/docker-envs/Dockerfile-d12 @@ -1,6 +1,7 @@ FROM debian:12 AS unibuild-image # Install pre-requisites for building packages +# D12 on GitHub actions need make to be installed here RUN apt-get update -y && \ apt-get upgrade -y && \ apt-get install -y sudo apt-utils curl emacs-nox gnupg htop m4 make pylint rsync screen tree vim diff --git a/unibuild-package/unibuild-package/unibuild-deb.make b/unibuild-package/unibuild-package/unibuild-deb.make index a12cf11..b3ee58f 100644 --- a/unibuild-package/unibuild-package/unibuild-deb.make +++ b/unibuild-package/unibuild-package/unibuild-deb.make @@ -104,7 +104,7 @@ $(BUILD_UNPACK_DIR): $(PRODUCTS_DIR) $(BUILD_ORIG_DIR) mkdir -p '$@/$(SOURCE_DIR)' ifneq ($(SOURCE_TARBALL),) @printf "\nUnpacking tarball $(SOURCE_TARBALL).\n\n" - (cd '$@/$(SOURCE_DIR)' && tar xzf - --strip-components=1) < '$(SOURCE_TARBALL)' + (cd '$@/$(SOURCE_DIR)' && tar xzfP - --strip-components=1) < '$(SOURCE_TARBALL)' mv '$@/$(SOURCE_DIR)' '$@/$(TAR_UNPACK_DIR)' ls -a '$@/$(TAR_UNPACK_DIR)' \ | egrep -vxe '[.]{1,2}' \