mrrl

commit ad0f6f451818e3438f3f957664231726a9964305
parent 0de64abf4e032cfb8598ff41c6c120aa2956fac1
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Thu, 11 Dec 2025 19:50:57 +0000

sandbox_rootfs: export necessary paths

Diffstat:
M
templates/pkg/sandbox_rootfs
 | 
7
+++++++
M
variants/ccx-x86_64/pthbs-sandbox-rootns
 | 
2
+-
M
variants/ccx-x86_64/sandbox_rootfs
 | 
5
+++++
M
variants/ccx-x86_64/sandbox_rootns.environment
 | 
6
+++---
M
variants/root-x86_64/pthbs-sandbox-rootns
 | 
2
+-
M
variants/root-x86_64/sandbox_rootfs
 | 
5
+++++
M
variants/root-x86_64/sandbox_rootns.environment
 | 
6
+++---

7 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/templates/pkg/sandbox_rootfs b/templates/pkg/sandbox_rootfs
@@ -11,6 +11,13 @@
 #+{{pkg_install_name("skalibs:bootstrap")}}
 #@sha256:{{ files["argv0exec.c"] }}:argv0exec.c
 {%- endblock package_deps -%}
+{% block configure -%}
+export CC="$pthbs_build_environment/{{bindir}}/{{triplet}}-gcc"
+export CPATH="$pthbs_build_environment/{{includedir}}"
+export LIBRARY_PATH="$pthbs_build_environment/{{libdir}}"
+export LDFLAGS="-L$pthbs_build_environment/{{libdir}}"
+
+{% endblock configure %}
 {% block build -%}
 {# mkdir -p root/dev root/proc -#}
 mkdir -p root/bin root/usr root/sbin root/mnt/oldroot
diff --git a/variants/ccx-x86_64/pthbs-sandbox-rootns b/variants/ccx-x86_64/pthbs-sandbox-rootns
@@ -4,7 +4,7 @@
 #+nawk.a4fe4e83738e1cd27df70916845a9e4a2b4b09a7c4088247368a95568ef0e50d
 #+execline.edfb251935b54bff3b143907aa04a56552b262e7c4887bb55c79dc1425c63006
 #+lnstools.6b9fc0083dfb449cf39a8868e83f7760e70f6bb17acb6cd7e6efc11bef247a1b
-#+sandbox_rootfs.138a3296f3087dfc0d277318527fa99afa3b16ceccc1aa1b1bf1119fd6e2992b
+#+sandbox_rootfs.52fca4403ca801bd19bb7f0e3ebd708e1983288947ff03f7e431baa6b5af125e
 #@sha256:b85634a91129f85a5aad5cae51d4084dd7ce62544b5585f0899058576c16451f:abspaths.awk
 #@sha256:0fb30f66e4b58fd8ffc2027b1aae646fa7583d3d72136a7d1e7c6c498b93cf1e:sandbox-rootns.in
 
diff --git a/variants/ccx-x86_64/sandbox_rootfs b/variants/ccx-x86_64/sandbox_rootfs
@@ -19,6 +19,11 @@ prefix=/home/ccx/versions/$pthbs_package
 dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
+export CC="$pthbs_build_environment/command/x86_64-linux-musl-gcc"
+export CPATH="$pthbs_build_environment/include"
+export LIBRARY_PATH="$pthbs_build_environment/library"
+export LDFLAGS="-L$pthbs_build_environment/library"
+
 
 mkdir -p root/bin root/usr root/sbin root/mnt/oldroot
 ln -v -s ../bin root/usr/
diff --git a/variants/ccx-x86_64/sandbox_rootns.environment b/variants/ccx-x86_64/sandbox_rootns.environment
@@ -2,5 +2,5 @@
 #+lnstools.6b9fc0083dfb449cf39a8868e83f7760e70f6bb17acb6cd7e6efc11bef247a1b
 #+busybox.e054e881b7202c51c9573fb8595b1992f877abaf41be69fbecb4fcf6a990fb1f
 #+execline.edfb251935b54bff3b143907aa04a56552b262e7c4887bb55c79dc1425c63006
-#+sandbox_rootfs.138a3296f3087dfc0d277318527fa99afa3b16ceccc1aa1b1bf1119fd6e2992b
-#+pthbs-sandbox-rootns.5da5a91d0492026fa7e564b0b58a456dc89bc0495701272ba621e192df341b06-
\ No newline at end of file
+#+sandbox_rootfs.52fca4403ca801bd19bb7f0e3ebd708e1983288947ff03f7e431baa6b5af125e
+#+pthbs-sandbox-rootns.7a511f86471704aac6ffef6e2661cb3791867a9eb0102c784dc5cf946857c3f1+
\ No newline at end of file
diff --git a/variants/root-x86_64/pthbs-sandbox-rootns b/variants/root-x86_64/pthbs-sandbox-rootns
@@ -4,7 +4,7 @@
 #+nawk.0e97cfaaf79609f84a31f147158175dce35df4cd0d22b2da14be539766e50ecb
 #+execline.4d503b89c7a92cf6f8cb7de523888d6da6df99d7a37bd36580005304ed801303
 #+lnstools.0ed06880e5b4f4bb8cb815a1a1c2addb074d78c729225480b6f55e4bf913553d
-#+sandbox_rootfs.9f406857f04fb78fbce3897d88cd184cdde187883dfb8350d71898e7d4ff6090
+#+sandbox_rootfs.bce0239d9e7a513de561fdd5d7809667b84d950b65b30f7701802fd4b10b1006
 #@sha256:b85634a91129f85a5aad5cae51d4084dd7ce62544b5585f0899058576c16451f:abspaths.awk
 #@sha256:0fb30f66e4b58fd8ffc2027b1aae646fa7583d3d72136a7d1e7c6c498b93cf1e:sandbox-rootns.in
 
diff --git a/variants/root-x86_64/sandbox_rootfs b/variants/root-x86_64/sandbox_rootfs
@@ -19,6 +19,11 @@ prefix=/versions/$pthbs_package
 dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
+export CC="$pthbs_build_environment/command/x86_64-linux-musl-gcc"
+export CPATH="$pthbs_build_environment/include"
+export LIBRARY_PATH="$pthbs_build_environment/library"
+export LDFLAGS="-L$pthbs_build_environment/library"
+
 
 mkdir -p root/bin root/usr root/sbin root/mnt/oldroot
 ln -v -s ../bin root/usr/
diff --git a/variants/root-x86_64/sandbox_rootns.environment b/variants/root-x86_64/sandbox_rootns.environment
@@ -2,5 +2,5 @@
 #+lnstools.0ed06880e5b4f4bb8cb815a1a1c2addb074d78c729225480b6f55e4bf913553d
 #+busybox.95a5f0b11c8542c83e37cdfbee23575e7e71563c72e1bb56f21d65491caf164f
 #+execline.4d503b89c7a92cf6f8cb7de523888d6da6df99d7a37bd36580005304ed801303
-#+sandbox_rootfs.9f406857f04fb78fbce3897d88cd184cdde187883dfb8350d71898e7d4ff6090
-#+pthbs-sandbox-rootns.c61ff74ad5e524e8d1bca0252a687d703abb1cb5d102dfef76653410eb59455a-
\ No newline at end of file
+#+sandbox_rootfs.bce0239d9e7a513de561fdd5d7809667b84d950b65b30f7701802fd4b10b1006
+#+pthbs-sandbox-rootns.9f0774c7515c8fa8d0269c4a86dbf99441db1afd1d4457a3b5f34cf84341143c+
\ No newline at end of file