mrrl

commit 36c67970e2fa244f00bb392f148f1b0e58480453
parent 14ad900177ec313fab4d7b3d1878f14763a16d51
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Fri, 12 Dec 2025 02:01:39 +0000

update lnstools, add debug info

Diffstat:
M
commitlist.sha1
 | 
2
+-
M
templates/pkg/lnstools:bootstrap
 | 
6
++++++
M
variants/ccx-x86_64/lnstools:bootstrap
 | 
5
++++-
M
variants/ccx-x86_64/pthbs-sandbox-rootns
 | 
2
+-
M
variants/ccx-x86_64/sandbox_rootns.environment
 | 
6
+++---
M
variants/root-x86_64/lnstools:bootstrap
 | 
5
++++-
M
variants/root-x86_64/pthbs-sandbox-rootns
 | 
2
+-
M
variants/root-x86_64/sandbox_rootns.environment
 | 
6
+++---

8 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/commitlist.sha1 b/commitlist.sha1
@@ -1773,7 +1773,7 @@ cf90fc56dcb91d473a08582239bfdf941ef1e10b  sources/libelf
 e12821ffb205f41fa8319ad109762a06e121c141  sources/libelf
 fd2af33bd4b64be5221116f85dcf4cd220eb9a1c  sources/libelf
 a0935155f8491fc179f94e8b9e2f571f3dae8c6d  sources/lnstools
-aa5b18e25764291a1b23976fad0bb49182daba75  sources/lnstools
+c3838c58b485225753db7b0db5a0bc6eb9fdd9ce  sources/lnstools
 409db79b3e7e5fc6b73305471d9bbb6ac5c14036  sources/logincaps
 41039418205b48bda59372fb7c49453852853e8a  sources/logincaps
 790ee186578248e585dec9278f9ce627cc8bf12f  sources/logincaps
diff --git a/templates/pkg/lnstools:bootstrap b/templates/pkg/lnstools:bootstrap
@@ -16,6 +16,8 @@ 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}}"
+export CFLAGS="-D_GNU_SOURCE -Werror -pipe -std=c11 -fno-exceptions -Og -g"
+
 sh ./configure --enable-absolute-paths \
 	--prefix="$prefix" \
 	--bindir="${prefix}/{{bindir}}" \
@@ -24,6 +26,10 @@ sh ./configure --enable-absolute-paths \
 	--dynlibdir="${prefix}/{{dynlibdir}}"
 
 {% endblock configure -%}
+{% block install -%}
+{{- super() -}}
+cp build/bin-static/lns-lockdown "$dest"/{{bindir|shesc}}/
+{% endblock install -%}
 {% block genlinks_begin %}
 	x["./{{bindir}}/lns-lockdown"]=1
 	x["./{{bindir}}/lns-envuidgid"]=1
diff --git a/variants/ccx-x86_64/lnstools:bootstrap b/variants/ccx-x86_64/lnstools:bootstrap
@@ -7,7 +7,7 @@
 #+skalibs.aa1a1d6ac1c046c0201b2d61dbbaa3e6313c3c2117f54fa2a6351338adbeec25
 #+execline.f0d5fd261c97ee998dd0eca0d624184330449c1664f2c2747d34f72125be0d20
 #+libcap.44590f4a6fbad087709fa36100a20382abc3980d16674b68a07bc4848f7ee6fd
-#@git:a0935155f8491fc179f94e8b9e2f571f3dae8c6d:lnstools
+#@git:c3838c58b485225753db7b0db5a0bc6eb9fdd9ce:lnstools
 
 
 # - build script start -
@@ -20,6 +20,8 @@ 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"
+export CFLAGS="-D_GNU_SOURCE -Werror -pipe -std=c11 -fno-exceptions -Og -g"
+
 sh ./configure --enable-absolute-paths \
 	--prefix="$prefix" \
 	--bindir="${prefix}/command" \
@@ -32,6 +34,7 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
 make DESTDIR="$pthbs_destdir" install
 
+cp build/bin-static/lns-lockdown "$dest"/'command'/
 
 
 
diff --git a/variants/ccx-x86_64/pthbs-sandbox-rootns b/variants/ccx-x86_64/pthbs-sandbox-rootns
@@ -3,7 +3,7 @@
 #+busybox.e054e881b7202c51c9573fb8595b1992f877abaf41be69fbecb4fcf6a990fb1f
 #+nawk.a4fe4e83738e1cd27df70916845a9e4a2b4b09a7c4088247368a95568ef0e50d
 #+execline.f0d5fd261c97ee998dd0eca0d624184330449c1664f2c2747d34f72125be0d20
-#+lnstools.e0267b6eb01c020633baab5330ab1491e5ed3f752860499e2cdbd95a427d8964
+#+lnstools.cf0d59d28221b583588349573f590e364a069674ac9be95b05098480520f50cf
 #+sandbox_rootfs.e13b8b7146e2073c551d0cb14205e0e8d1f2e51cb53ffd505e42c2914d6e3692
 #@sha256:b85634a91129f85a5aad5cae51d4084dd7ce62544b5585f0899058576c16451f:abspaths.awk
 #@sha256:0fb30f66e4b58fd8ffc2027b1aae646fa7583d3d72136a7d1e7c6c498b93cf1e:sandbox-rootns.in
