commit 4b9debabdf913cbeccdb01d957d1cbb3e81eae16
parent 0dde0e2bd7f9e4297ccd5a8989eb842bbed92550
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Mon, 8 Dec 2025 05:40:54 +0000
Fix multisubstitute syntax in sandbox-rootns
Diffstat:
7 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/commitlist.sha1 b/commitlist.sha1
@@ -1773,7 +1773,6 @@ cf90fc56dcb91d473a08582239bfdf941ef1e10b sources/libelf
e12821ffb205f41fa8319ad109762a06e121c141 sources/libelf
fd2af33bd4b64be5221116f85dcf4cd220eb9a1c sources/libelf
1121d8c431615d99ec2c985fb0410e83f0f6e548 sources/lnstools
-9d57a7185de476a82c6406b912c7df7c3798144b sources/lnstools
409db79b3e7e5fc6b73305471d9bbb6ac5c14036 sources/logincaps
41039418205b48bda59372fb7c49453852853e8a sources/logincaps
790ee186578248e585dec9278f9ce627cc8bf12f sources/logincaps
diff --git a/filelist.sha256 b/filelist.sha256
@@ -98,7 +98,7 @@ ff3ddd131d73fee6838b11a6c4773bdb85c5f60fdd4b9ac4120ced021c341417 files/noobjtoo
c7d3e7ef077d7673567d2f0c34ba2ebd689dab1250286ab482a3064c73ff7d7c files/s6_clone_newpid.patch.old
64488d8562a4e98a3b299f095bb2550cff6a3d743dc2b9c5aaeea03e5b83ec33 files/s6_ftrigr_max.patch
df0c24312e4941b1035a6292504fbf569f0f8b81b083835d7df84586decef25c files/sandbox-rootns-python.in
-fb69a8edf20b3018c70dfea0a28924da229b9f43bcb4f3cdcf412a2821e32df3 files/sandbox-rootns.in
+e17f1e848338a30d6ffc80ee756263278f722b4f8ffe07727662bd864952b14e files/sandbox-rootns.in
37d93db7135d47852dbe763f1b18b3aeab142431a6f5268a17fc700387a326e4 files/strace-6.5-static.patch
07c3c30dab68c905d5608124e729592a30b2c087f24e7b76940f5321786128b1 files/update-links
664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df files/user-env
diff --git a/files/sandbox-rootns.in b/files/sandbox-rootns.in
@@ -1,12 +1,12 @@
#!shebang:execlineb -S0
elquote:multisubstitute {
- elquote:importas -iuS sandbox_pthbs_versions
- elquote:importas -iuS sandbox_pthbs_workdir # this is the general work/ directory
- elquote:importas -iuS sandbox_pthbs_pkgdir
- elquote:importas -iuS sandbox_workdir # this is job-specific subdirectory of work/
- elquote:importas -iuS sandbox_envdir
- elquote:importas -iuS pthbs_uid
- elquote:importas -iuS pthbs_gid
+ importas -iuS sandbox_pthbs_versions
+ importas -iuS sandbox_pthbs_workdir # this is the general work/ directory
+ importas -iuS sandbox_pthbs_pkgdir
+ importas -iuS sandbox_workdir # this is job-specific subdirectory of work/
+ importas -iuS sandbox_envdir
+ importas -iuS pthbs_uid
+ importas -iuS pthbs_gid
}
elquote:if {
elquote:mkdir -p
diff --git a/variants/ccx-x86_64/pthbs-sandbox-rootns b/variants/ccx-x86_64/pthbs-sandbox-rootns
@@ -6,7 +6,7 @@
#+lnstools.189f68a87d90c1bbe648e044661f82745bc3a7d2b4054128d004d8bfb4eb5a90
#+sandbox_rootfs.c0bb1b67393bb1c9ad4d66cd210409db15205c02b56626c3872365c0f37d88ad
#@sha256:b85634a91129f85a5aad5cae51d4084dd7ce62544b5585f0899058576c16451f:abspaths.awk
-#@sha256:fb69a8edf20b3018c70dfea0a28924da229b9f43bcb4f3cdcf412a2821e32df3:sandbox-rootns.in
+#@sha256:e17f1e848338a30d6ffc80ee756263278f722b4f8ffe07727662bd864952b14e:sandbox-rootns.in
# - build script start -
diff --git a/variants/ccx-x86_64/sandbox_rootns.environment b/variants/ccx-x86_64/sandbox_rootns.environment
@@ -3,4 +3,4 @@
#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
#+execline.97dcd338d1cd526ffe28a8cbb05849056cb77d98f2ba70113cf1197c070caf98
#+sandbox_rootfs.c0bb1b67393bb1c9ad4d66cd210409db15205c02b56626c3872365c0f37d88ad
-#+pthbs-sandbox-rootns.2f30246ebda450f79aaf0faf14b524712709d35f889efc9c3a800a801adfd1c8-
\ No newline at end of file
+#+pthbs-sandbox-rootns.a7af26f0e623d630df5ae8fff58987d004d43926d5c486155a4c7f8cecf6f37c+
\ No newline at end of file
diff --git a/variants/root-x86_64/pthbs-sandbox-rootns b/variants/root-x86_64/pthbs-sandbox-rootns
@@ -6,7 +6,7 @@
#+lnstools.c34d1837aacc8800228e6bb7058fe32fc63d84b5d73d75439f3d31c3313776f7
#+sandbox_rootfs.da56a3e9eb268605ab40d9a659cef6ae8381c4e1bb32fff6e71db1057cf0544a
#@sha256:b85634a91129f85a5aad5cae51d4084dd7ce62544b5585f0899058576c16451f:abspaths.awk
-#@sha256:fb69a8edf20b3018c70dfea0a28924da229b9f43bcb4f3cdcf412a2821e32df3:sandbox-rootns.in
+#@sha256:e17f1e848338a30d6ffc80ee756263278f722b4f8ffe07727662bd864952b14e:sandbox-rootns.in
# - build script start -
diff --git a/variants/root-x86_64/sandbox_rootns.environment b/variants/root-x86_64/sandbox_rootns.environment
@@ -3,4 +3,4 @@
#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
#+execline.0eb0935639ed55b8948221824f1af13a1df21af537b12b7405e3bcf9441be47a
#+sandbox_rootfs.da56a3e9eb268605ab40d9a659cef6ae8381c4e1bb32fff6e71db1057cf0544a
-#+pthbs-sandbox-rootns.cbef0d9d8eeddb14cf0321b5f70a765bbb40ab256d2567f8a3322e2f6794d7b2-
\ No newline at end of file
+#+pthbs-sandbox-rootns.04602e38a2ab9036c89122864d6581274d81ad6eb21e63ada9048515fab805cd+
\ No newline at end of file
