commit 2b4c1d1dea1e410d93bdbd2702e9ebf5d255fd3e parent 9589262a8476d65460ab91863734cbf563b9c680 Author: Jan Pobrislo <ccx@te2000.cz> Date: Sun, 12 Oct 2025 12:44:28 +0000 fix system-config-rc src_dir Diffstat:
7 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/templates/pkg/system-config-rc b/templates/pkg/system-config-rc @@ -1,3 +1,4 @@ +{%- set src_dir="." -%} {% extends "genlinks" %} {% block package_deps -%} #+{{pkg_install_name("busybox-diffutils")}} diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment @@ -41,7 +41,7 @@ #+findutils.acabe096cf8a4c328d4edd1b2d0bc2edf3b5207af56e582f77806ddbbf6dd2c1 #+nawk.7a9a6aeeddfdfce14fd07c84b51c3429fc3de7ef6e37ff73f9dee2ed8299a0c6 #+system-config.8a3b6b805729a2f92deb6d7d12f23351f123673efbb8fe1b84b9191daeaa5f62 -#+system-config-rc.5c2dee1067b3c194d04183c10ad02628abaeae2a37d2077b9a45b9281f52e00c +#+system-config-rc.9e7d1a576cf722cce1c65e9a28d0d795b228728c7b1d0705771d04efeef15ae8 #+system-config-scripts.a54759d4f335bd14d0739a8b91412f1ce5302d65013e587018ec1bcf5363b16a -#+system-config-init.a52550a9c494a7cf033b78b95a237a843d470d491a312d1fabda4ed1343d1ea7 +#+system-config-init.680f9161551db78efd62d0ed4256af436a676d917e83b448241a7046b13a5c36 #+system-config-zsh.3f24324efe84089cac74c52a6324952a793cd304f29ea46e4f28fb00c8c35df7 \ No newline at end of file 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.5c2dee1067b3c194d04183c10ad02628abaeae2a37d2077b9a45b9281f52e00c +#+system-config-rc.9e7d1a576cf722cce1c65e9a28d0d795b228728c7b1d0705771d04efeef15ae8 # - 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.5c2dee1067b3c194d04183c10ad02628abaeae2a37d2077b9a45b9281f52e00c/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.9e7d1a576cf722cce1c65e9a28d0d795b228728c7b1d0705771d04efeef15ae8/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 @@ -11,7 +11,7 @@ # - build script start - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} -cd 'system-config-rc' +cd '.' src=/home/ccx/versions/system-config.8a3b6b805729a2f92deb6d7d12f23351f123673efbb8fe1b84b9191daeaa5f62/config/s6-rc-source diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment @@ -41,7 +41,7 @@ #+findutils.dece147f2921d0477c8aec1d431a3b18e1198e7ad81b06b51368f561ee311e4b #+nawk.6f65756dfd9fd32f6b702d0659871036b39b90591b8c8f739874371552169a73 #+system-config.5aab04c62c5f380a071c1b891e333fddf57b5c65f098cd6ffd8285d367f61c56 -#+system-config-rc.50bf5144c0a1c56312836bbea7c244331c553b99cc5abab9548b21673eb3c66d +#+system-config-rc.4c93478687fc9d24c056964e988eb0f91514a9196bd1898356cc916d0654554c #+system-config-scripts.5ade8006267d5dd6f2fa7be80dc04f8396ed6e6da6abd1d23eaaee1f237ba341 -#+system-config-init.e98eeb06c526f3130b0cd057b0dd4b38afca079f460214b28c52a863a1a5ca0c +#+system-config-init.d78ec01397821d3d9485657974344ee8ea0c9353f1a4d4e9e72f4a232b4c3a83 #+system-config-zsh.2f424f7007ce63719a484ba88a797dba7ae43a63408eb4ebd0dc8d7b252fccc1 \ No newline at end of file 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.50bf5144c0a1c56312836bbea7c244331c553b99cc5abab9548b21673eb3c66d +#+system-config-rc.4c93478687fc9d24c056964e988eb0f91514a9196bd1898356cc916d0654554c # - 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.50bf5144c0a1c56312836bbea7c244331c553b99cc5abab9548b21673eb3c66d/config/s6-rc-db +s6rcdb=/versions/system-config-rc.4c93478687fc9d24c056964e988eb0f91514a9196bd1898356cc916d0654554c/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 @@ -11,7 +11,7 @@ # - build script start - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} -cd 'system-config-rc' +cd '.' src=/versions/system-config.5aab04c62c5f380a071c1b891e333fddf57b5c65f098cd6ffd8285d367f61c56/config/s6-rc-source