commit 4aee71b077380a94696d5209cf9fab30bec9764b
parent efc874ba0dcfb6bbaac7ac6083a6c3601561e45d
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Sat, 11 Oct 2025 15:16:32 +0000
xbps: re-add build flags
Diffstat:
18 files changed, 46 insertions(+), 37 deletions(-)
diff --git a/templates/pkg/system-config b/templates/pkg/system-config
@@ -72,5 +72,5 @@ mv -v keys "$dest/"
x["./config/etc/motd"]=1
x["./config/etc/skel/loginexec"]=1
x["./config/hostname"]=1
- x["./keys/ssh/root"]=1
+ x["./keys/ssh/authorized_keys/root"]=1
{% endblock %}
diff --git a/templates/pkg/xbps b/templates/pkg/xbps
@@ -9,6 +9,8 @@
#@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:.
{% endblock %}
{% block configure %}
+export LDFLAGS=--static
+export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS"
{% include "functions/build_env_static" %}
build_env_static
@@ -30,6 +32,7 @@ find lib bin -name '*.c' -exec sed -iEe '/#.*_GNU_SOURCE/d' '{}' \;
{% block build -%}
{{make}} -C include
{{make}} -C lib libxbps.a
+
{% endblock %}
{% block install -%}
install -d "$dest/library"
diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers
@@ -6,7 +6,7 @@
#+execline.0e5a0df166b6270f6f3f5e4fa0e8051e2432b88bd452b4676f3730724652874a
#+alpine-keys.7c89c54f343b451790623504c04092bfe77b9c3462ded5a4a8739f0250a22cb9
#+apk-tools.e165a47aff8b353b5f4dfbbdff1f459e66db1cdc85619989e485a2632018109a
-#+xbps.52a5058f66adba0e20d6f6a4fe093eb3e8febfb65750de5c896a1d91b315560c
+#+xbps.9708f3e838d4755250e64bdbd746c2fc9b8a109e6a84605e96ae359e13d84f62
#+container-bin-image.c7e7742dfb0dda83d725518f35add88245f503ce7ac0a3462215466fca9acad6
#@git:8ec212c9411088ad7e116e330d6a33f68c539678:containers
@@ -50,7 +50,7 @@ printf '%s\n' >"${dest}/zsh/site-functions/confz_containers_pthbs_init" \
mkdir -p "${dest}/deps/command"
ln -sf '/home/ccx/versions/apk-tools.e165a47aff8b353b5f4dfbbdff1f459e66db1cdc85619989e485a2632018109a/command/apk.static' "${dest}/deps/command/"
-ln -sf '/home/ccx/versions/xbps.52a5058f66adba0e20d6f6a4fe093eb3e8febfb65750de5c896a1d91b315560c/command/xbps-install.static' "${dest}/deps/command/"
+ln -sf '/home/ccx/versions/xbps.9708f3e838d4755250e64bdbd746c2fc9b8a109e6a84605e96ae359e13d84f62/command/xbps-install.static' "${dest}/deps/command/"
for f in '/home/ccx/versions/alpine-keys.7c89c54f343b451790623504c04092bfe77b9c3462ded5a4a8739f0250a22cb9'/keys/alpine/*/*; do
test -f "$f"
@@ -60,7 +60,7 @@ for f in '/home/ccx/versions/alpine-keys.7c89c54f343b451790623504c04092bfe77b9c3
done
mkdir -p "${dest}/deps/keys/void"
-for f in '/home/ccx/versions/xbps.52a5058f66adba0e20d6f6a4fe093eb3e8febfb65750de5c896a1d91b315560c'/keys/void/*; do
+for f in '/home/ccx/versions/xbps.9708f3e838d4755250e64bdbd746c2fc9b8a109e6a84605e96ae359e13d84f62'/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
@@ -7,8 +7,8 @@
#+s6-linux-utils.84f2d6d918b74fffc508df6cee48ed0f25124bd6c09f12558626d27992174226
#+zsh.c1ba08b027e26ecf5b6a4f7f5aced2e9b520b1835b098ba5529cad1f97e387b5
#+confz.9e0eee915bafe96a2c4b29c49a34dba492a9213278016d8d46d4e5b7c96d22db
-#+containers.6f6039ec445abc7ab78e4c449a7a3d671e339696caa460f0fe1b17696ad93635
-#+xbps.52a5058f66adba0e20d6f6a4fe093eb3e8febfb65750de5c896a1d91b315560c
+#+containers.d5ef2aae968927c613bfb9ec49663c457f6195c82d47992774f46badb0798065
+#+xbps.9708f3e838d4755250e64bdbd746c2fc9b8a109e6a84605e96ae359e13d84f62
#+zstd.31469429bdd997f0a7a7eeb7dc4aa44b1e88d15227b1711943b136dc14cf753f
#+apk-tools.e165a47aff8b353b5f4dfbbdff1f459e66db1cdc85619989e485a2632018109a
#+alpine-keys.7c89c54f343b451790623504c04092bfe77b9c3462ded5a4a8739f0250a22cb9
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -21,13 +21,13 @@
#+pthbs-banginstall.fb1085a86eafedd60935fd033dbc0f6d47c187d3f7f9bf3cefdb1ddc43b21435
#+aat.b33fe3833f8ea46ebdb6900ad58529774beb169b76218ce270e3c975bcbfcd43
#+confz.9e0eee915bafe96a2c4b29c49a34dba492a9213278016d8d46d4e5b7c96d22db
-#+containers.6f6039ec445abc7ab78e4c449a7a3d671e339696caa460f0fe1b17696ad93635
+#+containers.d5ef2aae968927c613bfb9ec49663c457f6195c82d47992774f46badb0798065
#+fileset.30305918fa6fa5f7dcb447a76827959d5c8af9cd021b065fd360a5a176430035
#+logincaps.1dcea63884fc4ef3b2ed76a284d76b5cd0a5757843f5e900859d8159ae7ebf9f
#+snaprep.30e9d122c8a1d12f58d81856dd5a79b72d4785bf30bff0e94b3a0f61e6c22238
#+curl.b77362632ee7e28e099c231bbda3b6220cc0cbc62aece9c63f4957cc3f415284
#+git.47197b710752c0a7510495efa88f83cd26eb97a9693e796c13823c831df8bd13
-#+xbps.52a5058f66adba0e20d6f6a4fe093eb3e8febfb65750de5c896a1d91b315560c
+#+xbps.9708f3e838d4755250e64bdbd746c2fc9b8a109e6a84605e96ae359e13d84f62
#+apk-tools.e165a47aff8b353b5f4dfbbdff1f459e66db1cdc85619989e485a2632018109a
#+getent.08248f0ec8ff20bd1279b61e637208961f5959b2b8bb33caee7720289dad2b5c
#+getconf.0fab6914bf5649e1af47e5cecd0b21897d872b8048438ec01bd5f2afdd3e9b3b
@@ -38,8 +38,8 @@
#+user-env.27a0b5452d41afaacb1d76c456caa84d85aff599c39ff32b8db694d2550d5b6d
#+strace.40668df6151b4574b553a5923103e07c6ddb344daca606f04edd0ac48e060d55
#+mlog.a882a51752c5081bd671d7d564ea8b5c4502b93c0951cb77a20aa0238c66bc82
-#+system-config.0e7c9b16e24ef45066c4c788f5b831a593cf8b7b74b347e8149d621d577e5da2
-#+system-config-rc.9c3bbc0d69731f8e2798a947e4a984847c9715cabe5a86f60a612e0d4581176f
+#+system-config.1c1e5436ac0b24c27cc2f7574dce920d0ff42fb721babeaffd97c73693a9874e
+#+system-config-rc.dd79ae24432de37b3cb568960d6fb243887bec98e2ed43ae5e6c3a8d88b38c4a
#+system-config-scripts.d12136571c1f2d7a43fcf7cc96f91d5e342018ed98731a123c69ef67e4623f3f
-#+system-config-init.d6ef58d4a68c1c22165bedb872dff77ea0277a9efda513f786543b5f13dc723c
+#+system-config-init.88d494cb4becccb6a49f6a0031d0e22061c6865ab173f949f9b73669229ea223
#+system-config-zsh.ca45b9086a867eb594d68b32cb4826f747b819c640cb472a6fd1b649b1a1d760
\ No newline at end of file
diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config
@@ -50,7 +50,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.9512b218a2f168cd77c88166422283dd993db521201d27a6478bfdbef423db46' \
+ 'pthbs_path_containers=/home/ccx/versions/env.f9934051a7dc1f7d031e55d073ff43711c04cde1de39539e2bf18855671b5cb4' \
'pthbs_path_mdevd=/home/ccx/versions/env.51ab0c0e64ff93066325f8e4bcab80b46b317ef9b15abe28670e767ec96baca2' \
make -j${JOBS:-1} -l$((1+${JOBS:-1})) all
@@ -82,7 +82,7 @@ BEGIN {
x["./config/etc/motd"]=1
x["./config/etc/skel/loginexec"]=1
x["./config/hostname"]=1
- x["./keys/ssh/root"]=1
+ x["./keys/ssh/authorized_keys/root"]=1
}
function r1(s) {
diff --git a/variants/ccx-x86_64/system-config-init b/variants/ccx-x86_64/system-config-init
@@ -6,7 +6,7 @@
#+s6-portable-utils.1118fd2f6ea4b1390c615802d601bd6803cf4545b03a89bed68e36bc2a13087e
#+s6-linux-init.a6dbfc71babdb9506c53cad385c613f13a602885c2db0a5db609a86ecc687bac
#+execline.0e5a0df166b6270f6f3f5e4fa0e8051e2432b88bd452b4676f3730724652874a
-#+system-config-rc.9c3bbc0d69731f8e2798a947e4a984847c9715cabe5a86f60a612e0d4581176f
+#+system-config-rc.dd79ae24432de37b3cb568960d6fb243887bec98e2ed43ae5e6c3a8d88b38c4a
# - build script start -
@@ -29,7 +29,7 @@ qx() { # register executable as dependency and quote full path to be suitable f
"s6-quote" "$prefix/deps/command/$name"
}
-s6rcdb=/home/ccx/versions/system-config-rc.9c3bbc0d69731f8e2798a947e4a984847c9715cabe5a86f60a612e0d4581176f/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.dd79ae24432de37b3cb568960d6fb243887bec98e2ed43ae5e6c3a8d88b38c4a/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
@@ -4,7 +4,7 @@
#+busybox-diffutils.963ce6582575680763337552764b6a3c1be781d9fada1d52aa2d04fadeb229d0
#+s6-rc.4709b0b39ae84f7a1efa984a66237c0f6133cec32466acdf0a139e2ef142f5ee
#+fileset.30305918fa6fa5f7dcb447a76827959d5c8af9cd021b065fd360a5a176430035
-#+system-config.0e7c9b16e24ef45066c4c788f5b831a593cf8b7b74b347e8149d621d577e5da2
+#+system-config.1c1e5436ac0b24c27cc2f7574dce920d0ff42fb721babeaffd97c73693a9874e
# - build script start -
@@ -13,7 +13,7 @@ dest=${pthbs_destdir%/}${prefix}
cd 'system-config-rc'
-src=/home/ccx/versions/system-config.0e7c9b16e24ef45066c4c788f5b831a593cf8b7b74b347e8149d621d577e5da2/config/s6-rc-source
+src=/home/ccx/versions/system-config.1c1e5436ac0b24c27cc2f7574dce920d0ff42fb721babeaffd97c73693a9874e/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,13 +21,13 @@
#+pthbs-banginstall.fb1085a86eafedd60935fd033dbc0f6d47c187d3f7f9bf3cefdb1ddc43b21435
#+aat.b33fe3833f8ea46ebdb6900ad58529774beb169b76218ce270e3c975bcbfcd43
#+confz.9e0eee915bafe96a2c4b29c49a34dba492a9213278016d8d46d4e5b7c96d22db
-#+containers.6f6039ec445abc7ab78e4c449a7a3d671e339696caa460f0fe1b17696ad93635
+#+containers.d5ef2aae968927c613bfb9ec49663c457f6195c82d47992774f46badb0798065
#+fileset.30305918fa6fa5f7dcb447a76827959d5c8af9cd021b065fd360a5a176430035
#+logincaps.1dcea63884fc4ef3b2ed76a284d76b5cd0a5757843f5e900859d8159ae7ebf9f
#+snaprep.30e9d122c8a1d12f58d81856dd5a79b72d4785bf30bff0e94b3a0f61e6c22238
#+curl.b77362632ee7e28e099c231bbda3b6220cc0cbc62aece9c63f4957cc3f415284
#+git.47197b710752c0a7510495efa88f83cd26eb97a9693e796c13823c831df8bd13
-#+xbps.52a5058f66adba0e20d6f6a4fe093eb3e8febfb65750de5c896a1d91b315560c
+#+xbps.9708f3e838d4755250e64bdbd746c2fc9b8a109e6a84605e96ae359e13d84f62
#+apk-tools.e165a47aff8b353b5f4dfbbdff1f459e66db1cdc85619989e485a2632018109a
#+getent.08248f0ec8ff20bd1279b61e637208961f5959b2b8bb33caee7720289dad2b5c
#+getconf.0fab6914bf5649e1af47e5cecd0b21897d872b8048438ec01bd5f2afdd3e9b3b
diff --git a/variants/ccx-x86_64/xbps b/variants/ccx-x86_64/xbps
@@ -15,6 +15,8 @@ dest=${pthbs_destdir%/}${prefix}
cd 'xbps-0.59.2'
+export LDFLAGS=--static
+export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS"
build_env_static() {
export LD_LIBRARY_PATH="$pthbs_build_environment/library"
export CPATH="$pthbs_build_environment/include"
@@ -39,6 +41,7 @@ find lib bin -name '*.c' -exec sed -iEe '/#.*_GNU_SOURCE/d' '{}' \;
make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C include
make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C lib libxbps.a
+
install -d "$dest/library"
install -m 644 lib/libxbps.a "$dest/library"
install -d "$dest/command"
diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers
@@ -6,7 +6,7 @@
#+execline.f0eae8694d48210e76b8c63d1021b7c54029a8db968696dcb8b720240cd7b8ab
#+alpine-keys.7aa8a887a6f32ef454bca16fe2547b53b765170c2f8f0bab72ddd42c518bc941
#+apk-tools.c7f159a66814bc9be8c2840bf4fba46ee0a9ef6fdd1994c11b09d1dab82fb5d9
-#+xbps.92731c8088c56653e67c85f730de3a45b3475d7aefc618992f94c322d94430f3
+#+xbps.67bbffd91ead127391dcc5e1ab79e7bbe634c5f9e5e72b20f8ae2dba1b87faeb
#+container-bin-image.53df785f72ebd029106c573aa802e4396b33bfdd78ba14b65ee62177c04d1a28
#@git:8ec212c9411088ad7e116e330d6a33f68c539678:containers
@@ -50,7 +50,7 @@ printf '%s\n' >"${dest}/zsh/site-functions/confz_containers_pthbs_init" \
mkdir -p "${dest}/deps/command"
ln -sf '/versions/apk-tools.c7f159a66814bc9be8c2840bf4fba46ee0a9ef6fdd1994c11b09d1dab82fb5d9/command/apk.static' "${dest}/deps/command/"
-ln -sf '/versions/xbps.92731c8088c56653e67c85f730de3a45b3475d7aefc618992f94c322d94430f3/command/xbps-install.static' "${dest}/deps/command/"
+ln -sf '/versions/xbps.67bbffd91ead127391dcc5e1ab79e7bbe634c5f9e5e72b20f8ae2dba1b87faeb/command/xbps-install.static' "${dest}/deps/command/"
for f in '/versions/alpine-keys.7aa8a887a6f32ef454bca16fe2547b53b765170c2f8f0bab72ddd42c518bc941'/keys/alpine/*/*; do
test -f "$f"
@@ -60,7 +60,7 @@ for f in '/versions/alpine-keys.7aa8a887a6f32ef454bca16fe2547b53b765170c2f8f0bab
done
mkdir -p "${dest}/deps/keys/void"
-for f in '/versions/xbps.92731c8088c56653e67c85f730de3a45b3475d7aefc618992f94c322d94430f3'/keys/void/*; do
+for f in '/versions/xbps.67bbffd91ead127391dcc5e1ab79e7bbe634c5f9e5e72b20f8ae2dba1b87faeb'/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
@@ -7,8 +7,8 @@
#+s6-linux-utils.825109564ccf0b423888de36d9946db0453a95ffbce5970d994da9007f8a34cd
#+zsh.9330dcf8922d0de5ca2e8456ce19d85e6ed76365cfe1fe9cb3761569bfd0cbf6
#+confz.877bac2c08b700a05f02da53f4683976812d170cb8e8009e006ba7a169b580bd
-#+containers.b1a73e0fae9a61ed690d03a9414662fb3cf57cdaedda9d66a769b04b31fe3308
-#+xbps.92731c8088c56653e67c85f730de3a45b3475d7aefc618992f94c322d94430f3
+#+containers.df3b0d819f36631bdb2264e90342911d382396ff9d77c7e39d0f3f5440238db3
+#+xbps.67bbffd91ead127391dcc5e1ab79e7bbe634c5f9e5e72b20f8ae2dba1b87faeb
#+zstd.0c21eeca000c0fc1b714595d83cc5210adfa581edcf45820b95cb5921c46fcc4
#+apk-tools.c7f159a66814bc9be8c2840bf4fba46ee0a9ef6fdd1994c11b09d1dab82fb5d9
#+alpine-keys.7aa8a887a6f32ef454bca16fe2547b53b765170c2f8f0bab72ddd42c518bc941
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -21,13 +21,13 @@
#+pthbs-banginstall.457b2a62ae99241af2f242f0c8bdee49306e5070529448a61b56a7f55d3d2bb0
#+aat.26c64faca6c93aec6a952f93e4084d75104efe6f7c7fe589fdf2b4a2c8e73bd8
#+confz.877bac2c08b700a05f02da53f4683976812d170cb8e8009e006ba7a169b580bd
-#+containers.b1a73e0fae9a61ed690d03a9414662fb3cf57cdaedda9d66a769b04b31fe3308
+#+containers.df3b0d819f36631bdb2264e90342911d382396ff9d77c7e39d0f3f5440238db3
#+fileset.a0ba1abeae878cc17e1f0ceccc0c79ee7b75b0476e283b042be371b828285b1f
#+logincaps.1be5c33811603cdfe361449d2e898df0f2dc235bb73821be842c6169c6e3cfe9
#+snaprep.faf160dbb290f4b2a5f9b6605820a8f59b9534344c3b3b430c1cdf1a336a8a8f
#+curl.7d12db521501148254cee062ca7489c9381330bb81fcfb28239e7846987a5db8
#+git.1b76c97045e62b5f9105e0ca1eac2b191dc8d9ec960b4699b77b484a4c5dfb07
-#+xbps.92731c8088c56653e67c85f730de3a45b3475d7aefc618992f94c322d94430f3
+#+xbps.67bbffd91ead127391dcc5e1ab79e7bbe634c5f9e5e72b20f8ae2dba1b87faeb
#+apk-tools.c7f159a66814bc9be8c2840bf4fba46ee0a9ef6fdd1994c11b09d1dab82fb5d9
#+getent.69120bd1e42219ed632181e8c4743c83e86e377d4b1d1197e6f8aa4c227b38ef
#+getconf.d06714cd7fb7004ec1e093fa2ffec2f6dcc319f1a8b99e60db710d298df3c1ef
@@ -38,8 +38,8 @@
#+user-env.cdccc52b50fbacaeea62161170c6e3b770fa8dcd6a6e46af363cbbe451f6b5a4
#+strace.f9dbe83d3eaac5f19c4d7b3971928e97af25794472024ea02b4fd20ef5d977c2
#+mlog.7a615a6cd358a942b7d328b13562fc11cb3c82d2933f3de7fa727db87d48e6c2
-#+system-config.2746af8fb00c6dd31ad38f3cb9d9c2d0765187e1be8576fc587efa850298c58e
-#+system-config-rc.d5c64bff620165cab46e6991bb49c705c44ed0517507940d4065b0b18d8c244c
+#+system-config.135de846990293893c1044b9e36eaea3f3148c29b07a2480797abb3354044c7c
+#+system-config-rc.0b83d50e9a248aabc99ef4fd003e481fceadb5e7a8cfd17878522d7a4bceb1d9
#+system-config-scripts.743d8719166a57fed0c83d867e26997a6dafec7ae495b31ac69e13be475405fc
-#+system-config-init.ce6d16735a5629a46311f984ba03a7e746709e997a928f8cf163bc52d8b4ecb1
+#+system-config-init.e605ec3b25ad21dffb60ee715e0043d8dec07208ebfce50deb97880e45a8979c
#+system-config-zsh.2395a0ac100619f08b05c21044f60208ef3fcb135a9302047c299e6d7ee2a6b1
\ No newline at end of file
diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config
@@ -50,7 +50,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.5aff5032e3fbea4f6213475aa9a761da07438206eed44f3f67f136ca84f47d52' \
+ 'pthbs_path_containers=/versions/env.d81f3909822d775ce3c7c24a54c669564932cdb6cf6b2d34722b218322b51a7c' \
'pthbs_path_mdevd=/versions/env.5efd9db39293775a765dd3ca79798f1d6d991d82daea54a5bef5fffce4509f66' \
make -j${JOBS:-1} -l$((1+${JOBS:-1})) all
@@ -82,7 +82,7 @@ BEGIN {
x["./config/etc/motd"]=1
x["./config/etc/skel/loginexec"]=1
x["./config/hostname"]=1
- x["./keys/ssh/root"]=1
+ x["./keys/ssh/authorized_keys/root"]=1
}
function r1(s) {
diff --git a/variants/root-x86_64/system-config-init b/variants/root-x86_64/system-config-init
@@ -6,7 +6,7 @@
#+s6-portable-utils.f4a82103130cfcc49f440896a006e18566297bd1eaec89689a29869958a3982b
#+s6-linux-init.07931b00ba7cfaca6877d09e985caf229cbd20c34f35b30754a35b9d19762b56
#+execline.f0eae8694d48210e76b8c63d1021b7c54029a8db968696dcb8b720240cd7b8ab
-#+system-config-rc.d5c64bff620165cab46e6991bb49c705c44ed0517507940d4065b0b18d8c244c
+#+system-config-rc.0b83d50e9a248aabc99ef4fd003e481fceadb5e7a8cfd17878522d7a4bceb1d9
# - build script start -
@@ -29,7 +29,7 @@ qx() { # register executable as dependency and quote full path to be suitable f
"s6-quote" "$prefix/deps/command/$name"
}
-s6rcdb=/versions/system-config-rc.d5c64bff620165cab46e6991bb49c705c44ed0517507940d4065b0b18d8c244c/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.0b83d50e9a248aabc99ef4fd003e481fceadb5e7a8cfd17878522d7a4bceb1d9/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
@@ -4,7 +4,7 @@
#+busybox-diffutils.38ca9e723dfa24bd5cc2281952ff03c7dd312918a28dc0619b9816a293b5c8f5
#+s6-rc.6785af4c10f0e833235def47f34d88b8ac76fa2116f63d3bff478fb78de38b04
#+fileset.a0ba1abeae878cc17e1f0ceccc0c79ee7b75b0476e283b042be371b828285b1f
-#+system-config.2746af8fb00c6dd31ad38f3cb9d9c2d0765187e1be8576fc587efa850298c58e
+#+system-config.135de846990293893c1044b9e36eaea3f3148c29b07a2480797abb3354044c7c
# - build script start -
@@ -13,7 +13,7 @@ dest=${pthbs_destdir%/}${prefix}
cd 'system-config-rc'
-src=/versions/system-config.2746af8fb00c6dd31ad38f3cb9d9c2d0765187e1be8576fc587efa850298c58e/config/s6-rc-source
+src=/versions/system-config.135de846990293893c1044b9e36eaea3f3148c29b07a2480797abb3354044c7c/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,13 +21,13 @@
#+pthbs-banginstall.457b2a62ae99241af2f242f0c8bdee49306e5070529448a61b56a7f55d3d2bb0
#+aat.26c64faca6c93aec6a952f93e4084d75104efe6f7c7fe589fdf2b4a2c8e73bd8
#+confz.877bac2c08b700a05f02da53f4683976812d170cb8e8009e006ba7a169b580bd
-#+containers.b1a73e0fae9a61ed690d03a9414662fb3cf57cdaedda9d66a769b04b31fe3308
+#+containers.df3b0d819f36631bdb2264e90342911d382396ff9d77c7e39d0f3f5440238db3
#+fileset.a0ba1abeae878cc17e1f0ceccc0c79ee7b75b0476e283b042be371b828285b1f
#+logincaps.1be5c33811603cdfe361449d2e898df0f2dc235bb73821be842c6169c6e3cfe9
#+snaprep.faf160dbb290f4b2a5f9b6605820a8f59b9534344c3b3b430c1cdf1a336a8a8f
#+curl.7d12db521501148254cee062ca7489c9381330bb81fcfb28239e7846987a5db8
#+git.1b76c97045e62b5f9105e0ca1eac2b191dc8d9ec960b4699b77b484a4c5dfb07
-#+xbps.92731c8088c56653e67c85f730de3a45b3475d7aefc618992f94c322d94430f3
+#+xbps.67bbffd91ead127391dcc5e1ab79e7bbe634c5f9e5e72b20f8ae2dba1b87faeb
#+apk-tools.c7f159a66814bc9be8c2840bf4fba46ee0a9ef6fdd1994c11b09d1dab82fb5d9
#+getent.69120bd1e42219ed632181e8c4743c83e86e377d4b1d1197e6f8aa4c227b38ef
#+getconf.d06714cd7fb7004ec1e093fa2ffec2f6dcc319f1a8b99e60db710d298df3c1ef
diff --git a/variants/root-x86_64/xbps b/variants/root-x86_64/xbps
@@ -15,6 +15,8 @@ dest=${pthbs_destdir%/}${prefix}
cd 'xbps-0.59.2'
+export LDFLAGS=--static
+export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS"
build_env_static() {
export LD_LIBRARY_PATH="$pthbs_build_environment/library"
export CPATH="$pthbs_build_environment/include"
@@ -39,6 +41,7 @@ find lib bin -name '*.c' -exec sed -iEe '/#.*_GNU_SOURCE/d' '{}' \;
make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C include
make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C lib libxbps.a
+
install -d "$dest/library"
install -m 644 lib/libxbps.a "$dest/library"
install -d "$dest/command"
