commit d01e128b4d671edf8cd6f5483b565695d2159890 parent 935488de9ada0319aec2242c47c0311f438b99f7 Author: Jan Pobrislo <ccx@te2000.cz> Date: Fri, 10 Oct 2025 15:41:39 +0000 scriptsetup: create destdir Diffstat:
27 files changed, 88 insertions(+), 58 deletions(-)
diff --git a/templates/scriptsetup b/templates/scriptsetup @@ -7,6 +7,8 @@ {%- block build %} {%- endblock %} {%- block install %} +mkdir -p "$dest" + for d in bin sbin command; do if test -d "$d"; then pthbs-banginstall "$d"/* "${dest}" diff --git a/variants/ccx-x86_64/aat b/variants/ccx-x86_64/aat @@ -13,6 +13,8 @@ cd 'aat' +mkdir -p "$dest" + for d in bin sbin command; do if test -d "$d"; then pthbs-banginstall "$d"/* "${dest}" diff --git a/variants/ccx-x86_64/confz b/variants/ccx-x86_64/confz @@ -12,6 +12,8 @@ cd 'confz' +mkdir -p "$dest" + for d in bin sbin command; do if test -d "$d"; then pthbs-banginstall "$d"/* "${dest}" diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers @@ -18,6 +18,8 @@ cd 'containers' +mkdir -p "$dest" + for d in bin sbin command; do if test -d "$d"; then pthbs-banginstall "$d"/* "${dest}" diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment @@ -6,13 +6,13 @@ #+s6-portable-utils.1118fd2f6ea4b1390c615802d601bd6803cf4545b03a89bed68e36bc2a13087e #+s6-linux-utils.84f2d6d918b74fffc508df6cee48ed0f25124bd6c09f12558626d27992174226 #+zsh.c1ba08b027e26ecf5b6a4f7f5aced2e9b520b1835b098ba5529cad1f97e387b5 -#+confz.e1a900f113d0372bf49636a3772d5c2073ad52dfb1eb0e8a160de284bdde6e19 -#+containers.b581b4388aa12fb0145a581e63a09f19fbe0d93b7592e78af08b05a54e0c9dfb +#+confz.f842f5ba2335e36311d73cb5b4bf42a6eb7c9f24eb8d437baaca8c284cf7872f +#+containers.6d877570baf5004da542dc69de47202df1b3d56f6d406db52120493f5c4c99dd #+xbps.c800a4acd968f595949056f8a302a1e6ee0d960461318dce06c39a235e39b44b #+zstd.31469429bdd997f0a7a7eeb7dc4aa44b1e88d15227b1711943b136dc14cf753f #+apk-tools.e165a47aff8b353b5f4dfbbdff1f459e66db1cdc85619989e485a2632018109a #+alpine-keys.8d9a97bce320472beb53c62bf7a068ebd453250e3ee99b7c90caac0669ae75fe #+getent.08248f0ec8ff20bd1279b61e637208961f5959b2b8bb33caee7720289dad2b5c -#+fileset.270d986002b4187e381e824acb96e7299207fc725242354be6d952322609c16f +#+fileset.0ae777301ccf18194cb4bb828986672c3b4c225faf5f6a4b9969da5329e0394c #+ccx-utils.5d4a03d8fac908bceccbb03c49ab3e893b2cf08384226b326a9f6a062b8693fd #+easyseccomp.5c8cbd09f114926a5b62c89f014622c63c676a7b12613e12b85168652cdb4c30 \ No newline at end of file diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment @@ -19,12 +19,12 @@ #+s6-networking.6f3b376f54eeb4ebedd0e480ab1d2ad4a114a3df3e5a0ad4760bae55e3d437fe #+zsh.c1ba08b027e26ecf5b6a4f7f5aced2e9b520b1835b098ba5529cad1f97e387b5 #+pthbs-banginstall.fb1085a86eafedd60935fd033dbc0f6d47c187d3f7f9bf3cefdb1ddc43b21435 -#+aat.3ae3f76ff38d5dda21d7eeeb84cc07621058ab2b613a1b028031027629124e6d -#+confz.e1a900f113d0372bf49636a3772d5c2073ad52dfb1eb0e8a160de284bdde6e19 -#+containers.b581b4388aa12fb0145a581e63a09f19fbe0d93b7592e78af08b05a54e0c9dfb -#+fileset.270d986002b4187e381e824acb96e7299207fc725242354be6d952322609c16f -#+logincaps.c96511bcd368866c4e8cc0453b659b1caa4a71e16d49fad9430afed259cd972c -#+snaprep.a3be01b4d78505bb03a5c277bb65e6c920940569981d1cf2916ac7d7ef44c7b1 +#+aat.00bcd78b579082812bfeea3a2e5058e720409bc7a9e966a8cc10e54db65d5f73 +#+confz.f842f5ba2335e36311d73cb5b4bf42a6eb7c9f24eb8d437baaca8c284cf7872f +#+containers.6d877570baf5004da542dc69de47202df1b3d56f6d406db52120493f5c4c99dd +#+fileset.0ae777301ccf18194cb4bb828986672c3b4c225faf5f6a4b9969da5329e0394c +#+logincaps.85bcfdf5d7b8ef6b556dda8717da286c342d6f52e5a79d32cc84379526b71e32 +#+snaprep.30e9d122c8a1d12f58d81856dd5a79b72d4785bf30bff0e94b3a0f61e6c22238 #+curl.b77362632ee7e28e099c231bbda3b6220cc0cbc62aece9c63f4957cc3f415284 #+git.01a0c1531eb47cb51bf38a4082a0e16caf7be302d04fa24fde800985f8e37773 #+xbps.c800a4acd968f595949056f8a302a1e6ee0d960461318dce06c39a235e39b44b @@ -38,8 +38,8 @@ #+user-env.27a0b5452d41afaacb1d76c456caa84d85aff599c39ff32b8db694d2550d5b6d #+strace.40668df6151b4574b553a5923103e07c6ddb344daca606f04edd0ac48e060d55 #+mlog.a882a51752c5081bd671d7d564ea8b5c4502b93c0951cb77a20aa0238c66bc82 -#+system-config.3bbac7e0c7284cc86f1ad8e47f84cfa8d2cf965b4981d471cbba7ada7b5cdc18 -#+system-config-rc.55fa9b8a7ec813a6c08dd428084ffc7fd55d18f755a8c26a67fee4bb2e441cf4 -#+system-config-scripts.5d93a0f07d62354b9f46a9fb677c6a27c27809a6087f7329d3929fd49b516337 -#+system-config-init.0c92cea2b11f7aaff78d67a0b0572add8c3f63d2bdcec0abcf10a6d8a47cf0f9 +#+system-config.c05fb11a3c001f249cc75cfb91b42f3457a70bf79935b4f6db000668fe4daecf +#+system-config-rc.7267883d64454f4a5002d09212d17c2133273a8939fd8dd3c305904311b71467 +#+system-config-scripts.3c3ea3f86753f1b0e0927ec2875e5b90f388ba2c1f6ed9b69509ac25a7555da6 +#+system-config-init.2e124ecd5a1eadea35939267d64a862a3a15daec7c40eb9c6b31a780086c6944 #+system-config-zsh.ca45b9086a867eb594d68b32cb4826f747b819c640cb472a6fd1b649b1a1d760 \ No newline at end of file diff --git a/variants/ccx-x86_64/fileset b/variants/ccx-x86_64/fileset @@ -12,6 +12,8 @@ cd 'fileset' +mkdir -p "$dest" + for d in bin sbin command; do if test -d "$d"; then pthbs-banginstall "$d"/* "${dest}" diff --git a/variants/ccx-x86_64/logincaps b/variants/ccx-x86_64/logincaps @@ -15,6 +15,8 @@ cd 'logincaps' +mkdir -p "$dest" + for d in bin sbin command; do if test -d "$d"; then pthbs-banginstall "$d"/* "${dest}" diff --git a/variants/ccx-x86_64/snaprep b/variants/ccx-x86_64/snaprep @@ -13,6 +13,8 @@ cd 'snaprep' +mkdir -p "$dest" + for d in bin sbin command; do if test -d "$d"; then pthbs-banginstall "$d"/* "${dest}" diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config @@ -3,8 +3,8 @@ #+busybox-findutils.7f4b62603c13a47cfc863f53eccf0befa97271a83467dd610dfb819fd2f61f45 #+diffutils.fc4061b81466c8eb17c5bd31bcf32c265b2d68f445edff7c6aac50de2cf23bf4 #+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+aat.3ae3f76ff38d5dda21d7eeeb84cc07621058ab2b613a1b028031027629124e6d -#+fileset.270d986002b4187e381e824acb96e7299207fc725242354be6d952322609c16f +#+aat.00bcd78b579082812bfeea3a2e5058e720409bc7a9e966a8cc10e54db65d5f73 +#+fileset.0ae777301ccf18194cb4bb828986672c3b4c225faf5f6a4b9969da5329e0394c #+rsync.ec6ab62cd8c365ad672dbdf63bb0b328386808a63957980e02d666b4f7915446 #+execline.0e5a0df166b6270f6f3f5e4fa0e8051e2432b88bd452b4676f3730724652874a #+kbd.24923f91c68cff17fd63bc1b411d93c1e0797ebfd2f5865ddbcdd1198440e9c2 @@ -13,8 +13,8 @@ #+s6-rc.4709b0b39ae84f7a1efa984a66237c0f6133cec32466acdf0a139e2ef142f5ee #+s6.f852407c0b0743b39e769f67ffcaaabeb17233500699e2219937aed7b9774cc6 #+zsh.c1ba08b027e26ecf5b6a4f7f5aced2e9b520b1835b098ba5529cad1f97e387b5 -#+system-config-scripts.5d93a0f07d62354b9f46a9fb677c6a27c27809a6087f7329d3929fd49b516337 -#+logincaps.c96511bcd368866c4e8cc0453b659b1caa4a71e16d49fad9430afed259cd972c +#+system-config-scripts.3c3ea3f86753f1b0e0927ec2875e5b90f388ba2c1f6ed9b69509ac25a7555da6 +#+logincaps.85bcfdf5d7b8ef6b556dda8717da286c342d6f52e5a79d32cc84379526b71e32 #@git:cdeb78362ceacd8087b1d04ef26573cb115b7844: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.fc44529f994c36843159cd87185bdbe7d0a38d21ef39cc585a57e1573d65ddff' \ + 'pthbs_path_containers=/home/ccx/versions/env.afb93bb8d4f1fa6247b36a8e669a63894f4034e06b6d99288b0832469d190ab4' \ 'pthbs_path_mdevd=/home/ccx/versions/env.51ab0c0e64ff93066325f8e4bcab80b46b317ef9b15abe28670e767ec96baca2' \ 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 @@ -6,7 +6,7 @@ #+s6-portable-utils.1118fd2f6ea4b1390c615802d601bd6803cf4545b03a89bed68e36bc2a13087e #+s6-linux-init.a6dbfc71babdb9506c53cad385c613f13a602885c2db0a5db609a86ecc687bac #+execline.0e5a0df166b6270f6f3f5e4fa0e8051e2432b88bd452b4676f3730724652874a -#+system-config-rc.55fa9b8a7ec813a6c08dd428084ffc7fd55d18f755a8c26a67fee4bb2e441cf4 +#+system-config-rc.7267883d64454f4a5002d09212d17c2133273a8939fd8dd3c305904311b71467 # - 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.55fa9b8a7ec813a6c08dd428084ffc7fd55d18f755a8c26a67fee4bb2e441cf4/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.7267883d64454f4a5002d09212d17c2133273a8939fd8dd3c305904311b71467/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 @@ -3,8 +3,8 @@ #+busybox-findutils.7f4b62603c13a47cfc863f53eccf0befa97271a83467dd610dfb819fd2f61f45 #+busybox-diffutils.963ce6582575680763337552764b6a3c1be781d9fada1d52aa2d04fadeb229d0 #+s6-rc.4709b0b39ae84f7a1efa984a66237c0f6133cec32466acdf0a139e2ef142f5ee -#+fileset.270d986002b4187e381e824acb96e7299207fc725242354be6d952322609c16f -#+system-config.3bbac7e0c7284cc86f1ad8e47f84cfa8d2cf965b4981d471cbba7ada7b5cdc18 +#+fileset.0ae777301ccf18194cb4bb828986672c3b4c225faf5f6a4b9969da5329e0394c +#+system-config.c05fb11a3c001f249cc75cfb91b42f3457a70bf79935b4f6db000668fe4daecf # - build script start - @@ -13,7 +13,7 @@ dest=${pthbs_destdir%/}${prefix} cd 'system-config-rc' -src=/home/ccx/versions/system-config.3bbac7e0c7284cc86f1ad8e47f84cfa8d2cf965b4981d471cbba7ada7b5cdc18/config/s6-rc-source +src=/home/ccx/versions/system-config.c05fb11a3c001f249cc75cfb91b42f3457a70bf79935b4f6db000668fe4daecf/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/system-config-scripts b/variants/ccx-x86_64/system-config-scripts @@ -12,6 +12,8 @@ cd 'system-config-scripts' +mkdir -p "$dest" + for d in bin sbin command; do if test -d "$d"; then pthbs-banginstall "$d"/* "${dest}" diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment @@ -19,12 +19,12 @@ #+s6-networking.6f3b376f54eeb4ebedd0e480ab1d2ad4a114a3df3e5a0ad4760bae55e3d437fe #+zsh.c1ba08b027e26ecf5b6a4f7f5aced2e9b520b1835b098ba5529cad1f97e387b5 #+pthbs-banginstall.fb1085a86eafedd60935fd033dbc0f6d47c187d3f7f9bf3cefdb1ddc43b21435 -#+aat.3ae3f76ff38d5dda21d7eeeb84cc07621058ab2b613a1b028031027629124e6d -#+confz.e1a900f113d0372bf49636a3772d5c2073ad52dfb1eb0e8a160de284bdde6e19 -#+containers.b581b4388aa12fb0145a581e63a09f19fbe0d93b7592e78af08b05a54e0c9dfb -#+fileset.270d986002b4187e381e824acb96e7299207fc725242354be6d952322609c16f -#+logincaps.c96511bcd368866c4e8cc0453b659b1caa4a71e16d49fad9430afed259cd972c -#+snaprep.a3be01b4d78505bb03a5c277bb65e6c920940569981d1cf2916ac7d7ef44c7b1 +#+aat.00bcd78b579082812bfeea3a2e5058e720409bc7a9e966a8cc10e54db65d5f73 +#+confz.f842f5ba2335e36311d73cb5b4bf42a6eb7c9f24eb8d437baaca8c284cf7872f +#+containers.6d877570baf5004da542dc69de47202df1b3d56f6d406db52120493f5c4c99dd +#+fileset.0ae777301ccf18194cb4bb828986672c3b4c225faf5f6a4b9969da5329e0394c +#+logincaps.85bcfdf5d7b8ef6b556dda8717da286c342d6f52e5a79d32cc84379526b71e32 +#+snaprep.30e9d122c8a1d12f58d81856dd5a79b72d4785bf30bff0e94b3a0f61e6c22238 #+curl.b77362632ee7e28e099c231bbda3b6220cc0cbc62aece9c63f4957cc3f415284 #+git.01a0c1531eb47cb51bf38a4082a0e16caf7be302d04fa24fde800985f8e37773 #+xbps.c800a4acd968f595949056f8a302a1e6ee0d960461318dce06c39a235e39b44b diff --git a/variants/root-x86_64/aat b/variants/root-x86_64/aat @@ -13,6 +13,8 @@ cd 'aat' +mkdir -p "$dest" + for d in bin sbin command; do if test -d "$d"; then pthbs-banginstall "$d"/* "${dest}" diff --git a/variants/root-x86_64/confz b/variants/root-x86_64/confz @@ -12,6 +12,8 @@ cd 'confz' +mkdir -p "$dest" + for d in bin sbin command; do if test -d "$d"; then pthbs-banginstall "$d"/* "${dest}" diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers @@ -18,6 +18,8 @@ cd 'containers' +mkdir -p "$dest" + for d in bin sbin command; do if test -d "$d"; then pthbs-banginstall "$d"/* "${dest}" diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment @@ -6,13 +6,13 @@ #+s6-portable-utils.f4a82103130cfcc49f440896a006e18566297bd1eaec89689a29869958a3982b #+s6-linux-utils.825109564ccf0b423888de36d9946db0453a95ffbce5970d994da9007f8a34cd #+zsh.9330dcf8922d0de5ca2e8456ce19d85e6ed76365cfe1fe9cb3761569bfd0cbf6 -#+confz.8a129948bdbf847d24ea414da88a1fc4da0d6875ec66d2561b018ee7ba63d14b -#+containers.ce454bdb247a702d371ba868a0ddd859545078f555fff4266aeb5cd866094eec +#+confz.6c689831a997a5168324e95a9d953bba7aeb44bda06cf540e3bc5f5ec085344a +#+containers.a62adec44acb4061ad3050cc9cdd412c02607cff5b7401e0c013cdad36ebca6a #+xbps.7e8a9a3746e363f5897183fa19a00a1ba4230822591552d2769a8771065d2b6f #+zstd.0c21eeca000c0fc1b714595d83cc5210adfa581edcf45820b95cb5921c46fcc4 #+apk-tools.c7f159a66814bc9be8c2840bf4fba46ee0a9ef6fdd1994c11b09d1dab82fb5d9 #+alpine-keys.d1fc739a1c6183675d38c994f8923e9d9ad79fae9f270de3e92f091efa4e0f03 #+getent.69120bd1e42219ed632181e8c4743c83e86e377d4b1d1197e6f8aa4c227b38ef -#+fileset.a88dcf45b5b89016d950c494905440070218776e88098569ef4e4cff18381522 +#+fileset.9a68fe7ea04ef898f33a980e9f0cb36e4e309c0d2f855b5d979063738432f51b #+ccx-utils.020204071392f91013fe10d159d85b96ce1cfcf6b0666afd324594dfefdf3b0a #+easyseccomp.269467cf87ab99af0934bb17ca3a9bc6c667dba73374df74a7f7e45b24bba298 \ No newline at end of file diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment @@ -19,12 +19,12 @@ #+s6-networking.ca47d28ac08fed0aa231f80c6715c6b4ccecf133e904dc1800f7eb2f6a57f0bd #+zsh.9330dcf8922d0de5ca2e8456ce19d85e6ed76365cfe1fe9cb3761569bfd0cbf6 #+pthbs-banginstall.457b2a62ae99241af2f242f0c8bdee49306e5070529448a61b56a7f55d3d2bb0 -#+aat.954c3db897d412bf89d277906a2c2b03da5f2764be55ed9d2bbc8f2fdc7de0e9 -#+confz.8a129948bdbf847d24ea414da88a1fc4da0d6875ec66d2561b018ee7ba63d14b -#+containers.ce454bdb247a702d371ba868a0ddd859545078f555fff4266aeb5cd866094eec -#+fileset.a88dcf45b5b89016d950c494905440070218776e88098569ef4e4cff18381522 -#+logincaps.81633c67aabb35926b9ac3d3403ba45c1905b9f5feec6827a776bdc64d1bef4a -#+snaprep.2f62037a1b68b83bd0be95be5443a72753d9fb4ebe6fba71bc77dc539e200643 +#+aat.46ffbe5da0352662fe5fcb6092571cb1ea0cae4295372a6906a99cb8d472bc38 +#+confz.6c689831a997a5168324e95a9d953bba7aeb44bda06cf540e3bc5f5ec085344a +#+containers.a62adec44acb4061ad3050cc9cdd412c02607cff5b7401e0c013cdad36ebca6a +#+fileset.9a68fe7ea04ef898f33a980e9f0cb36e4e309c0d2f855b5d979063738432f51b +#+logincaps.c5239eb8fee45f1ac9a198599e4283abadda94b9af85406542b8653949e4b717 +#+snaprep.faf160dbb290f4b2a5f9b6605820a8f59b9534344c3b3b430c1cdf1a336a8a8f #+curl.7d12db521501148254cee062ca7489c9381330bb81fcfb28239e7846987a5db8 #+git.f01264e188e8d5c54cf4fce7f662f01ad1b1e8558e305368277e2521f7b6945d #+xbps.7e8a9a3746e363f5897183fa19a00a1ba4230822591552d2769a8771065d2b6f @@ -38,8 +38,8 @@ #+user-env.cdccc52b50fbacaeea62161170c6e3b770fa8dcd6a6e46af363cbbe451f6b5a4 #+strace.f9dbe83d3eaac5f19c4d7b3971928e97af25794472024ea02b4fd20ef5d977c2 #+mlog.7a615a6cd358a942b7d328b13562fc11cb3c82d2933f3de7fa727db87d48e6c2 -#+system-config.c2cc3ae2ab74b63f1324bcaed7da95076cc0b9eb7193cd7bc4109ac4d86dd7b0 -#+system-config-rc.48ec4a4c3ee3a9e9b9cd0f632641307945c756d362db38be1603cf3d9b9363c8 -#+system-config-scripts.ac7b6646634da89af343e32d9e2c4601c62f649edf9699a4e9baea031f19ca5b -#+system-config-init.8cf3af47d422161c0f48181a1609568bbb1834349306c7e769f7dd3058239b07 +#+system-config.dd731fe2474522d209f64c264172af03838ed6d9e96220e680a7d058cfbd9d93 +#+system-config-rc.b4c0e2014986162dad4095436d9a5fba4c735c16bc03a0d376f8c4ab2adc2972 +#+system-config-scripts.cbbd7e8b35c682d147057f2cd95a07b8735fe7422d41ed17dd2851d215e38137 +#+system-config-init.71b057a531be9a7d5bf847d4f05653015fc2b71d7692234c40f4ae683a3158e6 #+system-config-zsh.2395a0ac100619f08b05c21044f60208ef3fcb135a9302047c299e6d7ee2a6b1 \ No newline at end of file diff --git a/variants/root-x86_64/fileset b/variants/root-x86_64/fileset @@ -12,6 +12,8 @@ cd 'fileset' +mkdir -p "$dest" + for d in bin sbin command; do if test -d "$d"; then pthbs-banginstall "$d"/* "${dest}" diff --git a/variants/root-x86_64/logincaps b/variants/root-x86_64/logincaps @@ -15,6 +15,8 @@ cd 'logincaps' +mkdir -p "$dest" + for d in bin sbin command; do if test -d "$d"; then pthbs-banginstall "$d"/* "${dest}" diff --git a/variants/root-x86_64/snaprep b/variants/root-x86_64/snaprep @@ -13,6 +13,8 @@ cd 'snaprep' +mkdir -p "$dest" + for d in bin sbin command; do if test -d "$d"; then pthbs-banginstall "$d"/* "${dest}" diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config @@ -3,8 +3,8 @@ #+busybox-findutils.cc95c44dcbb25e61fc33eb7b5aaa947be36855d6f2367d712caf1fc559f0b18d #+diffutils.c5771cacb014b64df08c4d6c22f639d8203518119ef0bb57dac26020cb4db0b6 #+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+aat.954c3db897d412bf89d277906a2c2b03da5f2764be55ed9d2bbc8f2fdc7de0e9 -#+fileset.a88dcf45b5b89016d950c494905440070218776e88098569ef4e4cff18381522 +#+aat.46ffbe5da0352662fe5fcb6092571cb1ea0cae4295372a6906a99cb8d472bc38 +#+fileset.9a68fe7ea04ef898f33a980e9f0cb36e4e309c0d2f855b5d979063738432f51b #+rsync.c8a1e6d8328390565e688b8646258be9ec9430e16a50e1c6dfaf70ba05114f14 #+execline.f0eae8694d48210e76b8c63d1021b7c54029a8db968696dcb8b720240cd7b8ab #+kbd.4a936e7295cc33542f5bb78e558229a8904355b0a9126b329f6e356179711a6f @@ -13,8 +13,8 @@ #+s6-rc.6785af4c10f0e833235def47f34d88b8ac76fa2116f63d3bff478fb78de38b04 #+s6.e2ee6b1e77f60e714bd5e81d709b65a07b24dbbd9af559918a598ef82523a8c5 #+zsh.9330dcf8922d0de5ca2e8456ce19d85e6ed76365cfe1fe9cb3761569bfd0cbf6 -#+system-config-scripts.ac7b6646634da89af343e32d9e2c4601c62f649edf9699a4e9baea031f19ca5b -#+logincaps.81633c67aabb35926b9ac3d3403ba45c1905b9f5feec6827a776bdc64d1bef4a +#+system-config-scripts.cbbd7e8b35c682d147057f2cd95a07b8735fe7422d41ed17dd2851d215e38137 +#+logincaps.c5239eb8fee45f1ac9a198599e4283abadda94b9af85406542b8653949e4b717 #@git:cdeb78362ceacd8087b1d04ef26573cb115b7844: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.c04d29f61069cd3350868d06b623eada3364a0928b4cf6a7f93fd235e5f2961f' \ + 'pthbs_path_containers=/versions/env.d2d935a9033d8c8344b9c0e34d58bfea3be72d8d8cf2ae75e41f18ee14848897' \ 'pthbs_path_mdevd=/versions/env.5efd9db39293775a765dd3ca79798f1d6d991d82daea54a5bef5fffce4509f66' \ 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 @@ -6,7 +6,7 @@ #+s6-portable-utils.f4a82103130cfcc49f440896a006e18566297bd1eaec89689a29869958a3982b #+s6-linux-init.07931b00ba7cfaca6877d09e985caf229cbd20c34f35b30754a35b9d19762b56 #+execline.f0eae8694d48210e76b8c63d1021b7c54029a8db968696dcb8b720240cd7b8ab -#+system-config-rc.48ec4a4c3ee3a9e9b9cd0f632641307945c756d362db38be1603cf3d9b9363c8 +#+system-config-rc.b4c0e2014986162dad4095436d9a5fba4c735c16bc03a0d376f8c4ab2adc2972 # - 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.48ec4a4c3ee3a9e9b9cd0f632641307945c756d362db38be1603cf3d9b9363c8/config/s6-rc-db +s6rcdb=/versions/system-config-rc.b4c0e2014986162dad4095436d9a5fba4c735c16bc03a0d376f8c4ab2adc2972/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 @@ -3,8 +3,8 @@ #+busybox-findutils.cc95c44dcbb25e61fc33eb7b5aaa947be36855d6f2367d712caf1fc559f0b18d #+busybox-diffutils.38ca9e723dfa24bd5cc2281952ff03c7dd312918a28dc0619b9816a293b5c8f5 #+s6-rc.6785af4c10f0e833235def47f34d88b8ac76fa2116f63d3bff478fb78de38b04 -#+fileset.a88dcf45b5b89016d950c494905440070218776e88098569ef4e4cff18381522 -#+system-config.c2cc3ae2ab74b63f1324bcaed7da95076cc0b9eb7193cd7bc4109ac4d86dd7b0 +#+fileset.9a68fe7ea04ef898f33a980e9f0cb36e4e309c0d2f855b5d979063738432f51b +#+system-config.dd731fe2474522d209f64c264172af03838ed6d9e96220e680a7d058cfbd9d93 # - build script start - @@ -13,7 +13,7 @@ dest=${pthbs_destdir%/}${prefix} cd 'system-config-rc' -src=/versions/system-config.c2cc3ae2ab74b63f1324bcaed7da95076cc0b9eb7193cd7bc4109ac4d86dd7b0/config/s6-rc-source +src=/versions/system-config.dd731fe2474522d209f64c264172af03838ed6d9e96220e680a7d058cfbd9d93/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/system-config-scripts b/variants/root-x86_64/system-config-scripts @@ -12,6 +12,8 @@ cd 'system-config-scripts' +mkdir -p "$dest" + for d in bin sbin command; do if test -d "$d"; then pthbs-banginstall "$d"/* "${dest}" diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment @@ -19,12 +19,12 @@ #+s6-networking.ca47d28ac08fed0aa231f80c6715c6b4ccecf133e904dc1800f7eb2f6a57f0bd #+zsh.9330dcf8922d0de5ca2e8456ce19d85e6ed76365cfe1fe9cb3761569bfd0cbf6 #+pthbs-banginstall.457b2a62ae99241af2f242f0c8bdee49306e5070529448a61b56a7f55d3d2bb0 -#+aat.954c3db897d412bf89d277906a2c2b03da5f2764be55ed9d2bbc8f2fdc7de0e9 -#+confz.8a129948bdbf847d24ea414da88a1fc4da0d6875ec66d2561b018ee7ba63d14b -#+containers.ce454bdb247a702d371ba868a0ddd859545078f555fff4266aeb5cd866094eec -#+fileset.a88dcf45b5b89016d950c494905440070218776e88098569ef4e4cff18381522 -#+logincaps.81633c67aabb35926b9ac3d3403ba45c1905b9f5feec6827a776bdc64d1bef4a -#+snaprep.2f62037a1b68b83bd0be95be5443a72753d9fb4ebe6fba71bc77dc539e200643 +#+aat.46ffbe5da0352662fe5fcb6092571cb1ea0cae4295372a6906a99cb8d472bc38 +#+confz.6c689831a997a5168324e95a9d953bba7aeb44bda06cf540e3bc5f5ec085344a +#+containers.a62adec44acb4061ad3050cc9cdd412c02607cff5b7401e0c013cdad36ebca6a +#+fileset.9a68fe7ea04ef898f33a980e9f0cb36e4e309c0d2f855b5d979063738432f51b +#+logincaps.c5239eb8fee45f1ac9a198599e4283abadda94b9af85406542b8653949e4b717 +#+snaprep.faf160dbb290f4b2a5f9b6605820a8f59b9534344c3b3b430c1cdf1a336a8a8f #+curl.7d12db521501148254cee062ca7489c9381330bb81fcfb28239e7846987a5db8 #+git.f01264e188e8d5c54cf4fce7f662f01ad1b1e8558e305368277e2521f7b6945d #+xbps.7e8a9a3746e363f5897183fa19a00a1ba4230822591552d2769a8771065d2b6f