commit 03fc85d95e7b195ba74d84ebd18eaee6d582cb96
parent fb0c0af78c2603b3f2c5c8245e13335e205057ff
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Sun, 12 Oct 2025 12:17:14 +0000
nawk for system-config
Diffstat:
9 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/templates/pkg/system-config b/templates/pkg/system-config
@@ -1,5 +1,10 @@
{%- set pkg_source="git" -%}
{% extends "genlinks" %}
+{%- block template_deps -%}
+#+{{pkg_install_name("busybox")}}
+#+{{pkg_install_name("busybox-findutils")}}
+#+{{pkg_install_name("nawk")}}
+{% endblock %}
{% block package_deps -%}
#+{{pkg_install_name("diffutils")}}
#+{{pkg_install_name("gnu-make")}}
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -38,8 +38,8 @@
#+user-env.d869162aa28782e511eccdf5e86b26d73cf6af634060c7be84381e21f64d0587
#+strace.d085f99a7e068784ac0d64f1e3efe437253b28b77d4cc31a4f65c96b4ead3401
#+mlog.f6bd339c239d4e1b7bfe5a337a914ecd7b30795063ec94bce2847b8ad825c0b3
-#+system-config.12c6045b9555b2f18aba86e3ed7b8b291d11fed2640ef10439e059536cea4dea
-#+system-config-rc.c7bc2c4676354366e76471112abdf9afe73eb393158f638368a5a29946cd961a
+#+system-config.c8556cccc2852966d6aba65c5912a93edf6ce16fd8080399aac784397204a625
+#+system-config-rc.9e04dfab7771d8bf983dd51d1920d8a8aa24488375294b7fcac8cd3852aa5d2d
#+system-config-scripts.a54759d4f335bd14d0739a8b91412f1ce5302d65013e587018ec1bcf5363b16a
-#+system-config-init.eb9789dadc8c50846fba42f3b738e5961728a7b21399af63d85c831f8311f28b
+#+system-config-init.98b1a6521dd5a7613290c3f2d981d6b9e44e7287e60b48eb02fa7c7cab8885fe
#+system-config-zsh.3f24324efe84089cac74c52a6324952a793cd304f29ea46e4f28fb00c8c35df7
\ No newline at end of file
diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config
@@ -1,7 +1,7 @@
#!/usr/bin/env pthbs-build
#+busybox.1ece97f2192661a6f5605f3f9bccbc8e917ed4adcecd1d8ca7cf9710363f495f
#+busybox-findutils.37324a26742f7757965c3863bab9b3b08211c9d57539f455839ecd90e6fa3a59
-#+busybox-awk.f58cd25bab650fb74567bab10fc34f5b591f481611f885dcd429aedbf73a490f
+#+nawk.7a9a6aeeddfdfce14fd07c84b51c3429fc3de7ef6e37ff73f9dee2ed8299a0c6
#+diffutils.8952d5746b891c715ea7c92896cb92ed77a69c70e7488de5b0686bd769d6f472
#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299
#+aat.311c33cac2a5c73d108590e96f5cb35954e5fdb4e0b08d9ae09f5e7d45945da4
diff --git a/variants/ccx-x86_64/system-config-init b/variants/ccx-x86_64/system-config-init
@@ -7,7 +7,7 @@
#+s6-portable-utils.5534529a48c31580917b6612a7531e8ef3b638f5423cc7c117f3b071d54051aa
#+s6-linux-init.370b116a128899247e59ff60d4a636090b81361b7abb0ec9b5d0e5aeb567d075
#+execline.e7a749921b4a04631cc69f2189ac67401545d9873cdeb7813aa392e8ebd11558
-#+system-config-rc.c7bc2c4676354366e76471112abdf9afe73eb393158f638368a5a29946cd961a
+#+system-config-rc.9e04dfab7771d8bf983dd51d1920d8a8aa24488375294b7fcac8cd3852aa5d2d
# - build script start -
@@ -30,7 +30,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.c7bc2c4676354366e76471112abdf9afe73eb393158f638368a5a29946cd961a/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.9e04dfab7771d8bf983dd51d1920d8a8aa24488375294b7fcac8cd3852aa5d2d/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
@@ -5,7 +5,7 @@
#+busybox-diffutils.1aa76d52d9aa0d4541fde1ed8cac30606ca4ec9985ce43454ffc7cd60ab1a0be
#+s6-rc.0d683e0fe121aed629c65833a03a2060db1cc6ed0028fe4f1b28ee6380867a68
#+fileset.ef68ca573cfec23b65e7ed7447d08f037147067bbb24f17c3e33a6db8423c8a1
-#+system-config.12c6045b9555b2f18aba86e3ed7b8b291d11fed2640ef10439e059536cea4dea
+#+system-config.c8556cccc2852966d6aba65c5912a93edf6ce16fd8080399aac784397204a625
# - build script start -
@@ -14,7 +14,7 @@ dest=${pthbs_destdir%/}${prefix}
cd 'system-config-rc'
-src=/home/ccx/versions/system-config.12c6045b9555b2f18aba86e3ed7b8b291d11fed2640ef10439e059536cea4dea/config/s6-rc-source
+src=/home/ccx/versions/system-config.c8556cccc2852966d6aba65c5912a93edf6ce16fd8080399aac784397204a625/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/default.environment b/variants/root-x86_64/default.environment
@@ -38,8 +38,8 @@
#+user-env.c122a1e224f7b55335598aed23d9faf242ebdeb93f22599e0daf744dfe6d90fc
#+strace.738f60dbbd23a60faa4cc56e512b15b58679042fe1d9cb37c9deff22bf0c164b
#+mlog.ccfb3c3a0ae18af9411bffe67e03b6dee0df9427906bd028635bce7208f9fc8f
-#+system-config.fa4d06af9e5663a052bf1c56e9e970e21c4630f32b63ae16965aabf815875534
-#+system-config-rc.82a791bcee172f628088b9c5a3b0f6ef95d7ac098d09b45740caaee39ab7157e
+#+system-config.aac6a6b5be89ed129cbc7f00973c09f1a04faa2bf171a59f8a4438cedd24049b
+#+system-config-rc.aec1e74c926b61cdfa7a4dfd67a90862a63734fa8cf4fbebf5af17d065ac7960
#+system-config-scripts.5ade8006267d5dd6f2fa7be80dc04f8396ed6e6da6abd1d23eaaee1f237ba341
-#+system-config-init.fc1a0f7149d0d99043a64b20327bc9dacf3d06ec3fe7dea6ecad56c21325c259
+#+system-config-init.ee68dee2e30f000b1e035e98382f8d39f5a9c7f87c011cac76ac961fd0034ad0
#+system-config-zsh.2f424f7007ce63719a484ba88a797dba7ae43a63408eb4ebd0dc8d7b252fccc1
\ No newline at end of file
diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config
@@ -1,7 +1,7 @@
#!/usr/bin/env pthbs-build
#+busybox.48c54b64ed4d28b2c4df9ff3167d560e1f8e4bc338c328a71779b3d28413c1e2
#+busybox-findutils.fb6b808e4bf71082490eef4c8fd0369371046381b5087084822094c27cd7a36b
-#+busybox-awk.4e38799dd0815d4fb9b0c701fff3b41b58366ebf022ccec71b03b0881a2b326f
+#+nawk.6f65756dfd9fd32f6b702d0659871036b39b90591b8c8f739874371552169a73
#+diffutils.31428474ab63a0a9119f0da41d536a64676bb53375a7fc773dac0efd31261f8f
#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7
#+aat.8ec6e746da1ac1821a224bb1012cda6280860269ac3d1e284275b01f6f66a15d
diff --git a/variants/root-x86_64/system-config-init b/variants/root-x86_64/system-config-init
@@ -7,7 +7,7 @@
#+s6-portable-utils.2a35e10fc49989ff11cab6f9c8ff1ce2e07000d2ec36296cbc1236f9eb6b6305
#+s6-linux-init.b686a32f757913770efafac4666d1be98cea4a76838f7d79e646dd63ac67d507
#+execline.12affe71ab57cb7af1ded3d020f86f17da85e43f90ba29f285bdc99b4033b709
-#+system-config-rc.82a791bcee172f628088b9c5a3b0f6ef95d7ac098d09b45740caaee39ab7157e
+#+system-config-rc.aec1e74c926b61cdfa7a4dfd67a90862a63734fa8cf4fbebf5af17d065ac7960
# - build script start -
@@ -30,7 +30,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.82a791bcee172f628088b9c5a3b0f6ef95d7ac098d09b45740caaee39ab7157e/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.aec1e74c926b61cdfa7a4dfd67a90862a63734fa8cf4fbebf5af17d065ac7960/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
@@ -5,7 +5,7 @@
#+busybox-diffutils.7c9e0bee30fb6332bf7fa171c534c15d5d7d4fb0702c8f3cad054b4c34cd52ab
#+s6-rc.55862e01a106b3a786dfdadbca91ae5847fe7858a1b01c2bc1b30251b9d37c0b
#+fileset.1971823cad4993996adf72ab25c1201795c7af2f47abf0fbbbef93f748dcc2aa
-#+system-config.fa4d06af9e5663a052bf1c56e9e970e21c4630f32b63ae16965aabf815875534
+#+system-config.aac6a6b5be89ed129cbc7f00973c09f1a04faa2bf171a59f8a4438cedd24049b
# - build script start -
@@ -14,7 +14,7 @@ dest=${pthbs_destdir%/}${prefix}
cd 'system-config-rc'
-src=/versions/system-config.fa4d06af9e5663a052bf1c56e9e970e21c4630f32b63ae16965aabf815875534/config/s6-rc-source
+src=/versions/system-config.aac6a6b5be89ed129cbc7f00973c09f1a04faa2bf171a59f8a4438cedd24049b/config/s6-rc-source
s6-rc-compile ./s6-rc-db "$src"
mkdir -p "$dest/config"
mv -v s6-rc-db "$dest/config/"
