mrrl

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

commit 5ad446ef6e72a83d84e4f8dca8c3df55f89f5d68
parent c2d9cb87b56409c43acb6c30ef78edefaebc2d1b
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Tue, 15 Apr 2025 00:28:44 +0000

Network admin container and shell access

Diffstat:
Mcommitlist.sha1 | 5++++-
Mvariants/ccx-x86_64/apk-tools | 2+-
Mvariants/ccx-x86_64/containers | 4++--
Mvariants/ccx-x86_64/containers.environment | 4++--
Mvariants/ccx-x86_64/default.environment | 12++++++------
Mvariants/ccx-x86_64/logincaps | 2+-
Mvariants/ccx-x86_64/system-config | 10+++++-----
Mvariants/ccx-x86_64/system-config-init | 4++--
Mvariants/ccx-x86_64/system-config-rc | 4++--
Mvariants/ccx-x86_64/userspace.environment | 6+++---
Mvariants/root-x86_64/apk-tools | 2+-
Mvariants/root-x86_64/containers | 4++--
Mvariants/root-x86_64/containers.environment | 4++--
Mvariants/root-x86_64/default.environment | 12++++++------
Mvariants/root-x86_64/logincaps | 2+-
Mvariants/root-x86_64/system-config | 10+++++-----
Mvariants/root-x86_64/system-config-init | 4++--
Mvariants/root-x86_64/system-config-rc | 4++--
Mvariants/root-x86_64/userspace.environment | 6+++---
19 files changed, 52 insertions(+), 49 deletions(-)

