commit 7e6994a3b4d96c75bfb0119f249e62355cbf9fd8
parent 56a86c5e8479ed85c8a616d555a4d5bbfb4620a2
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Sun, 26 Oct 2025 23:07:07 +0000
disable parallel make for libcap
Diffstat:
21 files changed, 49 insertions(+), 45 deletions(-)
diff --git a/templates/pkg/libcap b/templates/pkg/libcap
@@ -19,7 +19,11 @@ build_env_static
{% endblock %}
{% block build_and_install -%}
-{{make}} \
+{# likely race, disabling parallel make:
+./_makenames > cap_names.h
+sh: line 0: ./_makenames: Text file busy
+-#}
+make -j1 \
DESTDIR="$pthbs_destdir" \
SHARED=no DYNAMIC=no LIBCSTATIC=yes \
prefix="$prefix" \
diff --git a/variants/ccx-x86_64/applyuidgid-caps b/variants/ccx-x86_64/applyuidgid-caps
@@ -4,7 +4,7 @@
#+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b
#+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f
#+skalibs.9bcaae5f66b172ce64f9c640a4f1e0f6c4602a3192ede08d81954dec77b2df92
-#+libcap.31173ce395c6aaf52fe0529e5eb660ab4b9d0866aba37ed507c5ba01a0ead294
+#+libcap.edaeb61cf445dc9f4a4f1af73ab3d5994f08fac16339e75cf84c713b1079eb3d
#@sha256:818a5ad7061ab1a740a5c2e7d7d8cdcc7be7e84e3f04b479731cf94ff1f1d093:applyuidgid-caps.c
diff --git a/variants/ccx-x86_64/container-bin-image b/variants/ccx-x86_64/container-bin-image
@@ -5,7 +5,7 @@
#+execline.749fa9922ca7a4c505ca1b2c001625d161085c37c5ea75585fbddb321558157a
#+s6.aba44e80074ee5ae8921a773c04c3f2433945ad5566cb986e3edc5fe5c5600cf
#+ccx-utils.ff0ba3fc3db06a0bbee9cfc410b7894b7d06c158e35b01162f46f6ece9e2dbdf
-#+applyuidgid-caps.ae436eaf36cdf15c774a65852d52d59a7d6dae39814d75af2fb488ca6f2a98f6
+#+applyuidgid-caps.7ac897e14684b8eebb110eded4e7759c67326a1c20b8ff62e1ada4176333e191
#+easyseccomp.7dee370789a91260dda4d92a1fb85c8e71126b902ca57baea6a2350ea8ab5a4d
#+mlog.d3f90010a808d81d0e4e26efefd0b2325b395fd1b011f1d94cdc0be1cb017339
#+abduco.e426fc1d139e8bfcfd6ebd986ac28b8d62bff115bdc379ad9c84b4bc97024065
diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers
@@ -8,7 +8,7 @@
#+alpine-keys.58180943d1e4712df08cb1eae2454fafcf543d90ac169c524e84eef81df9af01
#+apk-tools.45eb1e70cdc4977e1c9c965f392b2a54e7b1b77485fdaf695d381dd062842d18
#+xbps.c27da8d06944b4584d922e84f3587e0507b59fb9b0bfd799d883551514b2ca24
-#+container-bin-image.9716d81e790c600fc3fcebccb848e9f1d53040f24becdf2480c3f301a6d027d3
+#+container-bin-image.50bb9f9cd0442b0c6968d62e6eb7e9f53dc527705139e8a89a67dc0861bdee29
#@git:8ec212c9411088ad7e116e330d6a33f68c539678:containers
@@ -66,9 +66,9 @@ for f in '/home/ccx/versions/xbps.c27da8d06944b4584d922e84f3587e0507b59fb9b0bfd7
ln -sf "$f" "${dest}/deps/keys/void/"
done
-test -d '/home/ccx/versions/container-bin-image.9716d81e790c600fc3fcebccb848e9f1d53040f24becdf2480c3f301a6d027d3/container-bin-image'
-test -f '/home/ccx/versions/container-bin-image.9716d81e790c600fc3fcebccb848e9f1d53040f24becdf2480c3f301a6d027d3/container-bin-image/if'
-ln -sf '/home/ccx/versions/container-bin-image.9716d81e790c600fc3fcebccb848e9f1d53040f24becdf2480c3f301a6d027d3/container-bin-image' "${dest}/deps/"
+test -d '/home/ccx/versions/container-bin-image.50bb9f9cd0442b0c6968d62e6eb7e9f53dc527705139e8a89a67dc0861bdee29/container-bin-image'
+test -f '/home/ccx/versions/container-bin-image.50bb9f9cd0442b0c6968d62e6eb7e9f53dc527705139e8a89a67dc0861bdee29/container-bin-image/if'
+ln -sf '/home/ccx/versions/container-bin-image.50bb9f9cd0442b0c6968d62e6eb7e9f53dc527705139e8a89a67dc0861bdee29/container-bin-image' "${dest}/deps/"
diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment
@@ -7,7 +7,7 @@
#+s6-linux-utils.664dc33ed8e500126bfb4e74c565990e8632879b9e165b09f7f48ac054c89a22
#+zsh.7a73a1599d87b3e354a0e58e4119f89b71fb053e261e36802af49d80ce8d9ba1
#+confz.f5eca9ab19f09818cfcd46267b61b488344983b0931114b597ad1238173fafcf
-#+containers.b86bfdad640b9b38784b005b66964cae12470c83a9d31f29ab8322607b92d7f5
+#+containers.7b89f1f80f4da4e9150def15bd5ec1ca198e7e9cc24d2ecb25eddcad6260a5b0
#+xbps.c27da8d06944b4584d922e84f3587e0507b59fb9b0bfd799d883551514b2ca24
#+zstd.3aa7a31b787480effc16a34130b5199a5160b690d71ef0912b080d71e6031e88
#+apk-tools.45eb1e70cdc4977e1c9c965f392b2a54e7b1b77485fdaf695d381dd062842d18
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -21,7 +21,7 @@
#+pthbs-banginstall.47e87f044eea270225da61ee7d709e01b2e6385fee494566c647cddac19e0592
#+aat.ce323557b768bcc986fbb1557fda1309637474ccd8b9b5e4c4a56ba56634d75a
#+confz.f5eca9ab19f09818cfcd46267b61b488344983b0931114b597ad1238173fafcf
-#+containers.b86bfdad640b9b38784b005b66964cae12470c83a9d31f29ab8322607b92d7f5
+#+containers.7b89f1f80f4da4e9150def15bd5ec1ca198e7e9cc24d2ecb25eddcad6260a5b0
#+fileset.c9ce28ff816e023243d76d1bcb4d2b732f6b1f89c0cb9df15c1fd73880896a07
#+logincaps.de7defec936b2f4498a2010578eb507abfa6f48d6c51d0b64a9ada67cce50335
#+snaprep.c16cd20ecb28f90d83b6963a32a6f01f964fe5b99e75d7f3d9f0d2258899c26a
@@ -32,16 +32,16 @@
#+getent.2608d23855b8d871fc65438dcc9889a93095bf0131f55045e517e037243898f1
#+getconf.3f6e9e56867c13fc1f1bc3a95e692c675500944f94bd0726e34ee010d8213697
#+iconv.0618baa01d98a1805b5ff362de984adfca782727cfe5335327341c376a8c3602
-#+libcap.31173ce395c6aaf52fe0529e5eb660ab4b9d0866aba37ed507c5ba01a0ead294
-#+applyuidgid-caps.ae436eaf36cdf15c774a65852d52d59a7d6dae39814d75af2fb488ca6f2a98f6
+#+libcap.edaeb61cf445dc9f4a4f1af73ab3d5994f08fac16339e75cf84c713b1079eb3d
+#+applyuidgid-caps.7ac897e14684b8eebb110eded4e7759c67326a1c20b8ff62e1ada4176333e191
#+ccx-utils.ff0ba3fc3db06a0bbee9cfc410b7894b7d06c158e35b01162f46f6ece9e2dbdf
#+user-env.9b736d39c3f3ad6e2d5d7e1d3fb52d8c5667c48474062ce09c784c59edacacc6
#+strace.24f817d87229531d5a2218f804224619ed7635b8f847c96ccb8f8926478b144a
#+mlog.d3f90010a808d81d0e4e26efefd0b2325b395fd1b011f1d94cdc0be1cb017339
#+findutils.c80b9056e275f82f7d371a44035a3c11dd43faae948a696f9cea0cd681b76aef
#+nawk.24907cbb8100b37ab37723f0335e79103b0135b8ae6175e179b145bbdbe500e0
-#+system-config.666a6136a0079e4123e3743ebfe1ece94f13c75cc921d0e88959d930fd3cd647
-#+system-config-rc.57d98587650319f6fa5a37572bd6f827808f2290fc8d9133b9c0efbe6d7ec2b9
+#+system-config.be4df1697fa94aeb653f4ec1de670828e238e040533b8b142bfa1fc98ac43a8f
+#+system-config-rc.b3ebcc0facfbde3c5262ba850559a611d20e03d53e5d21732be7e27e940071fe
#+system-config-scripts.6080239044e6d330a6ea9e01625ca9d04971775d95bfc60a336235e0a4b1d743
-#+system-config-init.64603fa7f99ae2f484a3d512eb04ef03fbac7845b793d5d8fbf6b2de00d7b57e
+#+system-config-init.3b798dfc76ca2aa7a3c1fb440722989d19788a6ec9086ba82b247863b614eb77
#+system-config-zsh.44342c96638209b72ed90af329e3f90445dd1c5f6ca837b3d735833a48d8dd34
\ No newline at end of file
diff --git a/variants/ccx-x86_64/libcap b/variants/ccx-x86_64/libcap
@@ -41,7 +41,7 @@ LDFLAGS=--static
build_env_static
-make -j${JOBS:-1} -l$((1+${JOBS:-1})) \
+make -j1 \
DESTDIR="$pthbs_destdir" \
SHARED=no DYNAMIC=no LIBCSTATIC=yes \
prefix="$prefix" \
diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config
@@ -53,7 +53,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.315a8090036d31fb8c4636efc89d3f108144fe7c5d6fbee8c3cf196c7a7d3459' \
+ 'pthbs_path_containers=/home/ccx/versions/env.71afc33c80f0417c064e6759b62c8911f446f4ce4a4a2df0c9838d73e41089f8' \
'pthbs_path_mdevd=/home/ccx/versions/env.1cc481f43e7f936fa0527b29008b34ca4c82cb10a81ffb2b908d52b23e9bedf4' \
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
@@ -7,7 +7,7 @@
#+s6-portable-utils.945ba0fbba6153923f5a761abc154568d30fc1db69b26f03ead9fe248f87d351
#+s6-linux-init.30ee852e07291b5f3c94ed4037e403122037366bcc655a87f5527f1813332d62
#+execline.749fa9922ca7a4c505ca1b2c001625d161085c37c5ea75585fbddb321558157a
-#+system-config-rc.57d98587650319f6fa5a37572bd6f827808f2290fc8d9133b9c0efbe6d7ec2b9
+#+system-config-rc.b3ebcc0facfbde3c5262ba850559a611d20e03d53e5d21732be7e27e940071fe
# - build script start -
@@ -32,7 +32,7 @@ dest=${pthbs_destdir%/}${prefix}
cd '.'
-s6rcdb=/home/ccx/versions/system-config-rc.57d98587650319f6fa5a37572bd6f827808f2290fc8d9133b9c0efbe6d7ec2b9/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.b3ebcc0facfbde3c5262ba850559a611d20e03d53e5d21732be7e27e940071fe/config/s6-rc-db
# Generate init (${dest} must not exist but parent dir does)
mkdir -p "$pthbs_destdir//home/ccx/versions"
diff --git a/variants/ccx-x86_64/system-config-rc b/variants/ccx-x86_64/system-config-rc
@@ -5,7 +5,7 @@
#+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8
#+s6-rc.77ee4f3326027d4463fb531273c8b42b4d8f6fabba2d075e15e18eb2cb2a8c50
#+fileset.c9ce28ff816e023243d76d1bcb4d2b732f6b1f89c0cb9df15c1fd73880896a07
-#+system-config.666a6136a0079e4123e3743ebfe1ece94f13c75cc921d0e88959d930fd3cd647
+#+system-config.be4df1697fa94aeb653f4ec1de670828e238e040533b8b142bfa1fc98ac43a8f
# - build script start -
@@ -15,7 +15,7 @@ dest=${pthbs_destdir%/}${prefix}
cd '.'
-src=/home/ccx/versions/system-config.666a6136a0079e4123e3743ebfe1ece94f13c75cc921d0e88959d930fd3cd647/config/s6-rc-source
+src=/home/ccx/versions/system-config.be4df1697fa94aeb653f4ec1de670828e238e040533b8b142bfa1fc98ac43a8f/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.47e87f044eea270225da61ee7d709e01b2e6385fee494566c647cddac19e0592
#+aat.ce323557b768bcc986fbb1557fda1309637474ccd8b9b5e4c4a56ba56634d75a
#+confz.f5eca9ab19f09818cfcd46267b61b488344983b0931114b597ad1238173fafcf
-#+containers.b86bfdad640b9b38784b005b66964cae12470c83a9d31f29ab8322607b92d7f5
+#+containers.7b89f1f80f4da4e9150def15bd5ec1ca198e7e9cc24d2ecb25eddcad6260a5b0
#+fileset.c9ce28ff816e023243d76d1bcb4d2b732f6b1f89c0cb9df15c1fd73880896a07
#+logincaps.de7defec936b2f4498a2010578eb507abfa6f48d6c51d0b64a9ada67cce50335
#+snaprep.c16cd20ecb28f90d83b6963a32a6f01f964fe5b99e75d7f3d9f0d2258899c26a
@@ -32,8 +32,8 @@
#+getent.2608d23855b8d871fc65438dcc9889a93095bf0131f55045e517e037243898f1
#+getconf.3f6e9e56867c13fc1f1bc3a95e692c675500944f94bd0726e34ee010d8213697
#+iconv.0618baa01d98a1805b5ff362de984adfca782727cfe5335327341c376a8c3602
-#+libcap.31173ce395c6aaf52fe0529e5eb660ab4b9d0866aba37ed507c5ba01a0ead294
-#+applyuidgid-caps.ae436eaf36cdf15c774a65852d52d59a7d6dae39814d75af2fb488ca6f2a98f6
+#+libcap.edaeb61cf445dc9f4a4f1af73ab3d5994f08fac16339e75cf84c713b1079eb3d
+#+applyuidgid-caps.7ac897e14684b8eebb110eded4e7759c67326a1c20b8ff62e1ada4176333e191
#+ccx-utils.ff0ba3fc3db06a0bbee9cfc410b7894b7d06c158e35b01162f46f6ece9e2dbdf
#+user-env.9b736d39c3f3ad6e2d5d7e1d3fb52d8c5667c48474062ce09c784c59edacacc6
#+strace.24f817d87229531d5a2218f804224619ed7635b8f847c96ccb8f8926478b144a
diff --git a/variants/root-x86_64/applyuidgid-caps b/variants/root-x86_64/applyuidgid-caps
@@ -4,7 +4,7 @@
#+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b
#+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676
#+skalibs.a26d2e6f716163365561db4c61d78907be5ed9b34cfbc9d2475962029ba39aeb
-#+libcap.419c8e85f45214e55b56b1d6e2468fb8af36538bb94518007a155ab4fe746fb0
+#+libcap.e2f548b558f389ead47900a784150f4165c128f846d2cc0c6ef9b1ee7b3da249
#@sha256:818a5ad7061ab1a740a5c2e7d7d8cdcc7be7e84e3f04b479731cf94ff1f1d093:applyuidgid-caps.c
diff --git a/variants/root-x86_64/container-bin-image b/variants/root-x86_64/container-bin-image
@@ -5,7 +5,7 @@
#+execline.c677b46c36eac37bee97ce38c09c501d27babea0737cbab9fb21a3ec9b194284
#+s6.344af4b89dee417e72484532005f0a223e20675a15daac49d498a554812bac61
#+ccx-utils.769c165236aa3bc0564901e48e65c035ab3d342564dd1a440a512347d62d4ce9
-#+applyuidgid-caps.ce9b5c150cdcec21a23e0bbf838915b1e2b2244eec1d06f9dd17e90a7dfc067e
+#+applyuidgid-caps.d4cb37c46563dc1996e3faab76bc55168f85f449771a86fed5ad520ee406e07e
#+easyseccomp.e435513c7e6178450228944c131854969d922426b8f771675aaece6867e8625a
#+mlog.f9e7afa9325b4affd4298e6de0a07d22a074799f0ea7bda1e3fb58a37b98e398
#+abduco.089653d0849acda0e1723469ed2913556b6b86a32056932b8f4069c5ceec76ae
diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers
@@ -8,7 +8,7 @@
#+alpine-keys.9903799b52320b5d6618a3e3c87cef9da76e3b5291abfe1fd563fddfd04f35ae
#+apk-tools.714e1cb8bc861dec1710a25476f209f7b0602d954f74194d58c16747c5a3ad38
#+xbps.e7b102cdf29fa99c56eeacce8ade331896a379fad11189131b0d1efb4160a454
-#+container-bin-image.4d91f1e7fff7ee915f135f919bf1f32c9c4c07a12b6e55e45cfdd8ad5e108b7c
+#+container-bin-image.963dd9b50b1afce8970fa976ad93ceb4879c665791f3fe16f499d2e351270a6b
#@git:8ec212c9411088ad7e116e330d6a33f68c539678:containers
@@ -66,9 +66,9 @@ for f in '/versions/xbps.e7b102cdf29fa99c56eeacce8ade331896a379fad11189131b0d1ef
ln -sf "$f" "${dest}/deps/keys/void/"
done
-test -d '/versions/container-bin-image.4d91f1e7fff7ee915f135f919bf1f32c9c4c07a12b6e55e45cfdd8ad5e108b7c/container-bin-image'
-test -f '/versions/container-bin-image.4d91f1e7fff7ee915f135f919bf1f32c9c4c07a12b6e55e45cfdd8ad5e108b7c/container-bin-image/if'
-ln -sf '/versions/container-bin-image.4d91f1e7fff7ee915f135f919bf1f32c9c4c07a12b6e55e45cfdd8ad5e108b7c/container-bin-image' "${dest}/deps/"
+test -d '/versions/container-bin-image.963dd9b50b1afce8970fa976ad93ceb4879c665791f3fe16f499d2e351270a6b/container-bin-image'
+test -f '/versions/container-bin-image.963dd9b50b1afce8970fa976ad93ceb4879c665791f3fe16f499d2e351270a6b/container-bin-image/if'
+ln -sf '/versions/container-bin-image.963dd9b50b1afce8970fa976ad93ceb4879c665791f3fe16f499d2e351270a6b/container-bin-image' "${dest}/deps/"
diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment
@@ -7,7 +7,7 @@
#+s6-linux-utils.2e5ac9209104c458e8935a4b4e9ce3ed6e9aa3e6c4d85675a1e945d1fe77530f
#+zsh.86584889aa0a3af405974c69ab43869f82e00acdba5340528e5dd20757f7dfc8
#+confz.953faaabf2a7a6ab4aa9b374f83addbcc1ba98bfa195cf8cc9cb2fcb2595ffdb
-#+containers.30d5d46311deafb408983099bbf8e1a41965837ff6586d464f1693e7aefa0042
+#+containers.f2b1434bc667b7f459c9725ad3c26c4fb158b0d24a2c31338335cdd278c10c6c
#+xbps.e7b102cdf29fa99c56eeacce8ade331896a379fad11189131b0d1efb4160a454
#+zstd.38b14331a2c89a3fc5d568ddddc14918031315ba2a24b6ffa8bd874c6f54bbc1
#+apk-tools.714e1cb8bc861dec1710a25476f209f7b0602d954f74194d58c16747c5a3ad38
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -21,7 +21,7 @@
#+pthbs-banginstall.0442e58611ea2fc27a0a57a4c1b9b8696d799e9ebb737f3548553a61f845e34b
#+aat.1a24f86810721d21e38b938be940549908121eb386821cded1a27ac973c8d47e
#+confz.953faaabf2a7a6ab4aa9b374f83addbcc1ba98bfa195cf8cc9cb2fcb2595ffdb
-#+containers.30d5d46311deafb408983099bbf8e1a41965837ff6586d464f1693e7aefa0042
+#+containers.f2b1434bc667b7f459c9725ad3c26c4fb158b0d24a2c31338335cdd278c10c6c
#+fileset.8d3627d93e7b4c33483589e8602b462d3fcd31d6f38adde5ee53c024197c7286
#+logincaps.507ec1380a0988547542ae0ad146daffd92e08ab8faf964323c28f430edcc406
#+snaprep.756763e7b0d2cc247a6b4a517b1d1eca3cb04cbfbfef374541079c63f0c896c8
@@ -32,16 +32,16 @@
#+getent.219406db8d31c860d8fb9052a1158f072c8b77ef4d1b71ef24e5fcc649201521
#+getconf.a13baa310359caefe186a823f0386190b6286fccf30aaf8301e115f3dc973d44
#+iconv.7afe835f0a03884e71f41bd2a96a88e9e1e73233137cb94da9f73a6721ed3001
-#+libcap.419c8e85f45214e55b56b1d6e2468fb8af36538bb94518007a155ab4fe746fb0
-#+applyuidgid-caps.ce9b5c150cdcec21a23e0bbf838915b1e2b2244eec1d06f9dd17e90a7dfc067e
+#+libcap.e2f548b558f389ead47900a784150f4165c128f846d2cc0c6ef9b1ee7b3da249
+#+applyuidgid-caps.d4cb37c46563dc1996e3faab76bc55168f85f449771a86fed5ad520ee406e07e
#+ccx-utils.769c165236aa3bc0564901e48e65c035ab3d342564dd1a440a512347d62d4ce9
#+user-env.f9ab8060b8c6970d3b785694ef1f839f47c9eb31a0c13c0529f365583552db01
#+strace.f67bc48859477eb362b356c2f4fd4d3a6a38fb3d32969338ec7f87dd48634904
#+mlog.f9e7afa9325b4affd4298e6de0a07d22a074799f0ea7bda1e3fb58a37b98e398
#+findutils.1edbb84f016e9dc61540b8396e85a2163570b9281a408f8787f17e404f685ce0
#+nawk.8521bf13f53618b7897b7f2e070a506a0101c985f6b9bb527d5eb15d8e8d4858
-#+system-config.f880126b7e88c86536238c60fdb90348f91c62ab3f82c7f29c1bb593f949dfcb
-#+system-config-rc.9aa1ec5ccdeb41ecd935e14775724aa8c58ecbe45458f159597212d27f57c91a
+#+system-config.98c54bf1e5b6d6697114f08c0ecb99008aecf86e11bf2f6b0a34a265354eea0e
+#+system-config-rc.ba67a4ee110713b81d0e09862d2d6fcf0ba4d233d8d7179b6bc7cf8d373861bb
#+system-config-scripts.c533391a1fcb035cbc2e4bad71f1dc5c40ed8b2c37d0dcd2cc7929c1dea80b5f
-#+system-config-init.49c2d0423f2f56e9fd2d92a7a3c7b61cb5189964d4f727aaa6b84932d97f6223
+#+system-config-init.1574e5249591c8163038961bd5063eca0b99ef79e543bea8198c12c39dae968c
#+system-config-zsh.62c3518c0b26bb74a5913e7c6a89e60e0ac9ac138cddde75a74828713d3b7b37
\ No newline at end of file
diff --git a/variants/root-x86_64/libcap b/variants/root-x86_64/libcap
@@ -41,7 +41,7 @@ LDFLAGS=--static
build_env_static
-make -j${JOBS:-1} -l$((1+${JOBS:-1})) \
+make -j1 \
DESTDIR="$pthbs_destdir" \
SHARED=no DYNAMIC=no LIBCSTATIC=yes \
prefix="$prefix" \
diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config
@@ -53,7 +53,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.8b3d8b731e8d9b161dc4f9a26e8b82ff65debed4d3a9ecf106d0d912bcb43ab3' \
+ 'pthbs_path_containers=/versions/env.480dc04ac65e861dd88e23d89d33771afaa926d8984198aafdc61bab48fab2cc' \
'pthbs_path_mdevd=/versions/env.587734c2fde5b7dd48f968c39290c2fd2ed92780d5d4bab0b2292429a4729eea' \
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
@@ -7,7 +7,7 @@
#+s6-portable-utils.07e8ff4d2d45a743ec810d3e27268460d201bafbb0a765756da09179758d4b0d
#+s6-linux-init.e17bf07f726729c579bb12c1d25dad4bb263f96509f7ea852bb44d50737d0b4d
#+execline.c677b46c36eac37bee97ce38c09c501d27babea0737cbab9fb21a3ec9b194284
-#+system-config-rc.9aa1ec5ccdeb41ecd935e14775724aa8c58ecbe45458f159597212d27f57c91a
+#+system-config-rc.ba67a4ee110713b81d0e09862d2d6fcf0ba4d233d8d7179b6bc7cf8d373861bb
# - build script start -
@@ -32,7 +32,7 @@ dest=${pthbs_destdir%/}${prefix}
cd '.'
-s6rcdb=/versions/system-config-rc.9aa1ec5ccdeb41ecd935e14775724aa8c58ecbe45458f159597212d27f57c91a/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.ba67a4ee110713b81d0e09862d2d6fcf0ba4d233d8d7179b6bc7cf8d373861bb/config/s6-rc-db
# Generate init (${dest} must not exist but parent dir does)
mkdir -p "$pthbs_destdir//versions"
diff --git a/variants/root-x86_64/system-config-rc b/variants/root-x86_64/system-config-rc
@@ -5,7 +5,7 @@
#+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc
#+s6-rc.9416ba0fe405fc2a019beeee1b35a666324184886c12b89deb929c515ca06183
#+fileset.8d3627d93e7b4c33483589e8602b462d3fcd31d6f38adde5ee53c024197c7286
-#+system-config.f880126b7e88c86536238c60fdb90348f91c62ab3f82c7f29c1bb593f949dfcb
+#+system-config.98c54bf1e5b6d6697114f08c0ecb99008aecf86e11bf2f6b0a34a265354eea0e
# - build script start -
@@ -15,7 +15,7 @@ dest=${pthbs_destdir%/}${prefix}
cd '.'
-src=/versions/system-config.f880126b7e88c86536238c60fdb90348f91c62ab3f82c7f29c1bb593f949dfcb/config/s6-rc-source
+src=/versions/system-config.98c54bf1e5b6d6697114f08c0ecb99008aecf86e11bf2f6b0a34a265354eea0e/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.0442e58611ea2fc27a0a57a4c1b9b8696d799e9ebb737f3548553a61f845e34b
#+aat.1a24f86810721d21e38b938be940549908121eb386821cded1a27ac973c8d47e
#+confz.953faaabf2a7a6ab4aa9b374f83addbcc1ba98bfa195cf8cc9cb2fcb2595ffdb
-#+containers.30d5d46311deafb408983099bbf8e1a41965837ff6586d464f1693e7aefa0042
+#+containers.f2b1434bc667b7f459c9725ad3c26c4fb158b0d24a2c31338335cdd278c10c6c
#+fileset.8d3627d93e7b4c33483589e8602b462d3fcd31d6f38adde5ee53c024197c7286
#+logincaps.507ec1380a0988547542ae0ad146daffd92e08ab8faf964323c28f430edcc406
#+snaprep.756763e7b0d2cc247a6b4a517b1d1eca3cb04cbfbfef374541079c63f0c896c8
@@ -32,8 +32,8 @@
#+getent.219406db8d31c860d8fb9052a1158f072c8b77ef4d1b71ef24e5fcc649201521
#+getconf.a13baa310359caefe186a823f0386190b6286fccf30aaf8301e115f3dc973d44
#+iconv.7afe835f0a03884e71f41bd2a96a88e9e1e73233137cb94da9f73a6721ed3001
-#+libcap.419c8e85f45214e55b56b1d6e2468fb8af36538bb94518007a155ab4fe746fb0
-#+applyuidgid-caps.ce9b5c150cdcec21a23e0bbf838915b1e2b2244eec1d06f9dd17e90a7dfc067e
+#+libcap.e2f548b558f389ead47900a784150f4165c128f846d2cc0c6ef9b1ee7b3da249
+#+applyuidgid-caps.d4cb37c46563dc1996e3faab76bc55168f85f449771a86fed5ad520ee406e07e
#+ccx-utils.769c165236aa3bc0564901e48e65c035ab3d342564dd1a440a512347d62d4ce9
#+user-env.f9ab8060b8c6970d3b785694ef1f839f47c9eb31a0c13c0529f365583552db01
#+strace.f67bc48859477eb362b356c2f4fd4d3a6a38fb3d32969338ec7f87dd48634904
