commit 9c26a17a43104539b3c5efa35615bba116d75a6f
parent c7534ca4c7660ed79aeb39fa5d69d4d95f86b792
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Fri, 4 Jul 2025 14:48:16 +0000
update mrrl
Diffstat:
19 files changed, 35 insertions(+), 32 deletions(-)
diff --git a/templates/pkg/abduco b/templates/pkg/abduco
@@ -4,6 +4,7 @@
{%- endblock %}
{% block at_script %}
+CFLAGS=-fPIE
autotools_static abduco
check_static command/abduco
diff --git a/variants/ccx-x86_64/abduco b/variants/ccx-x86_64/abduco
@@ -57,6 +57,7 @@ check_static() {
}
+CFLAGS=-fPIE
autotools_static abduco
check_static command/abduco
diff --git a/variants/ccx-x86_64/container-bin-image b/variants/ccx-x86_64/container-bin-image
@@ -8,7 +8,7 @@
#+applyuidgid-caps.9856a13db04a0f0192c4208744de2c649db2ae721dc0d0dd37eb90346236a514
#+easyseccomp.6631f58c9fe090f2b2becc5ac606901736aba4ad2a0075f6402bec85eaa3df7b
#+mlog.a63c78a5967e11f6fcac02b7eced93c023b82172f901e0f3929fad33b591f676
-#+abduco.8e1135222b370bdb37ccf661002db1ff2d4a896150f055ab6c7eae3fd4693705
+#+abduco.712f5d87848f5e74d5fbf1aac120f96d7271fcbacc94e20c3ae1026c7e2c4b62
#@sha256:b9236c0fd504ffbc56f65d0522d2acadcd2683380eaa6f1873e8201eaa7388a5:default-policy.easyseccomp
img="$pthbs_destdir/home/ccx/versions/$pthbs_package/container-bin-image"
diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers
@@ -6,7 +6,7 @@
#+alpine-keys.dedc78b0b50e461d33a449adf40691698925b5eb9af8a6b69e7c0ece6b708ef4
#+apk-tools.e556b101ee41fc88c653ea4a9c405942ce921c65d378def15c77fd19aec3beaf
#+xbps.a8e42fa55614db5c7453b7513e917b19070a71abb801ef22cff7ef004e13241b
-#+container-bin-image.204d1b27e4e38113332984c800c77ac8f899eb54ec6563ba44c617a401eed565
+#+container-bin-image.07d85e6a6520ecca60c1709430ffbbf5b29a460aa6bd4af494b6a362059bb6ab
#@git:5d2b98a3c54b6f142b80773e4a18dea3749bfea6:containers
: ${JOBS:=1}
@@ -58,9 +58,9 @@ for f in '/home/ccx/versions/xbps.a8e42fa55614db5c7453b7513e917b19070a71abb801ef
ln -sf "$f" "$pkgdir/deps/keys/void/"
done
-test -d '/home/ccx/versions/container-bin-image.204d1b27e4e38113332984c800c77ac8f899eb54ec6563ba44c617a401eed565/container-bin-image'
-test -f '/home/ccx/versions/container-bin-image.204d1b27e4e38113332984c800c77ac8f899eb54ec6563ba44c617a401eed565/container-bin-image/if'
-ln -sf '/home/ccx/versions/container-bin-image.204d1b27e4e38113332984c800c77ac8f899eb54ec6563ba44c617a401eed565/container-bin-image' "$pkgdir/deps/"
+test -d '/home/ccx/versions/container-bin-image.07d85e6a6520ecca60c1709430ffbbf5b29a460aa6bd4af494b6a362059bb6ab/container-bin-image'
+test -f '/home/ccx/versions/container-bin-image.07d85e6a6520ecca60c1709430ffbbf5b29a460aa6bd4af494b6a362059bb6ab/container-bin-image/if'
+ln -sf '/home/ccx/versions/container-bin-image.07d85e6a6520ecca60c1709430ffbbf5b29a460aa6bd4af494b6a362059bb6ab/container-bin-image' "$pkgdir/deps/"
cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
find -type d -o -print | awk -F/ '
diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment
@@ -7,7 +7,7 @@
#+s6-linux-utils.1990b55837ff2c28a81500d80292c6d530c8516347eb896007eb5aed2af6c425
#+zsh.f79a20125b2f520d3719411e6f0895cf4f2e0657565c3fef07b3069436b8960f
#+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a
-#+containers.8ced910e4bc00cc040d6728dca412c1f267d838f9b7b64415eeaa28385aa5b46
+#+containers.214245b4a765becd40c2644dc4e6f297981a470b790e2fff9ad6e1d8a17f937c
#+xbps.a8e42fa55614db5c7453b7513e917b19070a71abb801ef22cff7ef004e13241b
#+zstd.8b11bd81c450d61aa6a44ffd019654c590439df68ebd8987db4cdbbcf182d67c
#+apk-tools.e556b101ee41fc88c653ea4a9c405942ce921c65d378def15c77fd19aec3beaf
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -21,7 +21,7 @@
#+pthbs-banginstall.7ddbf08ba8b1298841fad793d4ed7ba4979b9346155195489fc5e492ed5f0fe2
#+aat.0698d0082830b7f8bcf3840f3f8c25382ef2d9f174dd6d5407c5e2132d1f16e4
#+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a
-#+containers.8ced910e4bc00cc040d6728dca412c1f267d838f9b7b64415eeaa28385aa5b46
+#+containers.214245b4a765becd40c2644dc4e6f297981a470b790e2fff9ad6e1d8a17f937c
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
#+logincaps.96263bd64a359697fe7dc6343af26a7e3d535be97cb52f6010b575e05165dbf5
#+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7
@@ -38,8 +38,8 @@
#+user-env.4e95a5387aa403e1d16a22254f21fb4cec046c69341a5eae764dd8126fb638a8
#+strace.53097be3dbf67dbf52aa675a59980a7d965fd8cdf965ef3005035e70fc7e4103
#+mlog.a63c78a5967e11f6fcac02b7eced93c023b82172f901e0f3929fad33b591f676
-#+system-config.efdfe3203c4372834a33aefe83950ccf75cb52f1606786476285417cb5ff6dd9
-#+system-config-rc.96fae97ca0e211d5ddab7834bced87c6df46d2350f2437fa5d7dac90e99c5fad
+#+system-config.7b2cc1912910aff43128906a76dd65990f05e7b244945b02289c9d862e20395d
+#+system-config-rc.baf01084db48d569bcf7710ab3758975a324860bd6562d2903227d5d1fd39a96
#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.5c668fb509a6589604b293cade6db624c162554f3dcd0bc7bbbcb8f5f273e091
+#+system-config-init.1f7958f258f14b97f9fc8f30b30040b6ba8415b2db24f973b51e26c58d26dcc4
#+system-config-zsh.c909db48540806e61eebed4572b594f9bb32b7c3db277e7c8967b652599bf80c
\ No newline at end of file
diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config
@@ -52,7 +52,7 @@ printf '%s\n' >config/etc/skel/loginexec \
chmod +x config/etc/skel/loginexec
env 'pthbs_path_system-config'="$prefix" \
- 'pthbs_path_containers=/home/ccx/versions/env.b4c631ae56742a28848808bb13809684b608c695fa24bc94a8b7a8dafad0a6d9' \
+ 'pthbs_path_containers=/home/ccx/versions/env.aa345ab7c00f2103c882548a06fadb0052607c8559958256daa78c2a5cc7f193' \
'pthbs_path_mdevd=/home/ccx/versions/env.5049027ea8b6b4d373e16aadd3cdc63a940582ff297656e395f2131eef181671' \
make -j${JOBS:-1} -l$((1+${JOBS:-1})) all
diff --git a/variants/ccx-x86_64/system-config-init b/variants/ccx-x86_64/system-config-init
@@ -5,9 +5,9 @@
#+s6-portable-utils.1b8fd31be72bfe84afb28c3dfff03b1fc45121d11fc85f79c90f085fe61bc132
#+s6-linux-init.cd3e307b62e7dde98e1572eed297bd544e888d2589d4c1e7fd79271c4078ddf2
#+execline.1505a32c24aa5dbf362550f39283c9ff1936e717e5a82d220f8212cd9e604d8f
-#+system-config-rc.96fae97ca0e211d5ddab7834bced87c6df46d2350f2437fa5d7dac90e99c5fad
+#+system-config-rc.baf01084db48d569bcf7710ab3758975a324860bd6562d2903227d5d1fd39a96
-s6rcdb=/home/ccx/versions/system-config-rc.96fae97ca0e211d5ddab7834bced87c6df46d2350f2437fa5d7dac90e99c5fad/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.baf01084db48d569bcf7710ab3758975a324860bd6562d2903227d5d1fd39a96/config/s6-rc-db
prefix=/home/ccx/versions/$pthbs_package
pkgdir="$pthbs_destdir/$prefix"
diff --git a/variants/ccx-x86_64/system-config-rc b/variants/ccx-x86_64/system-config-rc
@@ -3,7 +3,7 @@
#+busybox-diffutils.c2ebcfcad050ad71b8e30322a463b5c009f254c7a42e95c627d32665e17134dc
#+s6-rc.fecfa43aebb0615904e0e120b9ce8c0596c9b6c577611cbadc8fbaca75196ed9
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
-#+system-config.efdfe3203c4372834a33aefe83950ccf75cb52f1606786476285417cb5ff6dd9
+#+system-config.7b2cc1912910aff43128906a76dd65990f05e7b244945b02289c9d862e20395d
def_prefix() {
prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/home/ccx/versions/system-config.efdfe3203c4372834a33aefe83950ccf75cb52f1606786476285417cb5ff6dd9/config/s6-rc-source
+src=/home/ccx/versions/system-config.7b2cc1912910aff43128906a76dd65990f05e7b244945b02289c9d862e20395d/config/s6-rc-source
s6-rc-compile ./s6-rc-db "$src"
mkdir -p "$dest/config"
mv -v s6-rc-db "$dest/config/"
diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment
@@ -21,7 +21,7 @@
#+pthbs-banginstall.7ddbf08ba8b1298841fad793d4ed7ba4979b9346155195489fc5e492ed5f0fe2
#+aat.0698d0082830b7f8bcf3840f3f8c25382ef2d9f174dd6d5407c5e2132d1f16e4
#+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a
-#+containers.8ced910e4bc00cc040d6728dca412c1f267d838f9b7b64415eeaa28385aa5b46
+#+containers.214245b4a765becd40c2644dc4e6f297981a470b790e2fff9ad6e1d8a17f937c
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
#+logincaps.96263bd64a359697fe7dc6343af26a7e3d535be97cb52f6010b575e05165dbf5
#+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7
diff --git a/variants/root-x86_64/abduco b/variants/root-x86_64/abduco
@@ -57,6 +57,7 @@ check_static() {
}
+CFLAGS=-fPIE
autotools_static abduco
check_static command/abduco
diff --git a/variants/root-x86_64/container-bin-image b/variants/root-x86_64/container-bin-image
@@ -8,7 +8,7 @@
#+applyuidgid-caps.2d571b717bda734b4464e7d3b36bb2c9eaa265fffd595bc090cbb137258121b8
#+easyseccomp.a69f369af91163a534bf0d1bf51c74cd98c971d7eb5f61c2ee29afb6ba7a9344
#+mlog.3a2fb37a92813d4c8700d3f9eb95753b0f2b72d5de13f03ba2f52fc0732ac487
-#+abduco.2017394a52c2d1111f23e9c8dca5dba8fc2feacf37b823ba91acc7d1c26327f4
+#+abduco.bc41d7c7f8769f42bb371c45f5a96e32830b9ea4a468113e40dd149287598416
#@sha256:b9236c0fd504ffbc56f65d0522d2acadcd2683380eaa6f1873e8201eaa7388a5:default-policy.easyseccomp
img="$pthbs_destdir/versions/$pthbs_package/container-bin-image"
diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers
@@ -6,7 +6,7 @@
#+alpine-keys.4ecd9fac6efcc329a98af1b0b1318771a77eb83ac10832c6e769ebf11c14cae1
#+apk-tools.c38f943bab7fe83e4c5e2c1029b587565e70bcc76cf96e55232e29a13d42b5fa
#+xbps.f860fd980433f32edb85953f72c3d3f50872ad6f9cfb4e7a0cfa5b9529a3ae6d
-#+container-bin-image.acc223944acafe44ea9d8b904f92e273bdef31d2e1aba312deb9eea8073a0b5b
+#+container-bin-image.e7e9449a9dd9f429004a1f613eea341f1fce66c4a93ddd9a20641e45e0e84e79
#@git:5d2b98a3c54b6f142b80773e4a18dea3749bfea6:containers
: ${JOBS:=1}
@@ -58,9 +58,9 @@ for f in '/versions/xbps.f860fd980433f32edb85953f72c3d3f50872ad6f9cfb4e7a0cfa5b9
ln -sf "$f" "$pkgdir/deps/keys/void/"
done
-test -d '/versions/container-bin-image.acc223944acafe44ea9d8b904f92e273bdef31d2e1aba312deb9eea8073a0b5b/container-bin-image'
-test -f '/versions/container-bin-image.acc223944acafe44ea9d8b904f92e273bdef31d2e1aba312deb9eea8073a0b5b/container-bin-image/if'
-ln -sf '/versions/container-bin-image.acc223944acafe44ea9d8b904f92e273bdef31d2e1aba312deb9eea8073a0b5b/container-bin-image' "$pkgdir/deps/"
+test -d '/versions/container-bin-image.e7e9449a9dd9f429004a1f613eea341f1fce66c4a93ddd9a20641e45e0e84e79/container-bin-image'
+test -f '/versions/container-bin-image.e7e9449a9dd9f429004a1f613eea341f1fce66c4a93ddd9a20641e45e0e84e79/container-bin-image/if'
+ln -sf '/versions/container-bin-image.e7e9449a9dd9f429004a1f613eea341f1fce66c4a93ddd9a20641e45e0e84e79/container-bin-image' "$pkgdir/deps/"
cd "$pthbs_destdir/versions/$pthbs_package"
find -type d -o -print | awk -F/ '
diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment
@@ -7,7 +7,7 @@
#+s6-linux-utils.f7e0654375f11beedafd731ad1dd66c0de8d03452bb8e38bb647cc51cc3adb2e
#+zsh.4ac9e4166454e8d60c15837b7ca4938abe99db029b3fffa11b1cfd54d40ae09b
#+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf
-#+containers.e369418ff1c24632e5ed2f09c6cafe1e9604bedd8a16fa22f850a00fe1b3666f
+#+containers.d61c8c314af24f1ed988cb5fe7b7c37e1791cad4f7e774243996378e2ee764e1
#+xbps.f860fd980433f32edb85953f72c3d3f50872ad6f9cfb4e7a0cfa5b9529a3ae6d
#+zstd.a83f72c5953bd6b7afc171528a503710b3144bf9197961833fd27926b0a18137
#+apk-tools.c38f943bab7fe83e4c5e2c1029b587565e70bcc76cf96e55232e29a13d42b5fa
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -21,7 +21,7 @@
#+pthbs-banginstall.30ed98ef3fedfb6b25b3f58c27e845f123a22a756b37a5cd75764315bba23571
#+aat.9432aa485263e75ca3e43d6511c561a9cd328c417ebe26b890ed4a8061fee06f
#+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf
-#+containers.e369418ff1c24632e5ed2f09c6cafe1e9604bedd8a16fa22f850a00fe1b3666f
+#+containers.d61c8c314af24f1ed988cb5fe7b7c37e1791cad4f7e774243996378e2ee764e1
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+logincaps.81ffbb96fbc3c630eda5e1bb2249d6691f0fba11821f56c08ce3c42cbf186620
#+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5
@@ -38,8 +38,8 @@
#+user-env.8ad55eebe32b11f005f7b5c6dc204fdccc0a53cd7294f87c1e959ea47793dbca
#+strace.ce1707d2cf1dfcd965827af80a18c6b97ca20b563b8967be8297322e8adf9296
#+mlog.3a2fb37a92813d4c8700d3f9eb95753b0f2b72d5de13f03ba2f52fc0732ac487
-#+system-config.9ae3fa93c7aeded28de50659501acdd07d000cfd75e023061c662a1ec77eb909
-#+system-config-rc.b7c0a933167d618125dc98cb2036c51056a225e1b4a1f4a1c7d27512d2750a4b
+#+system-config.2dc3d7355d831ddcf9aba1ff5845a9c69566709ad60e0471e501b150e601f3c8
+#+system-config-rc.3b0539a6806724d7b336f54b5b6ce3e6b03a996207f04091f4ee4536479f03dc
#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.9ff90bf13039a91692842d8a2826e408e0bcce911c4aa13ddfc745095d84e0a7
+#+system-config-init.8d8ca17775df97da8423379dd562d65c07ad7b6811b2fe0a2b8777129dd6a4a5
#+system-config-zsh.ed06489518be3fe07b081034705aaa1c35af0c2604cf52f5ad4c59713352b220
\ No newline at end of file
diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config
@@ -52,7 +52,7 @@ printf '%s\n' >config/etc/skel/loginexec \
chmod +x config/etc/skel/loginexec
env 'pthbs_path_system-config'="$prefix" \
- 'pthbs_path_containers=/versions/env.0e588950e96ec0d382aa4facad10d60eee4865a9e5eb194f89f50116fe4e53c2' \
+ 'pthbs_path_containers=/versions/env.1b5d0863ade37cc1a97b932b0a26b9d5b2758379ddc18f408cf604250b6daecf' \
'pthbs_path_mdevd=/versions/env.699c310193b7957c8ec17e16d6846443f99c198e3e2ce6425066f4523de2cf1e' \
make -j${JOBS:-1} -l$((1+${JOBS:-1})) all
diff --git a/variants/root-x86_64/system-config-init b/variants/root-x86_64/system-config-init
@@ -5,9 +5,9 @@
#+s6-portable-utils.f6171ad521d6be72875f1d5c1b28f966662ba93cfe5790e1ef010f9e76211bc3
#+s6-linux-init.8fbed3537ce9accc1a31e36f4648d1a0df0f1d155fcfa8fb5b1079786cf1442c
#+execline.c89bee1b1207461afa2d2ab9250f0940a2a6bbca3e45bdd60037049a75f4adf9
-#+system-config-rc.b7c0a933167d618125dc98cb2036c51056a225e1b4a1f4a1c7d27512d2750a4b
+#+system-config-rc.3b0539a6806724d7b336f54b5b6ce3e6b03a996207f04091f4ee4536479f03dc
-s6rcdb=/versions/system-config-rc.b7c0a933167d618125dc98cb2036c51056a225e1b4a1f4a1c7d27512d2750a4b/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.3b0539a6806724d7b336f54b5b6ce3e6b03a996207f04091f4ee4536479f03dc/config/s6-rc-db
prefix=/versions/$pthbs_package
pkgdir="$pthbs_destdir/$prefix"
diff --git a/variants/root-x86_64/system-config-rc b/variants/root-x86_64/system-config-rc
@@ -3,7 +3,7 @@
#+busybox-diffutils.4a0933977737282afcd82b39d435b50946a700fe13472d24e4580a41fa852123
#+s6-rc.c131bb99b2054bcd9705c5a5652822938265a8587a54d2894667b8b620815c7f
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
-#+system-config.9ae3fa93c7aeded28de50659501acdd07d000cfd75e023061c662a1ec77eb909
+#+system-config.2dc3d7355d831ddcf9aba1ff5845a9c69566709ad60e0471e501b150e601f3c8
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.9ae3fa93c7aeded28de50659501acdd07d000cfd75e023061c662a1ec77eb909/config/s6-rc-source
+src=/versions/system-config.2dc3d7355d831ddcf9aba1ff5845a9c69566709ad60e0471e501b150e601f3c8/config/s6-rc-source
s6-rc-compile ./s6-rc-db "$src"
mkdir -p "$dest/config"
mv -v s6-rc-db "$dest/config/"
diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment
@@ -21,7 +21,7 @@
#+pthbs-banginstall.30ed98ef3fedfb6b25b3f58c27e845f123a22a756b37a5cd75764315bba23571
#+aat.9432aa485263e75ca3e43d6511c561a9cd328c417ebe26b890ed4a8061fee06f
#+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf
-#+containers.e369418ff1c24632e5ed2f09c6cafe1e9604bedd8a16fa22f850a00fe1b3666f
+#+containers.d61c8c314af24f1ed988cb5fe7b7c37e1791cad4f7e774243996378e2ee764e1
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+logincaps.81ffbb96fbc3c630eda5e1bb2249d6691f0fba11821f56c08ce3c42cbf186620
#+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5