diff --git a/variants/ccx-x86_64/sandbox_rootns.environment b/variants/ccx-x86_64/sandbox_rootns.environment
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+lnstools.e0267b6eb01c020633baab5330ab1491e5ed3f752860499e2cdbd95a427d8964
+#+lnstools.cf0d59d28221b583588349573f590e364a069674ac9be95b05098480520f50cf
 #+busybox.e054e881b7202c51c9573fb8595b1992f877abaf41be69fbecb4fcf6a990fb1f
 #+execline.f0d5fd261c97ee998dd0eca0d624184330449c1664f2c2747d34f72125be0d20
 #+sandbox_rootfs.e13b8b7146e2073c551d0cb14205e0e8d1f2e51cb53ffd505e42c2914d6e3692
-#+pthbs-sandbox-rootns.1e705fa516bf43ca4b4c25798b8c8d5a12d678c67efbb7acd0d281fa7fdaff36-
\ No newline at end of file
+#+pthbs-sandbox-rootns.5ef9fb1fe881863b7c6f8cd86814dd7605fe4a48fe26fcee7a7779300a38e8b9+
\ No newline at end of file
diff --git a/variants/root-x86_64/lnstools:bootstrap b/variants/root-x86_64/lnstools:bootstrap
@@ -7,7 +7,7 @@
 #+skalibs.9aac2d0d86eb109f7ce76addc41854efb28147e8fe6787eaac3927918ed64bb4
 #+execline.47f2b5c1e3b324c416a0cd6c4033b64f003ab38d9afdc546db46025e944cb07f
 #+libcap.11e733a976a28ce39cae0b79975cb598d6021f1c9751ec088484e21c0d3483af
-#@git:a0935155f8491fc179f94e8b9e2f571f3dae8c6d:lnstools
+#@git:c3838c58b485225753db7b0db5a0bc6eb9fdd9ce:lnstools
 
 
 # - build script start -
@@ -20,6 +20,8 @@ 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"
+export CFLAGS="-D_GNU_SOURCE -Werror -pipe -std=c11 -fno-exceptions -Og -g"
+
 sh ./configure --enable-absolute-paths \
 	--prefix="$prefix" \
 	--bindir="${prefix}/command" \
@@ -32,6 +34,7 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
 make DESTDIR="$pthbs_destdir" install
 
+cp build/bin-static/lns-lockdown "$dest"/'command'/
 
 
 
diff --git a/variants/root-x86_64/pthbs-sandbox-rootns b/variants/root-x86_64/pthbs-sandbox-rootns
@@ -3,7 +3,7 @@
 #+busybox.95a5f0b11c8542c83e37cdfbee23575e7e71563c72e1bb56f21d65491caf164f
 #+nawk.0e97cfaaf79609f84a31f147158175dce35df4cd0d22b2da14be539766e50ecb
 #+execline.47f2b5c1e3b324c416a0cd6c4033b64f003ab38d9afdc546db46025e944cb07f
-#+lnstools.be75dd78d3b79dbb7aad9b8eb1bcf18f1b374ce9ebf05737ecac374d2ab1eff6
+#+lnstools.635355f9b5f12644eb7b7e284291c7587f36e7dc8ab8fc74329efdfd15051809
 #+sandbox_rootfs.62c49843190280789889f914dbd06de0ea99a0a9313866fcbb1beb07f3884664
 #@sha256:b85634a91129f85a5aad5cae51d4084dd7ce62544b5585f0899058576c16451f:abspaths.awk
 #@sha256:0fb30f66e4b58fd8ffc2027b1aae646fa7583d3d72136a7d1e7c6c498b93cf1e:sandbox-rootns.in
diff --git a/variants/root-x86_64/sandbox_rootns.environment b/variants/root-x86_64/sandbox_rootns.environment
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+lnstools.be75dd78d3b79dbb7aad9b8eb1bcf18f1b374ce9ebf05737ecac374d2ab1eff6
+#+lnstools.635355f9b5f12644eb7b7e284291c7587f36e7dc8ab8fc74329efdfd15051809
 #+busybox.95a5f0b11c8542c83e37cdfbee23575e7e71563c72e1bb56f21d65491caf164f
 #+execline.47f2b5c1e3b324c416a0cd6c4033b64f003ab38d9afdc546db46025e944cb07f
 #+sandbox_rootfs.62c49843190280789889f914dbd06de0ea99a0a9313866fcbb1beb07f3884664
-#+pthbs-sandbox-rootns.4e97046d79db172b7b0545fe63bc1eb8b92b4350d865c1906b8ab168914106dc-
\ No newline at end of file
+#+pthbs-sandbox-rootns.777bbe9b6468b4f1cfb1dedda1296d3d42ce9e97c84e34b4681ff9318e15430e+
\ No newline at end of file