mrrl

Minimal Reliable Reproducible Linux
git clone https://ccx.te2000.cz/git/mrrl
Log | Files | Refs | Submodules | README

commit b2ba5883b3854d7d6cb0af55548ecd344c7baa4d
parent 55991ddbd89e13293c0b068d331914233a9cc032
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Tue,  9 Dec 2025 19:56:50 +0000

update xbps

Diffstat:
Mdownloadlist.sha256 | 1+
Mtemplates/pkg/xbps | 4++--
Mvariants/ccx-x86_64/containers | 6+++---
Mvariants/ccx-x86_64/containers.environment | 4++--
Mvariants/ccx-x86_64/default.environment | 10+++++-----
Mvariants/ccx-x86_64/system-config | 2+-
Mvariants/ccx-x86_64/system-config-init | 4++--
Mvariants/ccx-x86_64/system-config-rc | 4++--
Mvariants/ccx-x86_64/userspace.environment | 4++--
Mvariants/ccx-x86_64/xbps | 4++--
Mvariants/root-x86_64/containers | 6+++---
Mvariants/root-x86_64/containers.environment | 4++--
Mvariants/root-x86_64/default.environment | 10+++++-----
Mvariants/root-x86_64/system-config | 2+-
Mvariants/root-x86_64/system-config-init | 4++--
Mvariants/root-x86_64/system-config-rc | 4++--
Mvariants/root-x86_64/userspace.environment | 4++--
Mvariants/root-x86_64/xbps | 4++--
18 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/downloadlist.sha256 b/downloadlist.sha256 @@ -148,3 +148,4 @@ e0a79e0922be2da686a1888d79cd253baaf81c2f30b4378fbbcf9ff9d632aab5 3976 https://de a3903371efcce8a405c5c245d029e9f6850258a60fa3761c4d58995610949b31 11724552 https://downloads.sourceforge.net/sourceforge/tcl/tcl8.6.17-src.tar.gz 49a7da83b0bdd9f46d04a04deec19c7767bb9a323e40c4781f89caf760b92c34 632363 https://downloads.sourceforge.net/project/expect/Expect/5.45.4/expect5.45.4.tar.gz 755b87aa1e25c24c4c1668de5573d7d9a327b529423ce3ad9ee753bfb2296e33 1295401 https://www.cpan.org/src/misc/nvi-1.79.tar.gz +f51d528fa680873914aa8367707726dd777fccc6e5c95cfad90fdb3562375c04 435801 https://github.com/void-linux/xbps/archive/0.60.6.tar.gz diff --git a/templates/pkg/xbps b/templates/pkg/xbps @@ -1,5 +1,5 @@ {%- import "package_sets" as ps -%} -{%- set pkg_version="0.59.2" -%} +{%- set pkg_version="0.60.6" -%} {% extends "genlinks" %} {%- do import_functions.update(["build_env_static", "check_static"]) %} {% block package_deps -%} @@ -8,7 +8,7 @@ #+{{pkg_install_name("libarchive")}} #+{{pkg_install_name("libressl")}} #+{{pkg_install_name("pkgconf-pkg-config")}} -#@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:. +#@untar:-z:sha256:f51d528fa680873914aa8367707726dd777fccc6e5c95cfad90fdb3562375c04:. {% endblock %} {% block configure %} export LDFLAGS=--static diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers @@ -32,7 +32,7 @@ #+execline.49940e3d6f0e84ccbcddfce3dd2db760ad451a312896a69902b3f8e95a600e92 #+alpine-keys.b022c8887d93ae486745981a1749acfe6e602da6f3cee54c5582da3e56548611 #+apk-tools.29e0d5e4389d0c818110ff0eef0af390ecd9f9439e8394831e68094ecf7ac80d -#+xbps.7f916ad1c15fcd657275468b53f75be0dbf7ef9e881d50056c727e532d95bd72 +#+xbps.dbd3b89a0321643f94548da21e85b9035b2dc5103a541fefdd9f3ed6f36055ac #+container-bin-image.bcac89ddc838dbd518657de9b8d947ba47b6f89d547a85d6c93cc97075ad195d #@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.29e0d5e4389d0c818110ff0eef0af390ecd9f9439e8394831e68094ecf7ac80d/command/apk.static' "${dest}/deps/command/" -ln -sf '/home/ccx/versions/xbps.7f916ad1c15fcd657275468b53f75be0dbf7ef9e881d50056c727e532d95bd72/command/xbps-install.static' "${dest}/deps/command/" +ln -sf '/home/ccx/versions/xbps.dbd3b89a0321643f94548da21e85b9035b2dc5103a541fefdd9f3ed6f36055ac/command/xbps-install.static' "${dest}/deps/command/" for f in '/home/ccx/versions/alpine-keys.b022c8887d93ae486745981a1749acfe6e602da6f3cee54c5582da3e56548611'/keys/alpine/*/*; do test -f "$f" @@ -87,7 +87,7 @@ for f in '/home/ccx/versions/alpine-keys.b022c8887d93ae486745981a1749acfe6e602da done mkdir -p "${dest}/deps/keys/void" -for f in '/home/ccx/versions/xbps.7f916ad1c15fcd657275468b53f75be0dbf7ef9e881d50056c727e532d95bd72'/keys/void/*; do +for f in '/home/ccx/versions/xbps.dbd3b89a0321643f94548da21e85b9035b2dc5103a541fefdd9f3ed6f36055ac'/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 @@ -51,8 +51,8 @@ #+s6-linux-utils.d1a273c7c3eb1a7ba3fd51168731cab02cb23df123e9e5a8ae029a14a5091df1 #+zsh.e0e344116c0b1b13af597b28046c86056c421b5b63cb4872ce325735cfd51e5a #+confz.f0c5901534e31abbfd9a894e726f877d840e9a4f2e2855de94fa1b8b3252ac4d -#+containers.0fdf11ab510ef4b791b6d68dcae332c43fbac7716a3dc03a1c68153d1519a461 -#+xbps.7f916ad1c15fcd657275468b53f75be0dbf7ef9e881d50056c727e532d95bd72 +#+containers.93da4f0b0b800ef0e2e4e4285fd121a0ecaa7490f791545966ed9770b0bab384 +#+xbps.dbd3b89a0321643f94548da21e85b9035b2dc5103a541fefdd9f3ed6f36055ac #+zstd.07ebc1d049247600d4df20a2640d366674671001d16f9d046fbef08699a688c0 #+apk-tools.29e0d5e4389d0c818110ff0eef0af390ecd9f9439e8394831e68094ecf7ac80d #+alpine-keys.b022c8887d93ae486745981a1749acfe6e602da6f3cee54c5582da3e56548611 diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment @@ -66,13 +66,13 @@ #+pthbs-banginstall.2f554dd88a98e191c4d4fc675e7fac0f970943d9c498ea08cb886df9d06b68df #+aat.9e1a8d84c57afc208692dea539729548b5e2c84a062f232d0abb0eabebd845c7 #+confz.f0c5901534e31abbfd9a894e726f877d840e9a4f2e2855de94fa1b8b3252ac4d -#+containers.0fdf11ab510ef4b791b6d68dcae332c43fbac7716a3dc03a1c68153d1519a461 +#+containers.93da4f0b0b800ef0e2e4e4285fd121a0ecaa7490f791545966ed9770b0bab384 #+fileset.e5a151f626de3d82ae8cbffbe8df007f016ae78c7a795565377da03798048476 #+logincaps.dff305698371563065d0ae0795204a975129931ea7a3c066701f7fc21dfbda4c #+snaprep.e1f72149bfae312f87fba56b1598446eeec81db67b3a2e98dc894d185924d29b #+curl.6cd80be195a14ec4aec65793a00822f40ca1b1a923c321e3cfae9c085f4a6d89 #+git.d29443166e3f49fbd2c291e34c8cb67deab2e7699502cd70a35745eed68c1fb6 -#+xbps.7f916ad1c15fcd657275468b53f75be0dbf7ef9e881d50056c727e532d95bd72 +#+xbps.dbd3b89a0321643f94548da21e85b9035b2dc5103a541fefdd9f3ed6f36055ac #+apk-tools.29e0d5e4389d0c818110ff0eef0af390ecd9f9439e8394831e68094ecf7ac80d #+getent.6facc15ef702b77a02ba93519f2bc0ca161b55b4704e7607138c1eb7a2cca041 #+getconf.01f635c0c4990943f486910044aa5678283c027b066a0ba4901f10355aa64213 @@ -89,9 +89,9 @@ #+squashfs-tools.d674abf818e01e9a46d0a6e995c2fa8f4e6086671e2b4d8345e8f592e0558128 #+mandoc.e037587ebdf49fabbb28d83caa5b22be308fa7406c22f4f7545106426c458bdc #+tinyssh.0ac46feb5c124a8975937476f186cccae55fefec0cb8865ff2bac544a2af31af -#+system-config.f9213dab492712d3584cebd6f8898c30081c9845d9200e97a6d0fdfedfd2c571 -#+system-config-rc.68bcf6a3dd5313d66e5c2a012c33340452b99ad1a3923ee2cafd232c601b0bea +#+system-config.bbcfdbf8e0ee32bea04c063bcfa46c7a97ba5f40770788d124c5dca3c63968d1 +#+system-config-rc.46af8598ac07cc90b88df4cfbeaadb64241770f1899b9980ac7c605241646b75 #+system-config-scripts.0c081aa66e7b2b7ccfb20f9c75e5dfff8f8d6804d0b4624934a8059354c14d9e -#+system-config-init.5ae243c2576863d64b21019278bd8bf507309a4e9883a1fa56380b4ede275569 +#+system-config-init.c5102963a2af8206212030768edf403cbbe938ba2b8694c96d4fd53b81490ea7 #+system-config-zsh.4fbaba9e3faaa13ba5a2d93a2b3dc4a5a94ebb5ed5bb7facfc94308076a14253 #+busybox.36df1e8543d0b5195f916843937333d8f8e3561445e8ca933ab21271b5ebe855 \ No newline at end of file diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config @@ -98,7 +98,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.223aa1c06e8df58b6e2329157bf13c060a2d4f9d5466f49b717068e23ee7bdda' \ + 'pthbs_path_containers=/home/ccx/versions/env.a70f9ae1e5096856e7f60e6eea65cdf6a35a99da4fd4dc09fac621446c596060' \ 'pthbs_path_mdevd=/home/ccx/versions/env.e2f79ac0cba2c32709d0bcb0993314202e512f41afc7bd19a88dc5984e95bd88' \ 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 @@ -51,7 +51,7 @@ #+s6-portable-utils.7f4db6a16ab09d3822d709aec42170cb1d2c7c752d88f13e3792e747cbd09a28 #+s6-linux-init.39d00512c8a37829a751fbbe1a7cfc37003dc9e3924d0ca13722eb2835830c2b #+execline.49940e3d6f0e84ccbcddfce3dd2db760ad451a312896a69902b3f8e95a600e92 -#+system-config-rc.68bcf6a3dd5313d66e5c2a012c33340452b99ad1a3923ee2cafd232c601b0bea +#+system-config-rc.46af8598ac07cc90b88df4cfbeaadb64241770f1899b9980ac7c605241646b75 # - build script start - @@ -76,7 +76,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/home/ccx/versions/system-config-rc.68bcf6a3dd5313d66e5c2a012c33340452b99ad1a3923ee2cafd232c601b0bea/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.46af8598ac07cc90b88df4cfbeaadb64241770f1899b9980ac7c605241646b75/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.59467ff733b5e802f382c98960aae2c6ecfc7b82fa42db3df679593dc1ec8036 #+s6-rc.b3ba6e214c85c2f5cb10d42dd9d344798a776c86a200911d7eec95bcc955ef48 #+fileset.e5a151f626de3d82ae8cbffbe8df007f016ae78c7a795565377da03798048476 -#+system-config.f9213dab492712d3584cebd6f8898c30081c9845d9200e97a6d0fdfedfd2c571 +#+system-config.bbcfdbf8e0ee32bea04c063bcfa46c7a97ba5f40770788d124c5dca3c63968d1 # - build script start - @@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/home/ccx/versions/system-config.f9213dab492712d3584cebd6f8898c30081c9845d9200e97a6d0fdfedfd2c571/config/s6-rc-source +src=/home/ccx/versions/system-config.bbcfdbf8e0ee32bea04c063bcfa46c7a97ba5f40770788d124c5dca3c63968d1/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 @@ -66,13 +66,13 @@ #+pthbs-banginstall.2f554dd88a98e191c4d4fc675e7fac0f970943d9c498ea08cb886df9d06b68df #+aat.9e1a8d84c57afc208692dea539729548b5e2c84a062f232d0abb0eabebd845c7 #+confz.f0c5901534e31abbfd9a894e726f877d840e9a4f2e2855de94fa1b8b3252ac4d -#+containers.0fdf11ab510ef4b791b6d68dcae332c43fbac7716a3dc03a1c68153d1519a461 +#+containers.93da4f0b0b800ef0e2e4e4285fd121a0ecaa7490f791545966ed9770b0bab384 #+fileset.e5a151f626de3d82ae8cbffbe8df007f016ae78c7a795565377da03798048476 #+logincaps.dff305698371563065d0ae0795204a975129931ea7a3c066701f7fc21dfbda4c #+snaprep.e1f72149bfae312f87fba56b1598446eeec81db67b3a2e98dc894d185924d29b #+curl.6cd80be195a14ec4aec65793a00822f40ca1b1a923c321e3cfae9c085f4a6d89 #+git.d29443166e3f49fbd2c291e34c8cb67deab2e7699502cd70a35745eed68c1fb6 -#+xbps.7f916ad1c15fcd657275468b53f75be0dbf7ef9e881d50056c727e532d95bd72 +#+xbps.dbd3b89a0321643f94548da21e85b9035b2dc5103a541fefdd9f3ed6f36055ac #+apk-tools.29e0d5e4389d0c818110ff0eef0af390ecd9f9439e8394831e68094ecf7ac80d #+getent.6facc15ef702b77a02ba93519f2bc0ca161b55b4704e7607138c1eb7a2cca041 #+getconf.01f635c0c4990943f486910044aa5678283c027b066a0ba4901f10355aa64213 diff --git a/variants/ccx-x86_64/xbps b/variants/ccx-x86_64/xbps @@ -32,7 +32,7 @@ #+libarchive.248d976ef1b0b84c6813bdaca02d1a513850721d3bad7642b2b675930b05c4e9 #+libressl.52dc61e1ae2a68ecd33b56ecd5b6fa148bfb124535d2659e3171693a31b2534b #+pkgconf-pkg-config.d2f1547322d9ba8762a3aa73f0851720b99a3f5e95eb1531b7f8764f5c61c44f -#@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:. +#@untar:-z:sha256:f51d528fa680873914aa8367707726dd777fccc6e5c95cfad90fdb3562375c04:. # - build script start - @@ -60,7 +60,7 @@ check_static() { prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} -cd 'xbps-0.59.2' +cd 'xbps-0.60.6' export LDFLAGS=--static diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers @@ -32,7 +32,7 @@ #+execline.770a7209a0ab50477d1ea726742169464a00deacf6abec0f04c9eb69e3243cd5 #+alpine-keys.cf3dceec55832153ba2ec813edf663f098e3b72412def85cb3485ff7fa24ea49 #+apk-tools.61768759a496abcc715d250d77f79791b387de45fa05a9586007a253361f5be5 -#+xbps.544cf20a2418e9a001cc35772d03bc4d86532d829c580c5a56e2ea53d285e140 +#+xbps.69364d36e92092cbf35b90735185bfa6fc260c1e04adc49f21fb1a7ca64bb171 #+container-bin-image.cec1da4521ccf8e06a620a0b93cac108b4177232c2d5323d8aedd33d83ffee63 #@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.61768759a496abcc715d250d77f79791b387de45fa05a9586007a253361f5be5/command/apk.static' "${dest}/deps/command/" -ln -sf '/versions/xbps.544cf20a2418e9a001cc35772d03bc4d86532d829c580c5a56e2ea53d285e140/command/xbps-install.static' "${dest}/deps/command/" +ln -sf '/versions/xbps.69364d36e92092cbf35b90735185bfa6fc260c1e04adc49f21fb1a7ca64bb171/command/xbps-install.static' "${dest}/deps/command/" for f in '/versions/alpine-keys.cf3dceec55832153ba2ec813edf663f098e3b72412def85cb3485ff7fa24ea49'/keys/alpine/*/*; do test -f "$f" @@ -87,7 +87,7 @@ for f in '/versions/alpine-keys.cf3dceec55832153ba2ec813edf663f098e3b72412def85c done mkdir -p "${dest}/deps/keys/void" -for f in '/versions/xbps.544cf20a2418e9a001cc35772d03bc4d86532d829c580c5a56e2ea53d285e140'/keys/void/*; do +for f in '/versions/xbps.69364d36e92092cbf35b90735185bfa6fc260c1e04adc49f21fb1a7ca64bb171'/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 @@ -51,8 +51,8 @@ #+s6-linux-utils.6b758d348392935fdee002a2ab4186ca505252fb4ef2e12d9e625ff809fb4f0d #+zsh.1a1dc53d5f416fc9aa70a2cc12a22c15fa307ee165d95b232431af9311f6e91a #+confz.56e8e5a838da4d763920012f278cd42d4e9e991cc202e114602b7d775a40dd30 -#+containers.6b7692ba4698e184fc2ecc5692c48bcbfa6c2f966100a15a23aea8049d1b0755 -#+xbps.544cf20a2418e9a001cc35772d03bc4d86532d829c580c5a56e2ea53d285e140 +#+containers.ddfe912cf89feff4e18d20007228d043424ef8b76b6377f1d62de02ab7116bbb +#+xbps.69364d36e92092cbf35b90735185bfa6fc260c1e04adc49f21fb1a7ca64bb171 #+zstd.34cc749f8c590e889c6486d4f33b8c57208e3c6e7d36281d84689fac44b9a64c #+apk-tools.61768759a496abcc715d250d77f79791b387de45fa05a9586007a253361f5be5 #+alpine-keys.cf3dceec55832153ba2ec813edf663f098e3b72412def85cb3485ff7fa24ea49 diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment @@ -66,13 +66,13 @@ #+pthbs-banginstall.cf8d636767eb2c6154f1148d3d57155ceb62b7a910a8634820c369408c18bc81 #+aat.e3e638e18b98d6c6fd82d1f1eba60082f4cfcd2e196c975cfd621f88f00e40f0 #+confz.56e8e5a838da4d763920012f278cd42d4e9e991cc202e114602b7d775a40dd30 -#+containers.6b7692ba4698e184fc2ecc5692c48bcbfa6c2f966100a15a23aea8049d1b0755 +#+containers.ddfe912cf89feff4e18d20007228d043424ef8b76b6377f1d62de02ab7116bbb #+fileset.f310a9481c4fdb71269bb232f4ae4c004a62c44ee2a053a3b1500d67813a91d3 #+logincaps.3aafc7b5cc23f3d491ec65b0d2517277ee00d568d50e1c4aa9a5484e7b858992 #+snaprep.c514bc4fb9267d7c957a1e104f808965a2d3617274e0c788c97f97f3ebc7b35f #+curl.8b29d0d07850c3479c1121b0a82ae5bd23df62dbda486169ba5428bb6de6997e #+git.5da300b219686367e9b33ce0e2a7e008684931ba314c2749bcbc929764fec01a -#+xbps.544cf20a2418e9a001cc35772d03bc4d86532d829c580c5a56e2ea53d285e140 +#+xbps.69364d36e92092cbf35b90735185bfa6fc260c1e04adc49f21fb1a7ca64bb171 #+apk-tools.61768759a496abcc715d250d77f79791b387de45fa05a9586007a253361f5be5 #+getent.7b570642d6e9f3dbabe2ff123493183b0d8c55d8b11a566481714715dfe4a011 #+getconf.ba42a5c8dd76d3d007443c31947f8b18ff6b8ac8839eeb326878b99a552c238f @@ -89,9 +89,9 @@ #+squashfs-tools.d17a5fe5700099cda5f27c79c24f4a75314d9c2160d9e5a31b1b4baf5b6c3365 #+mandoc.6f6a20cc42e1e71817249856c921d8e3686a869c979a34fcbd19de2ab00130ac #+tinyssh.7b2b9a4c3ff2d42a7b138c3830eb3c0a275aa391fb0812ccaecca383d2e6caa8 -#+system-config.1f774dd2af5ef1eea2ca5bbf3d91480197701525bf2ba1447cc5eb9de6ad5688 -#+system-config-rc.d2ebc3a85596d6b238f63b3be2367a355828a86ea448679baf25b04bc7c60bed +#+system-config.4d02c9bf2508381c3196de8896b97b92e01669550417da841ba6e384b8e4d874 +#+system-config-rc.474564583175d74d1727c7632b25cbcee3f049aa2b58a745249a6bace1a58ceb #+system-config-scripts.ac2a449afef9d2c804ccca9869bdb1eaf89223a1b687c8e154f4a46216566b11 -#+system-config-init.234d5d8af6dacf8b630e68d0107046788983eedf3d9121ed3963da4d23e5507e +#+system-config-init.6d5b6a1f6aa806f55321f22f4fad2a61cf1425bc1532e432beb8fb81948b465d #+system-config-zsh.cbbd0ea2d203a601fb2497946adaba74910fd150b071dacffb1d82dd8c4fb33f #+busybox-modutils.5f321825e26ecc84ba02a1cd21c040ccb3cb8324b94d5b9492012eb5163a5aa7 \ No newline at end of file diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config @@ -98,7 +98,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.5195222f75ac8373bd37370801d36461409ffc79fbf587dc8c29f5fd26d09699' \ + 'pthbs_path_containers=/versions/env.bc4eb2c9a3f3856f260c3023870bd30813996e35700efb62ef7b8ec1c9aca3e1' \ 'pthbs_path_mdevd=/versions/env.5e5cccbd0bd86989eb0263bd18dab27db9db6906cce4db4e70dc474fa3a0424d' \ 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 @@ -51,7 +51,7 @@ #+s6-portable-utils.88a5962bf96a590c8844071c1802840557768dc0a96078b815c1d9aa08ebe27c #+s6-linux-init.7a9d91b21cceaf06297ddc4522c7be945b051eb94cd21da564920db0003350e4 #+execline.770a7209a0ab50477d1ea726742169464a00deacf6abec0f04c9eb69e3243cd5 -#+system-config-rc.d2ebc3a85596d6b238f63b3be2367a355828a86ea448679baf25b04bc7c60bed +#+system-config-rc.474564583175d74d1727c7632b25cbcee3f049aa2b58a745249a6bace1a58ceb # - build script start - @@ -76,7 +76,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/versions/system-config-rc.d2ebc3a85596d6b238f63b3be2367a355828a86ea448679baf25b04bc7c60bed/config/s6-rc-db +s6rcdb=/versions/system-config-rc.474564583175d74d1727c7632b25cbcee3f049aa2b58a745249a6bace1a58ceb/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.7297c795754c245870d8ba99b3907f9ec3932726a5af6b8d15980adcbf6c0059 #+s6-rc.bc50208569d8e23862ac3fcf169ea24354b3a9693c961a7139ed0fbaeb05ce86 #+fileset.f310a9481c4fdb71269bb232f4ae4c004a62c44ee2a053a3b1500d67813a91d3 -#+system-config.1f774dd2af5ef1eea2ca5bbf3d91480197701525bf2ba1447cc5eb9de6ad5688 +#+system-config.4d02c9bf2508381c3196de8896b97b92e01669550417da841ba6e384b8e4d874 # - build script start - @@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/versions/system-config.1f774dd2af5ef1eea2ca5bbf3d91480197701525bf2ba1447cc5eb9de6ad5688/config/s6-rc-source +src=/versions/system-config.4d02c9bf2508381c3196de8896b97b92e01669550417da841ba6e384b8e4d874/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 @@ -66,13 +66,13 @@ #+pthbs-banginstall.cf8d636767eb2c6154f1148d3d57155ceb62b7a910a8634820c369408c18bc81 #+aat.e3e638e18b98d6c6fd82d1f1eba60082f4cfcd2e196c975cfd621f88f00e40f0 #+confz.56e8e5a838da4d763920012f278cd42d4e9e991cc202e114602b7d775a40dd30 -#+containers.6b7692ba4698e184fc2ecc5692c48bcbfa6c2f966100a15a23aea8049d1b0755 +#+containers.ddfe912cf89feff4e18d20007228d043424ef8b76b6377f1d62de02ab7116bbb #+fileset.f310a9481c4fdb71269bb232f4ae4c004a62c44ee2a053a3b1500d67813a91d3 #+logincaps.3aafc7b5cc23f3d491ec65b0d2517277ee00d568d50e1c4aa9a5484e7b858992 #+snaprep.c514bc4fb9267d7c957a1e104f808965a2d3617274e0c788c97f97f3ebc7b35f #+curl.8b29d0d07850c3479c1121b0a82ae5bd23df62dbda486169ba5428bb6de6997e #+git.5da300b219686367e9b33ce0e2a7e008684931ba314c2749bcbc929764fec01a -#+xbps.544cf20a2418e9a001cc35772d03bc4d86532d829c580c5a56e2ea53d285e140 +#+xbps.69364d36e92092cbf35b90735185bfa6fc260c1e04adc49f21fb1a7ca64bb171 #+apk-tools.61768759a496abcc715d250d77f79791b387de45fa05a9586007a253361f5be5 #+getent.7b570642d6e9f3dbabe2ff123493183b0d8c55d8b11a566481714715dfe4a011 #+getconf.ba42a5c8dd76d3d007443c31947f8b18ff6b8ac8839eeb326878b99a552c238f diff --git a/variants/root-x86_64/xbps b/variants/root-x86_64/xbps @@ -32,7 +32,7 @@ #+libarchive.cbd7eb99f26e886142a4616f0aaebfabeeb144dc573a52d4af91287c49552b07 #+libressl.d21c86e599c742080e4e8fc933081a93048448f55fa5d5c0f91335a107827204 #+pkgconf-pkg-config.c3d31ede6d00be8bbefb3513e3836d725a51781409722f7ab58d0a856a2a9738 -#@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:. +#@untar:-z:sha256:f51d528fa680873914aa8367707726dd777fccc6e5c95cfad90fdb3562375c04:. # - build script start - @@ -60,7 +60,7 @@ check_static() { prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} -cd 'xbps-0.59.2' +cd 'xbps-0.60.6' export LDFLAGS=--static