From cf5f4c2d6eea354b8cf6130067483351488ba3b3 Mon Sep 17 00:00:00 2001
From: Arnaud Ferraris <arnaud.ferraris@collabora.com>
Date: Tue, 16 Mar 2021 16:54:13 +0100
Subject: [PATCH] ci-buildpackage: Use a less common name for the build
directory
Building packages into `_build` causes issues with ocaml packages: those
too build into this directory by default, which is therefore removed
during the `clean` stage.
This has been observed for ounit, pcre-ocaml and ocaml-result, and
probably affects all ocaml packages.
Using a less common name for the build directory solves the issue
without having to patch individual packages.
Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
---
package-source-builder/overlay/usr/bin/ci-buildpackage | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/package-source-builder/overlay/usr/bin/ci-buildpackage b/package-source-builder/overlay/usr/bin/ci-buildpackage
index 802b7b5..b40e19b 100755
--- a/package-source-builder/overlay/usr/bin/ci-buildpackage
+++ b/package-source-builder/overlay/usr/bin/ci-buildpackage
@@ -22,7 +22,7 @@ dversion="$(dpkg-parsechangelog -S Version)"
case "$dversion" in
*-*)
- pristine-lfs checkout -o _build --auto
+ pristine-lfs checkout -o _apertisbuild --auto
;;
*)
;;
@@ -37,8 +37,8 @@ fi
export GBP_CONF_FILES=/dev/null # ignore any upstream gbp.conf shipped with the package
gbp buildpackage --git-ignore-branch \
- --git-export-dir=_build \
- --git-tarball-dir=_build \
+ --git-export-dir=_apertisbuild \
+ --git-tarball-dir=_apertisbuild \
--git-ignore-new \
--git-postexport="${POSTHOOK}" \
--git-no-create-orig \
--
GitLab