commit 7a656e0e07b32e6227a36dac3903ab7a41412861
parent b2fc682c67f0e4115a8c6c61b0a150cd8082404c
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Sun, 26 Oct 2025 22:23:49 +0000
define dune project root explicitly
Diffstat:
11 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/templates/pkg/dune b/templates/pkg/dune
@@ -29,14 +29,14 @@ sed -i 's/stdune.csexp/dune-configurator.csexp/' vendor/csexp/src/dune
{% endblock configure %}
{%- block build %}
ocaml boot/bootstrap.ml --verbose
- ./dune.exe build \
+ ./dune.exe build --root=. \
-p dune,dune-configurator \
--profile dune-bootstrap --verbose
{% endblock build %}
{% block install -%}
-./dune.exe runtest --verbose || true
-./dune.exe install \
+./dune.exe runtest --verbose --root=. || true
+./dune.exe install --root=. \
--destdir="$pthbs_destdir" \
dune dune-configurator
diff --git a/variants/ccx-x86_64/dune b/variants/ccx-x86_64/dune
@@ -49,12 +49,12 @@ sed -i 's/stdune.csexp/dune-configurator.csexp/' vendor/csexp/src/dune
ocaml boot/bootstrap.ml --verbose
- ./dune.exe build \
+ ./dune.exe build --root=. \
-p dune,dune-configurator \
--profile dune-bootstrap --verbose
-./dune.exe runtest --verbose || true
-./dune.exe install \
+./dune.exe runtest --verbose --root=. || true
+./dune.exe install --root=. \
--destdir="$pthbs_destdir" \
dune dune-configurator
diff --git a/variants/ccx-x86_64/ocaml-base b/variants/ccx-x86_64/ocaml-base
@@ -5,8 +5,8 @@
#+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8
#+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f
#+ocaml.e8475f64632713e769637c58e0a5753d06059a949ea3f60ace8da2eb99014ea8
-#+dune.aad3179a5ef1a8b3826a05d215f6233fda545e734778e2bf0d47cf614da521a5
-#+ocaml_intrinsics_kernel.a9e22c8dfb0e5221779ebed645b6c37074b4dc0cbaeee09f7772c0695ee8ef46
+#+dune.d211827a3e323bec146bcd7241794ca6cf56511d395ecfec5c0057b6bfa842e4
+#+ocaml_intrinsics_kernel.1a39609cdb764f7765877a95ad2e40d4675401de5a3245bddfea48939bf031f3
#@untar:-z:sha256:3f3f64789ab25bb5cb7f5f907dd651dec9cc9440981822fe75df6b94344b7208:.
diff --git a/variants/ccx-x86_64/ocaml_intrinsics_kernel b/variants/ccx-x86_64/ocaml_intrinsics_kernel
@@ -5,7 +5,7 @@
#+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8
#+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f
#+ocaml.e8475f64632713e769637c58e0a5753d06059a949ea3f60ace8da2eb99014ea8
-#+dune.aad3179a5ef1a8b3826a05d215f6233fda545e734778e2bf0d47cf614da521a5
+#+dune.d211827a3e323bec146bcd7241794ca6cf56511d395ecfec5c0057b6bfa842e4
#@untar:-z:sha256:c988b7769a59749631c3c98ba5edd1d2fe91f5dc380b5e0593c073c92f4bee01:.
diff --git a/variants/ccx-x86_64/opam b/variants/ccx-x86_64/opam
@@ -5,7 +5,7 @@
#+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8
#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062
#+ocaml.e8475f64632713e769637c58e0a5753d06059a949ea3f60ace8da2eb99014ea8
-#+dune.aad3179a5ef1a8b3826a05d215f6233fda545e734778e2bf0d47cf614da521a5
+#+dune.d211827a3e323bec146bcd7241794ca6cf56511d395ecfec5c0057b6bfa842e4
#@untar:-z:sha256:c4d053029793c714e4e7340b1157428c0f90783585fb17f35158247a640467d9:.
@@ -42,7 +42,7 @@ cd 'opam-full-2.4.1'
--infodir="$prefix/info" \
--localedir="$prefix/locale" \
--localstatedir='/var/pthbs' \
- --with-dune='/home/ccx/versions/dune.aad3179a5ef1a8b3826a05d215f6233fda545e734778e2bf0d47cf614da521a5/command/dune' \
+ --with-dune='/home/ccx/versions/dune.d211827a3e323bec146bcd7241794ca6cf56511d395ecfec5c0057b6bfa842e4/command/dune' \
--with-mccs \
--with-vendored-deps
diff --git a/variants/ccx-x86_64/wip.environment b/variants/ccx-x86_64/wip.environment
@@ -1,6 +1,6 @@
#!/usr/bin/env pthbs-build
#+ocaml.e8475f64632713e769637c58e0a5753d06059a949ea3f60ace8da2eb99014ea8
-#+dune.aad3179a5ef1a8b3826a05d215f6233fda545e734778e2bf0d47cf614da521a5
+#+dune.d211827a3e323bec146bcd7241794ca6cf56511d395ecfec5c0057b6bfa842e4
#+ocamlbuild.3079a0b5afd5dae1ef08a6769496b029094ffe4f123fb58ebf08e48ab569582e
-#+ocaml-base.4e832bd218aa1e02f60c6a4d43015cc0de38fda680bddfb471a2622aab5615fc
-#+opam.1b10ef59940fb03b3e4cdd43ce02e78f53dd9993cb9949f07c88c832de3d2566-
\ No newline at end of file
+#+ocaml-base.e0e15de31bf24c3a82ce699967697f3ef4d157ea29aaf45564b4f70daf4bb83d
+#+opam.e866e883209852ad379f143932c03a44f9e8ccf87338b618833212fa74ee6006+
\ No newline at end of file
diff --git a/variants/root-x86_64/dune b/variants/root-x86_64/dune
@@ -49,12 +49,12 @@ sed -i 's/stdune.csexp/dune-configurator.csexp/' vendor/csexp/src/dune
ocaml boot/bootstrap.ml --verbose
- ./dune.exe build \
+ ./dune.exe build --root=. \
-p dune,dune-configurator \
--profile dune-bootstrap --verbose
-./dune.exe runtest --verbose || true
-./dune.exe install \
+./dune.exe runtest --verbose --root=. || true
+./dune.exe install --root=. \
--destdir="$pthbs_destdir" \
dune dune-configurator
diff --git a/variants/root-x86_64/ocaml-base b/variants/root-x86_64/ocaml-base
@@ -5,8 +5,8 @@
#+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc
#+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676
#+ocaml.216504d39c27c787ed0182fab857700af35d56d800e8e90fcabba6434d7a37fe
-#+dune.a8b720a5b61c9e2453a5d83f51a068e170f1905d63a6db4164ba4e4cf1cc62b7
-#+ocaml_intrinsics_kernel.f4301d60f68d86b7ec7db4142629fc66b1a2bf521933fd1207f4744d8bb6159b
+#+dune.8233afc03db6f3ec13b5b1a6a4e9a7e9dc6c4ae98e3c4d376132783dbd7b03ab
+#+ocaml_intrinsics_kernel.de368eeb479dc982fa8db3f4601c709cf6120fa612b4397ce23d277b08be66c0
#@untar:-z:sha256:3f3f64789ab25bb5cb7f5f907dd651dec9cc9440981822fe75df6b94344b7208:.
diff --git a/variants/root-x86_64/ocaml_intrinsics_kernel b/variants/root-x86_64/ocaml_intrinsics_kernel
@@ -5,7 +5,7 @@
#+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc
#+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676
#+ocaml.216504d39c27c787ed0182fab857700af35d56d800e8e90fcabba6434d7a37fe
-#+dune.a8b720a5b61c9e2453a5d83f51a068e170f1905d63a6db4164ba4e4cf1cc62b7
+#+dune.8233afc03db6f3ec13b5b1a6a4e9a7e9dc6c4ae98e3c4d376132783dbd7b03ab
#@untar:-z:sha256:c988b7769a59749631c3c98ba5edd1d2fe91f5dc380b5e0593c073c92f4bee01:.
diff --git a/variants/root-x86_64/opam b/variants/root-x86_64/opam
@@ -5,7 +5,7 @@
#+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc
#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15
#+ocaml.216504d39c27c787ed0182fab857700af35d56d800e8e90fcabba6434d7a37fe
-#+dune.a8b720a5b61c9e2453a5d83f51a068e170f1905d63a6db4164ba4e4cf1cc62b7
+#+dune.8233afc03db6f3ec13b5b1a6a4e9a7e9dc6c4ae98e3c4d376132783dbd7b03ab
#@untar:-z:sha256:c4d053029793c714e4e7340b1157428c0f90783585fb17f35158247a640467d9:.
@@ -42,7 +42,7 @@ cd 'opam-full-2.4.1'
--infodir="$prefix/info" \
--localedir="$prefix/locale" \
--localstatedir='/var/pthbs' \
- --with-dune='/versions/dune.a8b720a5b61c9e2453a5d83f51a068e170f1905d63a6db4164ba4e4cf1cc62b7/command/dune' \
+ --with-dune='/versions/dune.8233afc03db6f3ec13b5b1a6a4e9a7e9dc6c4ae98e3c4d376132783dbd7b03ab/command/dune' \
--with-mccs \
--with-vendored-deps
diff --git a/variants/root-x86_64/wip.environment b/variants/root-x86_64/wip.environment
@@ -1,6 +1,6 @@
#!/usr/bin/env pthbs-build
#+ocaml.216504d39c27c787ed0182fab857700af35d56d800e8e90fcabba6434d7a37fe
-#+dune.a8b720a5b61c9e2453a5d83f51a068e170f1905d63a6db4164ba4e4cf1cc62b7
+#+dune.8233afc03db6f3ec13b5b1a6a4e9a7e9dc6c4ae98e3c4d376132783dbd7b03ab
#+ocamlbuild.97e177a0b488df4288c65373556f8f91be3433ab3b1185d7f74592fe90cd619c
-#+ocaml-base.acb126049dde95850ea59ffecc61ef5d06a32841b04c0fb40dcb88f3d3fed5ae
-#+opam.3dcf167d4ffb54e44ced31bd1871455db2d7060f5051b84259371c0d77bff5b4-
\ No newline at end of file
+#+ocaml-base.6daa2f4fb2f6586057bd702065f64a4b7fb6bcbd26915bcc20bc464e218d60e7
+#+opam.0251cc673a0ff0adfe16eff5d28e09ff1a074f324a89eab4a0166bd6b5b7dc81+
\ No newline at end of file
