commit 4e03c19532665c407f4c7ae454dfe43b5afde45f
parent d01e128b4d671edf8cd6f5483b565695d2159890
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Fri, 10 Oct 2025 15:44:25 +0000
aat: fix destdir for data.awk
Diffstat:
13 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/templates/pkg/aat b/templates/pkg/aat
@@ -2,7 +2,7 @@
{% extends "scriptsetup" %}
{% block install -%}
{{ super() -}}
-mv -v data.awk "$pkgdir/"
+mv -v data.awk "${dest}/"
{% endblock %}
{% block genlinks_begin %}
diff --git a/variants/ccx-x86_64/aat b/variants/ccx-x86_64/aat
@@ -31,7 +31,7 @@ if test -d zsh-functions; then
mv -v zsh-functions "${dest}/zsh/site-functions"
fi
-mv -v data.awk "$pkgdir/"
+mv -v data.awk "${dest}/"
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -19,7 +19,7 @@
#+s6-networking.6f3b376f54eeb4ebedd0e480ab1d2ad4a114a3df3e5a0ad4760bae55e3d437fe
#+zsh.c1ba08b027e26ecf5b6a4f7f5aced2e9b520b1835b098ba5529cad1f97e387b5
#+pthbs-banginstall.fb1085a86eafedd60935fd033dbc0f6d47c187d3f7f9bf3cefdb1ddc43b21435
-#+aat.00bcd78b579082812bfeea3a2e5058e720409bc7a9e966a8cc10e54db65d5f73
+#+aat.b33fe3833f8ea46ebdb6900ad58529774beb169b76218ce270e3c975bcbfcd43
#+confz.f842f5ba2335e36311d73cb5b4bf42a6eb7c9f24eb8d437baaca8c284cf7872f
#+containers.6d877570baf5004da542dc69de47202df1b3d56f6d406db52120493f5c4c99dd
#+fileset.0ae777301ccf18194cb4bb828986672c3b4c225faf5f6a4b9969da5329e0394c
@@ -38,8 +38,8 @@
#+user-env.27a0b5452d41afaacb1d76c456caa84d85aff599c39ff32b8db694d2550d5b6d
#+strace.40668df6151b4574b553a5923103e07c6ddb344daca606f04edd0ac48e060d55
#+mlog.a882a51752c5081bd671d7d564ea8b5c4502b93c0951cb77a20aa0238c66bc82
-#+system-config.c05fb11a3c001f249cc75cfb91b42f3457a70bf79935b4f6db000668fe4daecf
-#+system-config-rc.7267883d64454f4a5002d09212d17c2133273a8939fd8dd3c305904311b71467
+#+system-config.2f5d86c2fbc240e042a8ab358599254c874d470d56e4a82f86237195cb945af1
+#+system-config-rc.821c4d7eef92a2e9231ec620ed87fc20e0988997cae342b4b7d01d1dc0c109a5
#+system-config-scripts.3c3ea3f86753f1b0e0927ec2875e5b90f388ba2c1f6ed9b69509ac25a7555da6
-#+system-config-init.2e124ecd5a1eadea35939267d64a862a3a15daec7c40eb9c6b31a780086c6944
+#+system-config-init.5c6ee640778758d9afce8c5e8f350c70f28b9a1a55f90f9cf9646c78c144ea1a
#+system-config-zsh.ca45b9086a867eb594d68b32cb4826f747b819c640cb472a6fd1b649b1a1d760
\ No newline at end of file
diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config
@@ -3,7 +3,7 @@
#+busybox-findutils.7f4b62603c13a47cfc863f53eccf0befa97271a83467dd610dfb819fd2f61f45
#+diffutils.fc4061b81466c8eb17c5bd31bcf32c265b2d68f445edff7c6aac50de2cf23bf4
#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0
-#+aat.00bcd78b579082812bfeea3a2e5058e720409bc7a9e966a8cc10e54db65d5f73
+#+aat.b33fe3833f8ea46ebdb6900ad58529774beb169b76218ce270e3c975bcbfcd43
#+fileset.0ae777301ccf18194cb4bb828986672c3b4c225faf5f6a4b9969da5329e0394c
#+rsync.ec6ab62cd8c365ad672dbdf63bb0b328386808a63957980e02d666b4f7915446
#+execline.0e5a0df166b6270f6f3f5e4fa0e8051e2432b88bd452b4676f3730724652874a
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.7267883d64454f4a5002d09212d17c2133273a8939fd8dd3c305904311b71467
+#+system-config-rc.821c4d7eef92a2e9231ec620ed87fc20e0988997cae342b4b7d01d1dc0c109a5
# - 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.7267883d64454f4a5002d09212d17c2133273a8939fd8dd3c305904311b71467/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.821c4d7eef92a2e9231ec620ed87fc20e0988997cae342b4b7d01d1dc0c109a5/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
@@ -4,7 +4,7 @@
#+busybox-diffutils.963ce6582575680763337552764b6a3c1be781d9fada1d52aa2d04fadeb229d0
#+s6-rc.4709b0b39ae84f7a1efa984a66237c0f6133cec32466acdf0a139e2ef142f5ee
#+fileset.0ae777301ccf18194cb4bb828986672c3b4c225faf5f6a4b9969da5329e0394c
-#+system-config.c05fb11a3c001f249cc75cfb91b42f3457a70bf79935b4f6db000668fe4daecf
+#+system-config.2f5d86c2fbc240e042a8ab358599254c874d470d56e4a82f86237195cb945af1
# - build script start -
@@ -13,7 +13,7 @@ dest=${pthbs_destdir%/}${prefix}
cd 'system-config-rc'
-src=/home/ccx/versions/system-config.c05fb11a3c001f249cc75cfb91b42f3457a70bf79935b4f6db000668fe4daecf/config/s6-rc-source
+src=/home/ccx/versions/system-config.2f5d86c2fbc240e042a8ab358599254c874d470d56e4a82f86237195cb945af1/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
@@ -19,7 +19,7 @@
#+s6-networking.6f3b376f54eeb4ebedd0e480ab1d2ad4a114a3df3e5a0ad4760bae55e3d437fe
#+zsh.c1ba08b027e26ecf5b6a4f7f5aced2e9b520b1835b098ba5529cad1f97e387b5
#+pthbs-banginstall.fb1085a86eafedd60935fd033dbc0f6d47c187d3f7f9bf3cefdb1ddc43b21435
-#+aat.00bcd78b579082812bfeea3a2e5058e720409bc7a9e966a8cc10e54db65d5f73
+#+aat.b33fe3833f8ea46ebdb6900ad58529774beb169b76218ce270e3c975bcbfcd43
#+confz.f842f5ba2335e36311d73cb5b4bf42a6eb7c9f24eb8d437baaca8c284cf7872f
#+containers.6d877570baf5004da542dc69de47202df1b3d56f6d406db52120493f5c4c99dd
#+fileset.0ae777301ccf18194cb4bb828986672c3b4c225faf5f6a4b9969da5329e0394c
diff --git a/variants/root-x86_64/aat b/variants/root-x86_64/aat
@@ -31,7 +31,7 @@ if test -d zsh-functions; then
mv -v zsh-functions "${dest}/zsh/site-functions"
fi
-mv -v data.awk "$pkgdir/"
+mv -v data.awk "${dest}/"
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -19,7 +19,7 @@
#+s6-networking.ca47d28ac08fed0aa231f80c6715c6b4ccecf133e904dc1800f7eb2f6a57f0bd
#+zsh.9330dcf8922d0de5ca2e8456ce19d85e6ed76365cfe1fe9cb3761569bfd0cbf6
#+pthbs-banginstall.457b2a62ae99241af2f242f0c8bdee49306e5070529448a61b56a7f55d3d2bb0
-#+aat.46ffbe5da0352662fe5fcb6092571cb1ea0cae4295372a6906a99cb8d472bc38
+#+aat.26c64faca6c93aec6a952f93e4084d75104efe6f7c7fe589fdf2b4a2c8e73bd8
#+confz.6c689831a997a5168324e95a9d953bba7aeb44bda06cf540e3bc5f5ec085344a
#+containers.a62adec44acb4061ad3050cc9cdd412c02607cff5b7401e0c013cdad36ebca6a
#+fileset.9a68fe7ea04ef898f33a980e9f0cb36e4e309c0d2f855b5d979063738432f51b
@@ -38,8 +38,8 @@
#+user-env.cdccc52b50fbacaeea62161170c6e3b770fa8dcd6a6e46af363cbbe451f6b5a4
#+strace.f9dbe83d3eaac5f19c4d7b3971928e97af25794472024ea02b4fd20ef5d977c2
#+mlog.7a615a6cd358a942b7d328b13562fc11cb3c82d2933f3de7fa727db87d48e6c2
-#+system-config.dd731fe2474522d209f64c264172af03838ed6d9e96220e680a7d058cfbd9d93
-#+system-config-rc.b4c0e2014986162dad4095436d9a5fba4c735c16bc03a0d376f8c4ab2adc2972
+#+system-config.8134a338f2777f84a507fd17b680e97783ed2dfe2880c2183f4491bd60f9ec00
+#+system-config-rc.23787933e2aa75ed0079bd772b6e53cd7fcc8165b063005c990cf7601a0ef65b
#+system-config-scripts.cbbd7e8b35c682d147057f2cd95a07b8735fe7422d41ed17dd2851d215e38137
-#+system-config-init.71b057a531be9a7d5bf847d4f05653015fc2b71d7692234c40f4ae683a3158e6
+#+system-config-init.0c75317ea8ca5ef948149a687d23399776e8e1d3586858be73692e0155ee1588
#+system-config-zsh.2395a0ac100619f08b05c21044f60208ef3fcb135a9302047c299e6d7ee2a6b1
\ No newline at end of file
diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config
@@ -3,7 +3,7 @@
#+busybox-findutils.cc95c44dcbb25e61fc33eb7b5aaa947be36855d6f2367d712caf1fc559f0b18d
#+diffutils.c5771cacb014b64df08c4d6c22f639d8203518119ef0bb57dac26020cb4db0b6
#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15
-#+aat.46ffbe5da0352662fe5fcb6092571cb1ea0cae4295372a6906a99cb8d472bc38
+#+aat.26c64faca6c93aec6a952f93e4084d75104efe6f7c7fe589fdf2b4a2c8e73bd8
#+fileset.9a68fe7ea04ef898f33a980e9f0cb36e4e309c0d2f855b5d979063738432f51b
#+rsync.c8a1e6d8328390565e688b8646258be9ec9430e16a50e1c6dfaf70ba05114f14
#+execline.f0eae8694d48210e76b8c63d1021b7c54029a8db968696dcb8b720240cd7b8ab
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.b4c0e2014986162dad4095436d9a5fba4c735c16bc03a0d376f8c4ab2adc2972
+#+system-config-rc.23787933e2aa75ed0079bd772b6e53cd7fcc8165b063005c990cf7601a0ef65b
# - 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.b4c0e2014986162dad4095436d9a5fba4c735c16bc03a0d376f8c4ab2adc2972/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.23787933e2aa75ed0079bd772b6e53cd7fcc8165b063005c990cf7601a0ef65b/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
@@ -4,7 +4,7 @@
#+busybox-diffutils.38ca9e723dfa24bd5cc2281952ff03c7dd312918a28dc0619b9816a293b5c8f5
#+s6-rc.6785af4c10f0e833235def47f34d88b8ac76fa2116f63d3bff478fb78de38b04
#+fileset.9a68fe7ea04ef898f33a980e9f0cb36e4e309c0d2f855b5d979063738432f51b
-#+system-config.dd731fe2474522d209f64c264172af03838ed6d9e96220e680a7d058cfbd9d93
+#+system-config.8134a338f2777f84a507fd17b680e97783ed2dfe2880c2183f4491bd60f9ec00
# - build script start -
@@ -13,7 +13,7 @@ dest=${pthbs_destdir%/}${prefix}
cd 'system-config-rc'
-src=/versions/system-config.dd731fe2474522d209f64c264172af03838ed6d9e96220e680a7d058cfbd9d93/config/s6-rc-source
+src=/versions/system-config.8134a338f2777f84a507fd17b680e97783ed2dfe2880c2183f4491bd60f9ec00/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
@@ -19,7 +19,7 @@
#+s6-networking.ca47d28ac08fed0aa231f80c6715c6b4ccecf133e904dc1800f7eb2f6a57f0bd
#+zsh.9330dcf8922d0de5ca2e8456ce19d85e6ed76365cfe1fe9cb3761569bfd0cbf6
#+pthbs-banginstall.457b2a62ae99241af2f242f0c8bdee49306e5070529448a61b56a7f55d3d2bb0
-#+aat.46ffbe5da0352662fe5fcb6092571cb1ea0cae4295372a6906a99cb8d472bc38
+#+aat.26c64faca6c93aec6a952f93e4084d75104efe6f7c7fe589fdf2b4a2c8e73bd8
#+confz.6c689831a997a5168324e95a9d953bba7aeb44bda06cf540e3bc5f5ec085344a
#+containers.a62adec44acb4061ad3050cc9cdd412c02607cff5b7401e0c013cdad36ebca6a
#+fileset.9a68fe7ea04ef898f33a980e9f0cb36e4e309c0d2f855b5d979063738432f51b