diff --git a/commitlist.sha1 b/commitlist.sha1 @@ -348,7 +348,8 @@ fbb12ddc6a53ad97ff6bcc7ed9b253c09001ad2f sources/busybox fd0e197d9c746faec8c8854fcfd416964440615d sources/busybox ffe18087faa553747d68ce662e0d4e9e7265fc3f sources/busybox c6aef8098d37a1773439117a5674bfc8662ef62b sources/confz -2f95e15270f2d0bf0d3b9b9b276c146c6bfd1776 sources/containers +3955e658562cef8e6012c1936a6c79c6b6628773 sources/containers +3b0d0d748309e2c5a2057f5374cb43e8a00647aa sources/containers 41d6ee2d6aa33b323eee611013dd4aab6a09fc89 sources/containers 46761773f4cb590dc89b0f80f5e9fe07399279e7 sources/containers 9d4d5eb5ea0c3f8ef9bf69559dbeb01d043d9ac2 sources/containers @@ -1742,6 +1743,7 @@ fd1fffbfd4053059e11ea234640d50c190bd93a7 sources/libcap fd31b6cd318194906fc8f6cea582e475c67ec207 sources/libcap fe5933431ff6448158754e96e8115c4c79a1c540 sources/libcap fe96617b7142db04c5fbb5f8ce6ca809ad171072 sources/libcap +137140ca4e9eb11c9ff821e2d22828fe3fcef489 sources/logincaps 41039418205b48bda59372fb7c49453852853e8a sources/logincaps 4c3d6d043f7abc2f9593e647f357199badc2668b sources/logincaps 6c9b7c1ca9b96ab366088c4bfc50d1b0e81042eb sources/logincaps @@ -2213,6 +2215,7 @@ f3cfdbc950c7c787397bbfc57b9a70a7bd2e5c5d sources/skalibs fe6a7178c290979b822e287014f7c2f93aa0a732 sources/skalibs ff066bd37e692daadc573fbd3ef622c3f1e8ec6a sources/skalibs e9d8af262eb5e25536ea9778e3ed57aebb55488c sources/snaprep +3d3989ad766c608d254c8bb43dc22c23acfbb6b6 sources/system-config f41e8fb1dda464b6f5bf4c1f77c3fadd8593717a sources/system-config f9d071a4c5870d42d00d0ca496efac527388e6f4 sources/system-config dc793695cc0632a808af9d4415f3b0cf0f4dfba2 sources/system-config-scripts diff --git a/variants/ccx-x86_64/apk-tools b/variants/ccx-x86_64/apk-tools @@ -7,7 +7,7 @@ #+libressl.d907dd980ecd24307dada8e708792ac6e67999fef097613c478801bc1102dfa9 #+zstd.8b11bd81c450d61aa6a44ffd019654c590439df68ebd8987db4cdbbcf182d67c #+pkgconf-pkg-config.86f9c193f6ccc64cc2ac696a7e3a258f01b8d0c539312ae37c08ea2354332e90 -#@git:aeb74de67818dedb3f4e1c1175e8182ef5eae8d9:apk-tools +#@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools #@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch check_static() { diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers @@ -3,7 +3,7 @@ #+zsh.f79a20125b2f520d3719411e6f0895cf4f2e0657565c3fef07b3069436b8960f #+pthbs-banginstall.7ddbf08ba8b1298841fad793d4ed7ba4979b9346155195489fc5e492ed5f0fe2 #+execline.1505a32c24aa5dbf362550f39283c9ff1936e717e5a82d220f8212cd9e604d8f -#@git:2f95e15270f2d0bf0d3b9b9b276c146c6bfd1776:containers +#@git:3b0d0d748309e2c5a2057f5374cb43e8a00647aa:containers : ${JOBS:=1} prefix=/home/ccx/versions/$pthbs_package @@ -37,7 +37,7 @@ printf '%s\n' >"$pkgdir/zsh/site-functions/confz_containers_pthbs_init" \ "typeset -g container_xbps_install_executable='$prefix/deps/command/xbps-install.static'" mkdir -p "$pkgdir/deps/command" -ln -sf '/home/ccx/versions/apk-tools.81bbae0e3a21166adb9b536021a58df7eb0b5dc697c0137e4921ec221639d01e/command/apk.static' "$pkgdir/deps/command/" +ln -sf '/home/ccx/versions/apk-tools.d0d7af182121c66cd5587b51689275557a37562fa1d20b9137b33a97fa12d152/command/apk.static' "$pkgdir/deps/command/" ln -sf '/home/ccx/versions/xbps.e77402565036595f7c0410b63d0ede43ff75c3a9394c0ba075558b5acb8a35b9/command/xbps-install.static' "$pkgdir/deps/command/" for f in '/home/ccx/versions/alpine-keys.dedc78b0b50e461d33a449adf40691698925b5eb9af8a6b69e7c0ece6b708ef4'/keys/alpine/*/*; do diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment @@ -6,10 +6,10 @@ #+s6-linux-utils.1990b55837ff2c28a81500d80292c6d530c8516347eb896007eb5aed2af6c425 #+zsh.f79a20125b2f520d3719411e6f0895cf4f2e0657565c3fef07b3069436b8960f #+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a -#+containers.66428b207ac9ea1d8331e9eaab0848b88f2ce67dbb0dfc2dbc911f90ab7b7a7c +#+containers.24571a2ed64695863d34cdb9b3f7387dedab57d6f19a19bb2d7b9d5b7242d945 #+xbps.e77402565036595f7c0410b63d0ede43ff75c3a9394c0ba075558b5acb8a35b9 #+zstd.8b11bd81c450d61aa6a44ffd019654c590439df68ebd8987db4cdbbcf182d67c -#+apk-tools.81bbae0e3a21166adb9b536021a58df7eb0b5dc697c0137e4921ec221639d01e +#+apk-tools.d0d7af182121c66cd5587b51689275557a37562fa1d20b9137b33a97fa12d152 #+alpine-keys.dedc78b0b50e461d33a449adf40691698925b5eb9af8a6b69e7c0ece6b708ef4 #+getent.497826562f0e3021d114ff3f47654fa0b574041039df71dbc4e509d38fa55447 #+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737 diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment @@ -1,7 +1,7 @@ -#+system-config.c5114f2cc85d94e6ea07a741f36f859f2ba98ba4da0f9e6291e11de483146958 -#+system-config-rc.ac51dec71ae105eab929a7b8a8147c6757bc81a210588d901ba8de2469c75e07 +#+system-config.0632d9c86d18f4d6924fee7a6efeb153bc31e97795ac2029c497f4050675c3fd +#+system-config-rc.683a0518388872f86e3dd09b7379e31da2411b5f239aa36acd7e072134be4811 #+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d -#+system-config-init.5dcae7c69d5a04cb1c7c90b88b4fa786b3cc5bb469f8fb64d66a9ad13d82591d +#+system-config-init.f4dd1d72e3fd36a3c086494b415b27351c7584be77daa79cdac39cc80a4d5106 #+system-config-zsh.250277c1fe17ccb13b5efbacd35ecb3b8342e30910cdd709f89475773bb7f309 #+busybox.ee3440974794767b833fd3299226771f170d3f8601cf225cb884f0a513db8ab3 #+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b @@ -25,14 +25,14 @@ #+pthbs-banginstall.7ddbf08ba8b1298841fad793d4ed7ba4979b9346155195489fc5e492ed5f0fe2 #+aat.0698d0082830b7f8bcf3840f3f8c25382ef2d9f174dd6d5407c5e2132d1f16e4 #+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a -#+containers.66428b207ac9ea1d8331e9eaab0848b88f2ce67dbb0dfc2dbc911f90ab7b7a7c +#+containers.24571a2ed64695863d34cdb9b3f7387dedab57d6f19a19bb2d7b9d5b7242d945 #+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737 -#+logincaps.3807c06e6e12534990449ba0aed2e1f43e6dfa91b928ce7d4bee7536409a5841 +#+logincaps.bd11e48d2f72464e0cff970248089cc7d25921ae6c175262702cc9566f4cd30e #+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7 #+curl.363090b3afccfe46f001c57627d39283abe5cc6a6357ee493bd55f8ab11607ba #+git.c969489861a9208c195a11e9ec701d8f322e68505dff04cc209453a1f68fa1fc #+xbps.e77402565036595f7c0410b63d0ede43ff75c3a9394c0ba075558b5acb8a35b9 -#+apk-tools.81bbae0e3a21166adb9b536021a58df7eb0b5dc697c0137e4921ec221639d01e +#+apk-tools.d0d7af182121c66cd5587b51689275557a37562fa1d20b9137b33a97fa12d152 #+getent.497826562f0e3021d114ff3f47654fa0b574041039df71dbc4e509d38fa55447 #+getconf.62760a9db3bdba375752c0a4f8722b5e0ee3c4eded1ab1073a73533c116f6de5 #+iconv.e574881283799fa144f1d9df753a05d9f7effa47ae0a06a92b532decde48f145 diff --git a/variants/ccx-x86_64/logincaps b/variants/ccx-x86_64/logincaps @@ -5,7 +5,7 @@ #+execline.1505a32c24aa5dbf362550f39283c9ff1936e717e5a82d220f8212cd9e604d8f #+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 #+safelink.f55537d34349bbed47803a98e613404c430dd6622140903fa0ff5370a758f7b0 -#@git:4c3d6d043f7abc2f9593e647f357199badc2668b:logincaps +#@git:137140ca4e9eb11c9ff821e2d22828fe3fcef489:logincaps : ${JOBS:=1} prefix=/home/ccx/versions/$pthbs_package diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config @@ -13,8 +13,8 @@ #+s6.087ce2658d9f8b1c38f8f6999d2cfef0bf3b53afaf07f01495091883c154899e #+zsh.f79a20125b2f520d3719411e6f0895cf4f2e0657565c3fef07b3069436b8960f #+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d -#+logincaps.3807c06e6e12534990449ba0aed2e1f43e6dfa91b928ce7d4bee7536409a5841 -#@git:f41e8fb1dda464b6f5bf4c1f77c3fadd8593717a:system-config +#+logincaps.bd11e48d2f72464e0cff970248089cc7d25921ae6c175262702cc9566f4cd30e +#@git:3d3989ad766c608d254c8bb43dc22c23acfbb6b6:system-config def_prefix() { prefix=/home/ccx/versions/$pthbs_package @@ -43,8 +43,8 @@ cd 'system-config' printf '%s\n' >config/etc/motd \ "Welcome to $(cat ./config/hostname)!" \ - 'Current running configuration was generated from system-config:f41e8fb1dda464b6f5bf4c1f77c3fadd8593717a' \ - 'Last change on 2025-02-14 14:41:23 +0000 by ccx' + 'Current running configuration was generated from system-config:3d3989ad766c608d254c8bb43dc22c23acfbb6b6' \ + 'Last change on 2025-03-20 15:12:44 +0000 by Jan Pobrislo' printf '%s\n' >config/etc/skel/loginexec \ "#!$(which execlineb) -S0" \ @@ -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.09c7ef13b7fa33dec832e9943ec21ac4d36b4e9d536e10d28f6bffddcc363dc0' \ + 'pthbs_path_containers=/home/ccx/versions/env.81eeef9c306afcae65e65254ae8ee20547f15c26dc364f6cce9d22dd67a5f102' \ '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.ac51dec71ae105eab929a7b8a8147c6757bc81a210588d901ba8de2469c75e07 +#+system-config-rc.683a0518388872f86e3dd09b7379e31da2411b5f239aa36acd7e072134be4811 -s6rcdb=/home/ccx/versions/system-config-rc.ac51dec71ae105eab929a7b8a8147c6757bc81a210588d901ba8de2469c75e07/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.683a0518388872f86e3dd09b7379e31da2411b5f239aa36acd7e072134be4811/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.c5114f2cc85d94e6ea07a741f36f859f2ba98ba4da0f9e6291e11de483146958 +#+system-config.0632d9c86d18f4d6924fee7a6efeb153bc31e97795ac2029c497f4050675c3fd def_prefix() { prefix=/home/ccx/versions/$pthbs_package @@ -13,7 +13,7 @@ def_dest() { } def_dest -src=/home/ccx/versions/system-config.c5114f2cc85d94e6ea07a741f36f859f2ba98ba4da0f9e6291e11de483146958/config/s6-rc-source +src=/home/ccx/versions/system-config.0632d9c86d18f4d6924fee7a6efeb153bc31e97795ac2029c497f4050675c3fd/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 @@ -20,14 +20,14 @@ #+pthbs-banginstall.7ddbf08ba8b1298841fad793d4ed7ba4979b9346155195489fc5e492ed5f0fe2 #+aat.0698d0082830b7f8bcf3840f3f8c25382ef2d9f174dd6d5407c5e2132d1f16e4 #+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a -#+containers.66428b207ac9ea1d8331e9eaab0848b88f2ce67dbb0dfc2dbc911f90ab7b7a7c +#+containers.24571a2ed64695863d34cdb9b3f7387dedab57d6f19a19bb2d7b9d5b7242d945 #+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737 -#+logincaps.3807c06e6e12534990449ba0aed2e1f43e6dfa91b928ce7d4bee7536409a5841 +#+logincaps.bd11e48d2f72464e0cff970248089cc7d25921ae6c175262702cc9566f4cd30e #+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7 #+curl.363090b3afccfe46f001c57627d39283abe5cc6a6357ee493bd55f8ab11607ba #+git.c969489861a9208c195a11e9ec701d8f322e68505dff04cc209453a1f68fa1fc #+xbps.e77402565036595f7c0410b63d0ede43ff75c3a9394c0ba075558b5acb8a35b9 -#+apk-tools.81bbae0e3a21166adb9b536021a58df7eb0b5dc697c0137e4921ec221639d01e +#+apk-tools.d0d7af182121c66cd5587b51689275557a37562fa1d20b9137b33a97fa12d152 #+getent.497826562f0e3021d114ff3f47654fa0b574041039df71dbc4e509d38fa55447 #+getconf.62760a9db3bdba375752c0a4f8722b5e0ee3c4eded1ab1073a73533c116f6de5 #+iconv.e574881283799fa144f1d9df753a05d9f7effa47ae0a06a92b532decde48f145 diff --git a/variants/root-x86_64/apk-tools b/variants/root-x86_64/apk-tools @@ -7,7 +7,7 @@ #+libressl.a24435b73987145b250c26263ad652c1fb8e0a4f8995f8b71f042cfe4c028139 #+zstd.a83f72c5953bd6b7afc171528a503710b3144bf9197961833fd27926b0a18137 #+pkgconf-pkg-config.ea4d3fe0fca073b8e3eb3b731df4d36c062498864ee04f68ce000a6f282b5621 -#@git:aeb74de67818dedb3f4e1c1175e8182ef5eae8d9:apk-tools +#@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools #@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch check_static() { diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers @@ -3,7 +3,7 @@ #+zsh.4ac9e4166454e8d60c15837b7ca4938abe99db029b3fffa11b1cfd54d40ae09b #+pthbs-banginstall.30ed98ef3fedfb6b25b3f58c27e845f123a22a756b37a5cd75764315bba23571 #+execline.c89bee1b1207461afa2d2ab9250f0940a2a6bbca3e45bdd60037049a75f4adf9 -#@git:2f95e15270f2d0bf0d3b9b9b276c146c6bfd1776:containers +#@git:3b0d0d748309e2c5a2057f5374cb43e8a00647aa:containers : ${JOBS:=1} prefix=/versions/$pthbs_package @@ -37,7 +37,7 @@ printf '%s\n' >"$pkgdir/zsh/site-functions/confz_containers_pthbs_init" \ "typeset -g container_xbps_install_executable='$prefix/deps/command/xbps-install.static'" mkdir -p "$pkgdir/deps/command" -ln -sf '/versions/apk-tools.f97ffbd6594847bb387ac313d61ef91c0004e2256883383e298f8d09c3df75a7/command/apk.static' "$pkgdir/deps/command/" +ln -sf '/versions/apk-tools.20ad2f2e238d23a5eeac3587f85cbe9763bd717a30fb8eb659badd602a556cbf/command/apk.static' "$pkgdir/deps/command/" ln -sf '/versions/xbps.f2dcdfd8accffba33bb4a025e1b3ad227f1a9d9776422455a381cfafaac7d473/command/xbps-install.static' "$pkgdir/deps/command/" for f in '/versions/alpine-keys.4ecd9fac6efcc329a98af1b0b1318771a77eb83ac10832c6e769ebf11c14cae1'/keys/alpine/*/*; do diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment @@ -6,10 +6,10 @@ #+s6-linux-utils.f7e0654375f11beedafd731ad1dd66c0de8d03452bb8e38bb647cc51cc3adb2e #+zsh.4ac9e4166454e8d60c15837b7ca4938abe99db029b3fffa11b1cfd54d40ae09b #+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf -#+containers.188fcff8aeb0097139b964aa4fcf0e68015b1341cbf99e512567d5647fbc92c1 +#+containers.81f7b1aed1b5f8cd999ff2071678b2f7f10dba18757467855a1eccce5d8a93ab #+xbps.f2dcdfd8accffba33bb4a025e1b3ad227f1a9d9776422455a381cfafaac7d473 #+zstd.a83f72c5953bd6b7afc171528a503710b3144bf9197961833fd27926b0a18137 -#+apk-tools.f97ffbd6594847bb387ac313d61ef91c0004e2256883383e298f8d09c3df75a7 +#+apk-tools.20ad2f2e238d23a5eeac3587f85cbe9763bd717a30fb8eb659badd602a556cbf #+alpine-keys.4ecd9fac6efcc329a98af1b0b1318771a77eb83ac10832c6e769ebf11c14cae1 #+getent.a4f1c1679ad9e6d4cd167e921ee8af0f7fce4a2b7886f96223b8c7fe1ba5ba97 #+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150 diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment @@ -1,7 +1,7 @@ -#+system-config.1a50ce4125552ec416e107209da4d4b439a7110cddafafc2c8f220da9e72648b -#+system-config-rc.7ea841635884b31cef48e3b9b46ca427b34617aadcd37f3ccc43bf7987f125d0 +#+system-config.9439640790e4cdd59ae2ce79f350a9f76eb48d97fff578635befd97f084af8ae +#+system-config-rc.deaccda036ed997f3c918216c95122c04e961a5465a709a7b3860e0464a6aeee #+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378 -#+system-config-init.cb752fd9af1db812749f8be1eb5d1a53405ce6626d424c61221c64387e528591 +#+system-config-init.6e9d9a041d958d77a1ca294356693d20e3ecf6bf288a3e3805e3f17380a975f6 #+system-config-zsh.01286ec545c7035b2e08ded96e40b73f912f33fd7eec44993a1e93e12577dc0f #+busybox.f4ef3d511c029095beda8d21dd48f7730bec63fb09792ca951402d6620338089 #+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 @@ -25,14 +25,14 @@ #+pthbs-banginstall.30ed98ef3fedfb6b25b3f58c27e845f123a22a756b37a5cd75764315bba23571 #+aat.9432aa485263e75ca3e43d6511c561a9cd328c417ebe26b890ed4a8061fee06f #+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf -#+containers.188fcff8aeb0097139b964aa4fcf0e68015b1341cbf99e512567d5647fbc92c1 +#+containers.81f7b1aed1b5f8cd999ff2071678b2f7f10dba18757467855a1eccce5d8a93ab #+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150 -#+logincaps.2f972abfd388f5fe599ca55104232cacf60562157bd0028d26154a578af8f14f +#+logincaps.8c7bf4a7985b8e66328877ed5ba47a80274a9248d78ee4b69ceaebefe6e9e4b7 #+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5 #+curl.77419befc08ac7280bdc98fe2388cde9d88721ec00a30a7f9feb7817610ae58a #+git.7a4dbe4f09816eab374b3b020321f582a08dce75afaa97f2abeae2a58bcfe0a7 #+xbps.f2dcdfd8accffba33bb4a025e1b3ad227f1a9d9776422455a381cfafaac7d473 -#+apk-tools.f97ffbd6594847bb387ac313d61ef91c0004e2256883383e298f8d09c3df75a7 +#+apk-tools.20ad2f2e238d23a5eeac3587f85cbe9763bd717a30fb8eb659badd602a556cbf #+getent.a4f1c1679ad9e6d4cd167e921ee8af0f7fce4a2b7886f96223b8c7fe1ba5ba97 #+getconf.2d8409e202963fe34a70113b3fed7da0299f212d739c84f529126f9451886e7e #+iconv.b537e50837859e5b0fa7cc56ee46ff152c638910b9c817cba957f09631c9aad1 diff --git a/variants/root-x86_64/logincaps b/variants/root-x86_64/logincaps @@ -5,7 +5,7 @@ #+execline.c89bee1b1207461afa2d2ab9250f0940a2a6bbca3e45bdd60037049a75f4adf9 #+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc #+safelink.32934902576e73bd5312ddf140fefbf7e2021068593f7b6e9d2b80a09ecdfc98 -#@git:4c3d6d043f7abc2f9593e647f357199badc2668b:logincaps +#@git:137140ca4e9eb11c9ff821e2d22828fe3fcef489:logincaps : ${JOBS:=1} prefix=/versions/$pthbs_package diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config @@ -13,8 +13,8 @@ #+s6.43f7ad2aaeb2646da287c5bddf7c29c44d3f7b68a976beee75b60da44b54759e #+zsh.4ac9e4166454e8d60c15837b7ca4938abe99db029b3fffa11b1cfd54d40ae09b #+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378 -#+logincaps.2f972abfd388f5fe599ca55104232cacf60562157bd0028d26154a578af8f14f -#@git:f41e8fb1dda464b6f5bf4c1f77c3fadd8593717a:system-config +#+logincaps.8c7bf4a7985b8e66328877ed5ba47a80274a9248d78ee4b69ceaebefe6e9e4b7 +#@git:3d3989ad766c608d254c8bb43dc22c23acfbb6b6:system-config def_prefix() { prefix=/versions/$pthbs_package @@ -43,8 +43,8 @@ cd 'system-config' printf '%s\n' >config/etc/motd \ "Welcome to $(cat ./config/hostname)!" \ - 'Current running configuration was generated from system-config:f41e8fb1dda464b6f5bf4c1f77c3fadd8593717a' \ - 'Last change on 2025-02-14 14:41:23 +0000 by ccx' + 'Current running configuration was generated from system-config:3d3989ad766c608d254c8bb43dc22c23acfbb6b6' \ + 'Last change on 2025-03-20 15:12:44 +0000 by Jan Pobrislo' printf '%s\n' >config/etc/skel/loginexec \ "#!$(which execlineb) -S0" \ @@ -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.05414835389899f60f8c6a3401f5fe37762064dc31ce06f52d2f50fda4de798b' \ + 'pthbs_path_containers=/versions/env.afd50d25dcb9390e1ce8d36881f925e14ab07fc384312154ca2e626c42abfbb3' \ '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.7ea841635884b31cef48e3b9b46ca427b34617aadcd37f3ccc43bf7987f125d0 +#+system-config-rc.deaccda036ed997f3c918216c95122c04e961a5465a709a7b3860e0464a6aeee -s6rcdb=/versions/system-config-rc.7ea841635884b31cef48e3b9b46ca427b34617aadcd37f3ccc43bf7987f125d0/config/s6-rc-db +s6rcdb=/versions/system-config-rc.deaccda036ed997f3c918216c95122c04e961a5465a709a7b3860e0464a6aeee/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.1a50ce4125552ec416e107209da4d4b439a7110cddafafc2c8f220da9e72648b +#+system-config.9439640790e4cdd59ae2ce79f350a9f76eb48d97fff578635befd97f084af8ae def_prefix() { prefix=/versions/$pthbs_package @@ -13,7 +13,7 @@ def_dest() { } def_dest -src=/versions/system-config.1a50ce4125552ec416e107209da4d4b439a7110cddafafc2c8f220da9e72648b/config/s6-rc-source +src=/versions/system-config.9439640790e4cdd59ae2ce79f350a9f76eb48d97fff578635befd97f084af8ae/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 @@ -20,14 +20,14 @@ #+pthbs-banginstall.30ed98ef3fedfb6b25b3f58c27e845f123a22a756b37a5cd75764315bba23571 #+aat.9432aa485263e75ca3e43d6511c561a9cd328c417ebe26b890ed4a8061fee06f #+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf -#+containers.188fcff8aeb0097139b964aa4fcf0e68015b1341cbf99e512567d5647fbc92c1 +#+containers.81f7b1aed1b5f8cd999ff2071678b2f7f10dba18757467855a1eccce5d8a93ab #+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150 -#+logincaps.2f972abfd388f5fe599ca55104232cacf60562157bd0028d26154a578af8f14f +#+logincaps.8c7bf4a7985b8e66328877ed5ba47a80274a9248d78ee4b69ceaebefe6e9e4b7 #+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5 #+curl.77419befc08ac7280bdc98fe2388cde9d88721ec00a30a7f9feb7817610ae58a #+git.7a4dbe4f09816eab374b3b020321f582a08dce75afaa97f2abeae2a58bcfe0a7 #+xbps.f2dcdfd8accffba33bb4a025e1b3ad227f1a9d9776422455a381cfafaac7d473 -#+apk-tools.f97ffbd6594847bb387ac313d61ef91c0004e2256883383e298f8d09c3df75a7 +#+apk-tools.20ad2f2e238d23a5eeac3587f85cbe9763bd717a30fb8eb659badd602a556cbf #+getent.a4f1c1679ad9e6d4cd167e921ee8af0f7fce4a2b7886f96223b8c7fe1ba5ba97 #+getconf.2d8409e202963fe34a70113b3fed7da0299f212d739c84f529126f9451886e7e #+iconv.b537e50837859e5b0fa7cc56ee46ff152c638910b9c817cba957f09631c9aad1