commit f0dd63b09f3d564177f490a722a04cdc264c2d0a
parent 50fd77d69dbee6f000fe0934678b9010689fded7
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Fri, 12 Dec 2025 03:44:39 +0000
xbps
Diffstat:
17 files changed, 38 insertions(+), 34 deletions(-)
diff --git a/templates/pkg/xbps b/templates/pkg/xbps
@@ -13,6 +13,8 @@
{% block configure %}
export LDFLAGS=--static
export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS"
+{# xbps builds with -Werror which breaks accross gcc versions, silence relevant warnings -#}
+export CFLAGS="-Wno-error=cast-qual -Wno-error=parentheses -Wno-error=redundant-decls $CFLAGS"
build_env_static
find lib bin -name '*.c' -exec sed -iEe '/^[\t ]*#[\t ]*define[\t ]+_GNU_SOURCE/d' '{}' \;
diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers
@@ -32,7 +32,7 @@
#+execline.40353eaff23067fb950e4814076f769ec877500bf0d6a1c78f55317b992a6b57
#+alpine-keys.2627cf09b293e5aa76360cd858cdbe7493f766e90063b0db73368eddd7832398
#+apk-tools.26dea3d4656b1c6ea2b40f4e5e448263725788f406996f46e33e7e801e6c14f7
-#+xbps.eb57201fda7fc3d6eaa0e87e8f8a3f639e28762ad6146d6b23cdc0623ab0ee71
+#+xbps.e53d516def66288ab4a6951066b32fc4fcba939d4f2b3f3deb6fac672641ecb2
#+container-bin-image.b694aad499e96c190ccbe3b165831cebbeb629bd1c99d1fbd8980a68b136a0f5
#@git:9820dbea1cf5060d7d04632f0fed7e91ea608309:containers
@@ -77,7 +77,7 @@ printf '%s\n' >"${dest}/zsh/site-functions/confz_containers_pthbs_init" \
mkdir -p "${dest}/deps/command"
ln -sf '/home/ccx/versions/apk-tools.26dea3d4656b1c6ea2b40f4e5e448263725788f406996f46e33e7e801e6c14f7/command/apk.static' "${dest}/deps/command/"
-ln -sf '/home/ccx/versions/xbps.eb57201fda7fc3d6eaa0e87e8f8a3f639e28762ad6146d6b23cdc0623ab0ee71/command/xbps-install.static' "${dest}/deps/command/"
+ln -sf '/home/ccx/versions/xbps.e53d516def66288ab4a6951066b32fc4fcba939d4f2b3f3deb6fac672641ecb2/command/xbps-install.static' "${dest}/deps/command/"
for f in '/home/ccx/versions/alpine-keys.2627cf09b293e5aa76360cd858cdbe7493f766e90063b0db73368eddd7832398'/keys/alpine/*/*; do
test -f "$f"
@@ -87,7 +87,7 @@ for f in '/home/ccx/versions/alpine-keys.2627cf09b293e5aa76360cd858cdbe7493f766e
done
mkdir -p "${dest}/deps/keys/void"
-for f in '/home/ccx/versions/xbps.eb57201fda7fc3d6eaa0e87e8f8a3f639e28762ad6146d6b23cdc0623ab0ee71'/keys/void/*; do
+for f in '/home/ccx/versions/xbps.e53d516def66288ab4a6951066b32fc4fcba939d4f2b3f3deb6fac672641ecb2'/keys/void/*; do
ln -sf "$f" "${dest}/deps/keys/void/"
done
diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment
@@ -50,8 +50,8 @@
#+s6-linux-utils.ee802c9d791b5dd387b43cdcc33ebd6097b5d3fab98ef9ba8afbbe6edc5de00a
#+zsh.175ce15f1b1db6554e8e4fa76b6c2dd63ce62f9d78de7b9372e6b73f05c834b1
#+confz.f502e42c0e3d0791440962904c65be3b727f3a310a68a649840e00126d46bd64
-#+containers.8750c68cb867d8740f7813160dd1d1d12932269a63382e410bb12554dff9dfbd
-#+xbps.eb57201fda7fc3d6eaa0e87e8f8a3f639e28762ad6146d6b23cdc0623ab0ee71
+#+containers.b128327c579c8e8808391c299f33abbc5438419731ef4da162f74e8d2c0dcfa1
+#+xbps.e53d516def66288ab4a6951066b32fc4fcba939d4f2b3f3deb6fac672641ecb2
#+zstd.6784b50e1a6f437617df4f5e504acb4dcedfa6ea695d6f6f00b9b918458340c9
#+apk-tools.26dea3d4656b1c6ea2b40f4e5e448263725788f406996f46e33e7e801e6c14f7
#+alpine-keys.2627cf09b293e5aa76360cd858cdbe7493f766e90063b0db73368eddd7832398
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -65,13 +65,13 @@
#+pthbs-banginstall.da38c2a54a86d40c9d3e59924f93743efeac15a3624c0b2d09081213e36a70b5
#+aat.1d76ec7e17ceb8bd6f8c0a961e9f7ac901b95434b52e996025163b9cb2a0d2b3
#+confz.f502e42c0e3d0791440962904c65be3b727f3a310a68a649840e00126d46bd64
-#+containers.8750c68cb867d8740f7813160dd1d1d12932269a63382e410bb12554dff9dfbd
+#+containers.b128327c579c8e8808391c299f33abbc5438419731ef4da162f74e8d2c0dcfa1
#+fileset.b343f39ed9f814cf4b6890f61329563c51ae836cffc5e3844ab4101b2165a316
#+logincaps.60cf4a5530c1f26391115f83afc2554c4cffb8afed0f0930ca4f22d9062b9f59
#+snaprep.8d599043ddae3282fedd93bb41dde9dd1113f51691210ccdb601a462a94da546
#+curl.2b4a1e3b47a33ba89abd7d14e594e8ba29f518d3421457c06154fbb1b40fc1c6
#+git.bdc1a8610da8a605b4a9f8bca567e9cfd56a0b7de1237279a995d5cc328e8986
-#+xbps.eb57201fda7fc3d6eaa0e87e8f8a3f639e28762ad6146d6b23cdc0623ab0ee71
+#+xbps.e53d516def66288ab4a6951066b32fc4fcba939d4f2b3f3deb6fac672641ecb2
#+apk-tools.26dea3d4656b1c6ea2b40f4e5e448263725788f406996f46e33e7e801e6c14f7
#+getent.4fed010dd9b9ecd66109a04d4816b65dac83ccc7f08166145c278f3848488b65
#+getconf.3659cd8e1387b513676350d45e5b7e92fb4a6eea0335a1fd9a98364cbfa72f7d
@@ -87,9 +87,9 @@
#+squashfs-tools.a2564e381e3e30b8f7c71af71a22f255bd1e3cbda8bf1187d9a4183c6100a01b
#+mandoc.1bfad0ae04afa18e99c3a4239934e633bad4512123ffd4d269c8e14caf506c15
#+tinyssh.7d202f58107ebfc6935287dc91e8dae825c6c2ae84b47943110e819c7b76a5bc
-#+system-config.fcccf514ee4735d234eceb5d439dfa81272cbbafabab7be26fce817e284d6153
-#+system-config-rc.8f8fdc5ebdb2505d37db5994b3d0a974ae86307fd4ad25846b397c3c0ddf6b00
+#+system-config.ac5d088884c611b5cf43752380a4b8f7dccce659c305f5287c358826a91d1490
+#+system-config-rc.63601a2554f0f2afcee25167881485b40fe7108ed428fa7f21f5b9c6bfad5599
#+system-config-scripts.0a73587127ce727b2123b6b9b71aba8a14e2d1e5947a249db2287b0af2cb3fe2
-#+system-config-init.dd1fb64086d858771734495ceda1a16ba4bdd5309492c171a9ffeebff1d42dd5
+#+system-config-init.ca116c88728179514fc106b2c38e17605c7d8440aa322b965e745ca4df23f463
#+system-config-zsh.c435df8483744377ded5232ee1c9b2742ed55c12c2cb813857e00899dc34eaa8
#+busybox.0bfb0ebb4dfd7d4c1bcff5d3c3dc3d357d861a5b3f7232449d237d56a69f84f3
\ No newline at end of file
diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config
@@ -97,7 +97,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.8f3c0b6caee19589b5037e9f591c8273a5c92c90a0ab136b92b7aa1ef2883828' \
+ 'pthbs_path_containers=/home/ccx/versions/env.9593f44289178621d25e490cb8f8394526e42f2eb1240b19afb65ccee2e82141' \
'pthbs_path_mdevd=/home/ccx/versions/env.d4110a0bf8e48fa5c5967125711cc59ea31555422c01a9a6c1c2823a294ccd37' \
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
@@ -50,7 +50,7 @@
#+s6-portable-utils.680fe5c007becce6f4aa9dacc7659541fe06feb1ce885218592feb36766f80e9
#+s6-linux-init.b378a8f5bea7ab34868489c092499b7c1186f2f88f39da0c577040665fa98dfe
#+execline.40353eaff23067fb950e4814076f769ec877500bf0d6a1c78f55317b992a6b57
-#+system-config-rc.8f8fdc5ebdb2505d37db5994b3d0a974ae86307fd4ad25846b397c3c0ddf6b00
+#+system-config-rc.63601a2554f0f2afcee25167881485b40fe7108ed428fa7f21f5b9c6bfad5599
# - build script start -
@@ -75,7 +75,7 @@ dest=${pthbs_destdir%/}${prefix}
cd '.'
-s6rcdb=/home/ccx/versions/system-config-rc.8f8fdc5ebdb2505d37db5994b3d0a974ae86307fd4ad25846b397c3c0ddf6b00/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.63601a2554f0f2afcee25167881485b40fe7108ed428fa7f21f5b9c6bfad5599/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
@@ -30,7 +30,7 @@
#+busybox-diffutils.8325b9881e7e36ec91579f74ab1c4450891fe7501654c9b7e63f4d469b95bdb2
#+s6-rc.60bdf9c60ff07c507db53ce85860465ec10917b02d04e43e565a41c14abcf47a
#+fileset.b343f39ed9f814cf4b6890f61329563c51ae836cffc5e3844ab4101b2165a316
-#+system-config.fcccf514ee4735d234eceb5d439dfa81272cbbafabab7be26fce817e284d6153
+#+system-config.ac5d088884c611b5cf43752380a4b8f7dccce659c305f5287c358826a91d1490
# - build script start -
@@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix}
cd '.'
-src=/home/ccx/versions/system-config.fcccf514ee4735d234eceb5d439dfa81272cbbafabab7be26fce817e284d6153/config/s6-rc-source
+src=/home/ccx/versions/system-config.ac5d088884c611b5cf43752380a4b8f7dccce659c305f5287c358826a91d1490/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
@@ -65,13 +65,13 @@
#+pthbs-banginstall.da38c2a54a86d40c9d3e59924f93743efeac15a3624c0b2d09081213e36a70b5
#+aat.1d76ec7e17ceb8bd6f8c0a961e9f7ac901b95434b52e996025163b9cb2a0d2b3
#+confz.f502e42c0e3d0791440962904c65be3b727f3a310a68a649840e00126d46bd64
-#+containers.8750c68cb867d8740f7813160dd1d1d12932269a63382e410bb12554dff9dfbd
+#+containers.b128327c579c8e8808391c299f33abbc5438419731ef4da162f74e8d2c0dcfa1
#+fileset.b343f39ed9f814cf4b6890f61329563c51ae836cffc5e3844ab4101b2165a316
#+logincaps.60cf4a5530c1f26391115f83afc2554c4cffb8afed0f0930ca4f22d9062b9f59
#+snaprep.8d599043ddae3282fedd93bb41dde9dd1113f51691210ccdb601a462a94da546
#+curl.2b4a1e3b47a33ba89abd7d14e594e8ba29f518d3421457c06154fbb1b40fc1c6
#+git.bdc1a8610da8a605b4a9f8bca567e9cfd56a0b7de1237279a995d5cc328e8986
-#+xbps.eb57201fda7fc3d6eaa0e87e8f8a3f639e28762ad6146d6b23cdc0623ab0ee71
+#+xbps.e53d516def66288ab4a6951066b32fc4fcba939d4f2b3f3deb6fac672641ecb2
#+apk-tools.26dea3d4656b1c6ea2b40f4e5e448263725788f406996f46e33e7e801e6c14f7
#+getent.4fed010dd9b9ecd66109a04d4816b65dac83ccc7f08166145c278f3848488b65
#+getconf.3659cd8e1387b513676350d45e5b7e92fb4a6eea0335a1fd9a98364cbfa72f7d
diff --git a/variants/ccx-x86_64/xbps b/variants/ccx-x86_64/xbps
@@ -65,6 +65,7 @@ cd 'xbps-0.60.6'
export LDFLAGS=--static
export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS"
+export CFLAGS="-Wno-error=cast-qual -Wno-error=parentheses -Wno-error=redundant-decls $CFLAGS"
build_env_static
find lib bin -name '*.c' -exec sed -iEe '/^[\t ]*#[\t ]*define[\t ]+_GNU_SOURCE/d' '{}' \;
diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers
@@ -32,7 +32,7 @@
#+execline.4ce0c41824f822a2121cd43043d321c827b23b2ccef5a3ef0150e9f147d7e90a
#+alpine-keys.91c778ab606f8627ec57ca0ac12fbc575b11be2c477052ab77a9cf8cb3534416
#+apk-tools.e9e751ea7ddc425811423c10dd7b317f2a13001905424548febd956bc68a19d5
-#+xbps.38c930058c44f5ffabd87cef151b93cea7f7eb27eed6bdde4c6b3e52ad843989
+#+xbps.8b08ec39285fa4c53660fb27417a84dc8ad639dd14b3097258c860234e62489c
#+container-bin-image.1c19674c893928ef96224899734ebddd970bc5edb760d6b824db638f047edda0
#@git:9820dbea1cf5060d7d04632f0fed7e91ea608309:containers
@@ -77,7 +77,7 @@ printf '%s\n' >"${dest}/zsh/site-functions/confz_containers_pthbs_init" \
mkdir -p "${dest}/deps/command"
ln -sf '/versions/apk-tools.e9e751ea7ddc425811423c10dd7b317f2a13001905424548febd956bc68a19d5/command/apk.static' "${dest}/deps/command/"
-ln -sf '/versions/xbps.38c930058c44f5ffabd87cef151b93cea7f7eb27eed6bdde4c6b3e52ad843989/command/xbps-install.static' "${dest}/deps/command/"
+ln -sf '/versions/xbps.8b08ec39285fa4c53660fb27417a84dc8ad639dd14b3097258c860234e62489c/command/xbps-install.static' "${dest}/deps/command/"
for f in '/versions/alpine-keys.91c778ab606f8627ec57ca0ac12fbc575b11be2c477052ab77a9cf8cb3534416'/keys/alpine/*/*; do
test -f "$f"
@@ -87,7 +87,7 @@ for f in '/versions/alpine-keys.91c778ab606f8627ec57ca0ac12fbc575b11be2c477052ab
done
mkdir -p "${dest}/deps/keys/void"
-for f in '/versions/xbps.38c930058c44f5ffabd87cef151b93cea7f7eb27eed6bdde4c6b3e52ad843989'/keys/void/*; do
+for f in '/versions/xbps.8b08ec39285fa4c53660fb27417a84dc8ad639dd14b3097258c860234e62489c'/keys/void/*; do
ln -sf "$f" "${dest}/deps/keys/void/"
done
diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment
@@ -50,8 +50,8 @@
#+s6-linux-utils.c905cda13791d3634af26d96e1616784a3eab93ee598af58b0f6baf26c5a9f18
#+zsh.ff946601d2a0f2ca8d67759cbff61215baab6ba3348dbc272137eff9503a9b18
#+confz.abfcc8d207b4b6821dd1a0e5abe3f6234ce92342659fa7eb14cac69652c1a798
-#+containers.90b03dd61f885cf9c9bf0947e15341abcff2cf1fdd59b72aace06da9d708fd8b
-#+xbps.38c930058c44f5ffabd87cef151b93cea7f7eb27eed6bdde4c6b3e52ad843989
+#+containers.97d31261a05e7041d63ce7ff72896b91bc93a20b2bb4f29b0d1644bf19ae21f1
+#+xbps.8b08ec39285fa4c53660fb27417a84dc8ad639dd14b3097258c860234e62489c
#+zstd.c63a3cabacc7382111033c967c5e11509d80a53e85d1f82f5117c0994ee82058
#+apk-tools.e9e751ea7ddc425811423c10dd7b317f2a13001905424548febd956bc68a19d5
#+alpine-keys.91c778ab606f8627ec57ca0ac12fbc575b11be2c477052ab77a9cf8cb3534416
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -65,13 +65,13 @@
#+pthbs-banginstall.c19717e55bda5845261e54cca257c569fa5c53f75a51d9b339e229328c0108d0
#+aat.808cff069ff0e6bc41ebc45b000df51891aae0d45f3907e19fbee8fd04aef48b
#+confz.abfcc8d207b4b6821dd1a0e5abe3f6234ce92342659fa7eb14cac69652c1a798
-#+containers.90b03dd61f885cf9c9bf0947e15341abcff2cf1fdd59b72aace06da9d708fd8b
+#+containers.97d31261a05e7041d63ce7ff72896b91bc93a20b2bb4f29b0d1644bf19ae21f1
#+fileset.6fefc34cd290fd1d3356047f34fc7ba16b049d9a149e986dfff09166a860c67e
#+logincaps.574e272eb78c4e2fd945b614f3d891bb0737f0af6297130d20d31b2f9336ddc0
#+snaprep.5a1631b1b8f593f93e64f5ea40778fdcb5ea5725b41dc224910e67bc5bb27a13
#+curl.7f5463b5de6d0e17b7b374ef28d43d8dffde44b7901feeba5a6f77e17b76fbed
#+git.a611fbad4e4b588d14e616889a929fc76990a99272106cd3dd419b96a05224c9
-#+xbps.38c930058c44f5ffabd87cef151b93cea7f7eb27eed6bdde4c6b3e52ad843989
+#+xbps.8b08ec39285fa4c53660fb27417a84dc8ad639dd14b3097258c860234e62489c
#+apk-tools.e9e751ea7ddc425811423c10dd7b317f2a13001905424548febd956bc68a19d5
#+getent.4caaecf2abb7893d1b05b464d8b085ceec41e148787112dd626dcb04ef3b64b6
#+getconf.8567ece7b0b2a38b7ed452386a7c8a3971577e6dd6950a8eaa62b137c39adb7f
@@ -87,9 +87,9 @@
#+squashfs-tools.d9b4267c13e4ee7076d8897b9461a00ff7bc2aeb4a166fb28f8d38e46ba67a99
#+mandoc.421dfa1a68724de02d7e94d17a7c515db1908a6b9560f7bcfef9764e01eb9d5c
#+tinyssh.ca9956fe0cef56dd575836a9f804bd66df875871ae08d63badb077429ebd240d
-#+system-config.f5a4d184faa723cb16032a3528b2de2009ff0753e7f35142600980c0bfd87c14
-#+system-config-rc.44fcce08af0404eaa9afb2dccd55ffcf5683fc6971c69c677f1c4148fc62ab4d
+#+system-config.a2fd7b050f314754f973fc7a34b220f3ea69e6cc09890dd2a68c27d98de1ae3d
+#+system-config-rc.7e6ebbc8dffd75898c9405fdfb0003484fddcc11c47bdd3d2358b8cd51d99b41
#+system-config-scripts.7d74e3f9cfa25b8ea4c000732097df2ce3378ff14b1e7a058f401564ceb1b1e5
-#+system-config-init.256d273a7fa497aeaf7633d90496c4bf5008360c6decd5c75976a9c1f1e0da4d
+#+system-config-init.64a5c18ff5693d28cbaa7313c663d7e2a2ecdb832b11be4a6235f9435aaa3b4e
#+system-config-zsh.1b8b6c7cc0c879806d2be19f6ddcadcef5657ab31b8d79145d1fb18c3980c40b
#+busybox-modutils.0692501ecfd7ea655126eb922eb0143df8b6570eb2382700c13eef0bf9ccb006
\ No newline at end of file
diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config
@@ -97,7 +97,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.cb5715b84f7c6e5233bb94f50eecf09970841e86809563706a5e0d862b04bb89' \
+ 'pthbs_path_containers=/versions/env.9ca5cc444dc7e6d32217855a66619e4070d57c1b9a7267d444ca5c0065aaebd8' \
'pthbs_path_mdevd=/versions/env.2bfbd65368b9d96e82583ec2617a7694d289aabb54d03d9720c92d0242ab65fe' \
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
@@ -50,7 +50,7 @@
#+s6-portable-utils.ad7a9fd81c7d4fc1c1f9f9b0e422452dd95e02f15c7e04a1421727fe278cb219
#+s6-linux-init.10203af75c4a3c8b1933c7173f1ee2f6f11b0126fa697fc3a097f2bedfd89bc7
#+execline.4ce0c41824f822a2121cd43043d321c827b23b2ccef5a3ef0150e9f147d7e90a
-#+system-config-rc.44fcce08af0404eaa9afb2dccd55ffcf5683fc6971c69c677f1c4148fc62ab4d
+#+system-config-rc.7e6ebbc8dffd75898c9405fdfb0003484fddcc11c47bdd3d2358b8cd51d99b41
# - build script start -
@@ -75,7 +75,7 @@ dest=${pthbs_destdir%/}${prefix}
cd '.'
-s6rcdb=/versions/system-config-rc.44fcce08af0404eaa9afb2dccd55ffcf5683fc6971c69c677f1c4148fc62ab4d/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.7e6ebbc8dffd75898c9405fdfb0003484fddcc11c47bdd3d2358b8cd51d99b41/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
@@ -30,7 +30,7 @@
#+busybox-diffutils.93ec375b0382feb4651fa15a7b034fad65a67471e2375fd514485a802899625b
#+s6-rc.3c6bebbe7fcf84c87fba0319c4868aba211f2f771d2ab34489c3264f8e157703
#+fileset.6fefc34cd290fd1d3356047f34fc7ba16b049d9a149e986dfff09166a860c67e
-#+system-config.f5a4d184faa723cb16032a3528b2de2009ff0753e7f35142600980c0bfd87c14
+#+system-config.a2fd7b050f314754f973fc7a34b220f3ea69e6cc09890dd2a68c27d98de1ae3d
# - build script start -
@@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix}
cd '.'
-src=/versions/system-config.f5a4d184faa723cb16032a3528b2de2009ff0753e7f35142600980c0bfd87c14/config/s6-rc-source
+src=/versions/system-config.a2fd7b050f314754f973fc7a34b220f3ea69e6cc09890dd2a68c27d98de1ae3d/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
@@ -65,13 +65,13 @@
#+pthbs-banginstall.c19717e55bda5845261e54cca257c569fa5c53f75a51d9b339e229328c0108d0
#+aat.808cff069ff0e6bc41ebc45b000df51891aae0d45f3907e19fbee8fd04aef48b
#+confz.abfcc8d207b4b6821dd1a0e5abe3f6234ce92342659fa7eb14cac69652c1a798
-#+containers.90b03dd61f885cf9c9bf0947e15341abcff2cf1fdd59b72aace06da9d708fd8b
+#+containers.97d31261a05e7041d63ce7ff72896b91bc93a20b2bb4f29b0d1644bf19ae21f1
#+fileset.6fefc34cd290fd1d3356047f34fc7ba16b049d9a149e986dfff09166a860c67e
#+logincaps.574e272eb78c4e2fd945b614f3d891bb0737f0af6297130d20d31b2f9336ddc0
#+snaprep.5a1631b1b8f593f93e64f5ea40778fdcb5ea5725b41dc224910e67bc5bb27a13
#+curl.7f5463b5de6d0e17b7b374ef28d43d8dffde44b7901feeba5a6f77e17b76fbed
#+git.a611fbad4e4b588d14e616889a929fc76990a99272106cd3dd419b96a05224c9
-#+xbps.38c930058c44f5ffabd87cef151b93cea7f7eb27eed6bdde4c6b3e52ad843989
+#+xbps.8b08ec39285fa4c53660fb27417a84dc8ad639dd14b3097258c860234e62489c
#+apk-tools.e9e751ea7ddc425811423c10dd7b317f2a13001905424548febd956bc68a19d5
#+getent.4caaecf2abb7893d1b05b464d8b085ceec41e148787112dd626dcb04ef3b64b6
#+getconf.8567ece7b0b2a38b7ed452386a7c8a3971577e6dd6950a8eaa62b137c39adb7f
diff --git a/variants/root-x86_64/xbps b/variants/root-x86_64/xbps
@@ -65,6 +65,7 @@ cd 'xbps-0.60.6'
export LDFLAGS=--static
export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS"
+export CFLAGS="-Wno-error=cast-qual -Wno-error=parentheses -Wno-error=redundant-decls $CFLAGS"
build_env_static
find lib bin -name '*.c' -exec sed -iEe '/^[\t ]*#[\t ]*define[\t ]+_GNU_SOURCE/d' '{}' \;
