commit 5a5fdfff04caf13118c5e661a1de91417f087dd1
parent cc39763a687101b13010a4ad40474f9a1f968446
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Sun, 26 Oct 2025 23:29:14 +0000
fix mdev-scripts
Diffstat:
13 files changed, 27 insertions(+), 21 deletions(-)
diff --git a/templates/pkg/mdev-scripts b/templates/pkg/mdev-scripts
@@ -1,9 +1,9 @@
{% extends "genlinks" %}
-{% block deps -%}
+{% block package_deps -%}
#+{{pkg_install_name("zsh")}}
#+{{pkg_install_name("pthbs-banginstall")}}
#@git:{{submodule.current["mdev-conf"]}}:{{name}}
-{% endblock %}
+{% endblock package_deps %}
{% block build_and_install -%}
mkdir -p "$dest"
for script in persistent-storage dvbdev ptpdev usbdev; do
@@ -11,4 +11,4 @@ for script in persistent-storage dvbdev ptpdev usbdev; do
chmod +x mdev-hook-$script
pthbs-banginstall mdev-hook-$script "$dest"
done
-{% endblock %}
+{% endblock build_and_install %}
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -40,8 +40,8 @@
#+mlog.d3f90010a808d81d0e4e26efefd0b2325b395fd1b011f1d94cdc0be1cb017339
#+findutils.c80b9056e275f82f7d371a44035a3c11dd43faae948a696f9cea0cd681b76aef
#+nawk.24907cbb8100b37ab37723f0335e79103b0135b8ae6175e179b145bbdbe500e0
-#+system-config.be4df1697fa94aeb653f4ec1de670828e238e040533b8b142bfa1fc98ac43a8f
-#+system-config-rc.b3ebcc0facfbde3c5262ba850559a611d20e03d53e5d21732be7e27e940071fe
+#+system-config.5f70161116edd0127929e25071388a29fa9f47e32e2b10f4f7b26c7dc92f2c56
+#+system-config-rc.0ebbe646ae9c717f0b3c0693ac574c228f90f5232deeb5acb26a2cc494fa0713
#+system-config-scripts.6080239044e6d330a6ea9e01625ca9d04971775d95bfc60a336235e0a4b1d743
-#+system-config-init.3b798dfc76ca2aa7a3c1fb440722989d19788a6ec9086ba82b247863b614eb77
+#+system-config-init.41a790d901b3f8889b29c2949fda72cb51218a70b45110ea409148f2c15acb3d
#+system-config-zsh.44342c96638209b72ed90af329e3f90445dd1c5f6ca837b3d735833a48d8dd34
\ No newline at end of file
diff --git a/variants/ccx-x86_64/mdev-scripts b/variants/ccx-x86_64/mdev-scripts
@@ -1,4 +1,7 @@
#!/usr/bin/env pthbs-build
+#+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f
+#+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716
+#+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b
#+zsh.7a73a1599d87b3e354a0e58e4119f89b71fb053e261e36802af49d80ce8d9ba1
#+pthbs-banginstall.47e87f044eea270225da61ee7d709e01b2e6385fee494566c647cddac19e0592
#@git:395634340de8349996fd273b055ae4bac9d2897c:mdev-scripts
diff --git a/variants/ccx-x86_64/mdevd.environment b/variants/ccx-x86_64/mdevd.environment
@@ -2,6 +2,6 @@
#+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f
#+execline.749fa9922ca7a4c505ca1b2c001625d161085c37c5ea75585fbddb321558157a
#+s6.aba44e80074ee5ae8921a773c04c3f2433945ad5566cb986e3edc5fe5c5600cf
-#+mdev-scripts.2a17936191cf67175a1088959a2ea685567cf604fae71e9909010323a7a5482e
+#+mdev-scripts.056213588dc63cc192d272bc9681fd493af9bef5373da9914b07b55057f25a60
#+mdevd.f93eb2eff2928fd4618a959255b19e6a01e056a6a9287ce5d1a3bce89eca1a15
#+busybox.9231d8d9390327e0f99ebfdc49efdab27d0797f0c20f7349981add284eae635c
\ No newline at end of file
diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config
@@ -54,7 +54,7 @@ chmod +x config/etc/skel/loginexec
env 'pthbs_path_system-config'="$prefix" \
'pthbs_path_containers=/home/ccx/versions/env.71afc33c80f0417c064e6759b62c8911f446f4ce4a4a2df0c9838d73e41089f8' \
- 'pthbs_path_mdevd=/home/ccx/versions/env.1cc481f43e7f936fa0527b29008b34ca4c82cb10a81ffb2b908d52b23e9bedf4' \
+ 'pthbs_path_mdevd=/home/ccx/versions/env.9ae00761f91fce271a7a398052f458baa4884fd6dfd8e65a58014c19720d9548' \
make -j${JOBS:-1} -l$((1+${JOBS:-1})) all
sort -u build/execfile | while IFS= read exename; do
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.945ba0fbba6153923f5a761abc154568d30fc1db69b26f03ead9fe248f87d351
#+s6-linux-init.30ee852e07291b5f3c94ed4037e403122037366bcc655a87f5527f1813332d62
#+execline.749fa9922ca7a4c505ca1b2c001625d161085c37c5ea75585fbddb321558157a
-#+system-config-rc.b3ebcc0facfbde3c5262ba850559a611d20e03d53e5d21732be7e27e940071fe
+#+system-config-rc.0ebbe646ae9c717f0b3c0693ac574c228f90f5232deeb5acb26a2cc494fa0713
# - build script start -
@@ -32,7 +32,7 @@ dest=${pthbs_destdir%/}${prefix}
cd '.'
-s6rcdb=/home/ccx/versions/system-config-rc.b3ebcc0facfbde3c5262ba850559a611d20e03d53e5d21732be7e27e940071fe/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.0ebbe646ae9c717f0b3c0693ac574c228f90f5232deeb5acb26a2cc494fa0713/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.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8
#+s6-rc.77ee4f3326027d4463fb531273c8b42b4d8f6fabba2d075e15e18eb2cb2a8c50
#+fileset.c9ce28ff816e023243d76d1bcb4d2b732f6b1f89c0cb9df15c1fd73880896a07
-#+system-config.be4df1697fa94aeb653f4ec1de670828e238e040533b8b142bfa1fc98ac43a8f
+#+system-config.5f70161116edd0127929e25071388a29fa9f47e32e2b10f4f7b26c7dc92f2c56
# - build script start -
@@ -15,7 +15,7 @@ dest=${pthbs_destdir%/}${prefix}
cd '.'
-src=/home/ccx/versions/system-config.be4df1697fa94aeb653f4ec1de670828e238e040533b8b142bfa1fc98ac43a8f/config/s6-rc-source
+src=/home/ccx/versions/system-config.5f70161116edd0127929e25071388a29fa9f47e32e2b10f4f7b26c7dc92f2c56/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
@@ -40,8 +40,8 @@
#+mlog.f9e7afa9325b4affd4298e6de0a07d22a074799f0ea7bda1e3fb58a37b98e398
#+findutils.1edbb84f016e9dc61540b8396e85a2163570b9281a408f8787f17e404f685ce0
#+nawk.8521bf13f53618b7897b7f2e070a506a0101c985f6b9bb527d5eb15d8e8d4858
-#+system-config.98c54bf1e5b6d6697114f08c0ecb99008aecf86e11bf2f6b0a34a265354eea0e
-#+system-config-rc.ba67a4ee110713b81d0e09862d2d6fcf0ba4d233d8d7179b6bc7cf8d373861bb
+#+system-config.f87d314249dd2dd6ad53ed2f27b4f9bad3ac5eb6fa5ca160b7666a9cf279e901
+#+system-config-rc.ce69acff37b47ab63d758c87a9811a18f90050366e35751ec18eda29adff1fa5
#+system-config-scripts.c533391a1fcb035cbc2e4bad71f1dc5c40ed8b2c37d0dcd2cc7929c1dea80b5f
-#+system-config-init.1574e5249591c8163038961bd5063eca0b99ef79e543bea8198c12c39dae968c
+#+system-config-init.1b7d16b9384ea6af8c8eeca980b4cba700fdf39405372a3f4ed2afe019ba02f5
#+system-config-zsh.62c3518c0b26bb74a5913e7c6a89e60e0ac9ac138cddde75a74828713d3b7b37
\ No newline at end of file
diff --git a/variants/root-x86_64/mdev-scripts b/variants/root-x86_64/mdev-scripts
@@ -1,4 +1,7 @@
#!/usr/bin/env pthbs-build
+#+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002
+#+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7
+#+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b
#+zsh.86584889aa0a3af405974c69ab43869f82e00acdba5340528e5dd20757f7dfc8
#+pthbs-banginstall.0442e58611ea2fc27a0a57a4c1b9b8696d799e9ebb737f3548553a61f845e34b
#@git:395634340de8349996fd273b055ae4bac9d2897c:mdev-scripts
diff --git a/variants/root-x86_64/mdevd.environment b/variants/root-x86_64/mdevd.environment
@@ -2,6 +2,6 @@
#+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002
#+execline.c677b46c36eac37bee97ce38c09c501d27babea0737cbab9fb21a3ec9b194284
#+s6.344af4b89dee417e72484532005f0a223e20675a15daac49d498a554812bac61
-#+mdev-scripts.e1a3a292f994e2cc9910aaa764fd4f8b3f86c2cb26a4bc1e426f88a286db5078
+#+mdev-scripts.4fa9f2d49998db1a832103801dfba30ae20d73074858bfd6ffacbb6df732a13f
#+mdevd.0502ff0a0d6e4f3b58469d0d3aef8816631718d5375ec0d41913dfa9121590fb
#+busybox.660c27fd0ce7b80248bee14d25b8f2115c408f87721d4f07a5ac9d5d360b3a56
\ No newline at end of file
diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config
@@ -54,7 +54,7 @@ chmod +x config/etc/skel/loginexec
env 'pthbs_path_system-config'="$prefix" \
'pthbs_path_containers=/versions/env.480dc04ac65e861dd88e23d89d33771afaa926d8984198aafdc61bab48fab2cc' \
- 'pthbs_path_mdevd=/versions/env.587734c2fde5b7dd48f968c39290c2fd2ed92780d5d4bab0b2292429a4729eea' \
+ 'pthbs_path_mdevd=/versions/env.d82a4f341af727439aa71592c00c2014d2407e78bc50027e1944f49c8175aeda' \
make -j${JOBS:-1} -l$((1+${JOBS:-1})) all
sort -u build/execfile | while IFS= read exename; do
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.07e8ff4d2d45a743ec810d3e27268460d201bafbb0a765756da09179758d4b0d
#+s6-linux-init.e17bf07f726729c579bb12c1d25dad4bb263f96509f7ea852bb44d50737d0b4d
#+execline.c677b46c36eac37bee97ce38c09c501d27babea0737cbab9fb21a3ec9b194284
-#+system-config-rc.ba67a4ee110713b81d0e09862d2d6fcf0ba4d233d8d7179b6bc7cf8d373861bb
+#+system-config-rc.ce69acff37b47ab63d758c87a9811a18f90050366e35751ec18eda29adff1fa5
# - build script start -
@@ -32,7 +32,7 @@ dest=${pthbs_destdir%/}${prefix}
cd '.'
-s6rcdb=/versions/system-config-rc.ba67a4ee110713b81d0e09862d2d6fcf0ba4d233d8d7179b6bc7cf8d373861bb/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.ce69acff37b47ab63d758c87a9811a18f90050366e35751ec18eda29adff1fa5/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.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc
#+s6-rc.9416ba0fe405fc2a019beeee1b35a666324184886c12b89deb929c515ca06183
#+fileset.8d3627d93e7b4c33483589e8602b462d3fcd31d6f38adde5ee53c024197c7286
-#+system-config.98c54bf1e5b6d6697114f08c0ecb99008aecf86e11bf2f6b0a34a265354eea0e
+#+system-config.f87d314249dd2dd6ad53ed2f27b4f9bad3ac5eb6fa5ca160b7666a9cf279e901
# - build script start -
@@ -15,7 +15,7 @@ dest=${pthbs_destdir%/}${prefix}
cd '.'
-src=/versions/system-config.98c54bf1e5b6d6697114f08c0ecb99008aecf86e11bf2f6b0a34a265354eea0e/config/s6-rc-source
+src=/versions/system-config.f87d314249dd2dd6ad53ed2f27b4f9bad3ac5eb6fa5ca160b7666a9cf279e901/config/s6-rc-source
s6-rc-compile ./s6-rc-db "$src"
mkdir -p "$dest/config"
mv -v s6-rc-db "$dest/config/"
