commit 2b13ed6e8bad8ae073a72b4f89343b49fdb11b69
parent 709695638820aac0e84062aba5fd61ae712fb43c
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Mon, 26 May 2025 15:34:59 +0000
Add mlog to container-bin-image
Diffstat:
17 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/templates/pkg/container-bin-image b/templates/pkg/container-bin-image
@@ -8,6 +8,7 @@
#+{{pkg_install_name("ccx-utils")}}
#+{{pkg_install_name("applyuidgid-caps")}}
#+{{pkg_install_name("easyseccomp")}}
+#+{{pkg_install_name("mlog")}}
#@sha256:{{files["default-policy.easyseccomp"]}}:default-policy.easyseccomp
img="$pthbs_destdir{{versions}}/$pthbs_package/container-bin-image"
diff --git a/variants/ccx-x86_64/container-bin-image b/variants/ccx-x86_64/container-bin-image
@@ -7,6 +7,7 @@
#+ccx-utils.ab28a8d701f60db69818ef22c546d02eca1ba3900bcdeaf5676bcc13d4b7f114
#+applyuidgid-caps.9856a13db04a0f0192c4208744de2c649db2ae721dc0d0dd37eb90346236a514
#+easyseccomp.6631f58c9fe090f2b2becc5ac606901736aba4ad2a0075f6402bec85eaa3df7b
+#+mlog.469a9c52b637a3f275f115ebdbec0ae8502214064f7b19eaa727f4f124e665d7
#@sha256:b9236c0fd504ffbc56f65d0522d2acadcd2683380eaa6f1873e8201eaa7388a5:default-policy.easyseccomp
img="$pthbs_destdir/home/ccx/versions/$pthbs_package/container-bin-image"
diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers
@@ -6,7 +6,7 @@
#+alpine-keys.dedc78b0b50e461d33a449adf40691698925b5eb9af8a6b69e7c0ece6b708ef4
#+apk-tools.e556b101ee41fc88c653ea4a9c405942ce921c65d378def15c77fd19aec3beaf
#+xbps.a8e42fa55614db5c7453b7513e917b19070a71abb801ef22cff7ef004e13241b
-#+container-bin-image.b573521f82b7138233b02d166301750bc783c78814d9c4f772e3bb18e91a0846
+#+container-bin-image.32a120ceff3907a4e35434de76e34ff0e9ac87cdeb92eac126de896644494305
#@git:b7cc3cd6bc8713c16e71ef855456909c7f4af26c:containers
: ${JOBS:=1}
@@ -58,9 +58,9 @@ for f in '/home/ccx/versions/xbps.a8e42fa55614db5c7453b7513e917b19070a71abb801ef
ln -sf "$f" "$pkgdir/deps/keys/void/"
done
-test -d '/home/ccx/versions/container-bin-image.b573521f82b7138233b02d166301750bc783c78814d9c4f772e3bb18e91a0846/container-bin-image'
-test -f '/home/ccx/versions/container-bin-image.b573521f82b7138233b02d166301750bc783c78814d9c4f772e3bb18e91a0846/container-bin-image/if'
-ln -sf '/home/ccx/versions/container-bin-image.b573521f82b7138233b02d166301750bc783c78814d9c4f772e3bb18e91a0846/container-bin-image' "$pkgdir/deps/"
+test -d '/home/ccx/versions/container-bin-image.32a120ceff3907a4e35434de76e34ff0e9ac87cdeb92eac126de896644494305/container-bin-image'
+test -f '/home/ccx/versions/container-bin-image.32a120ceff3907a4e35434de76e34ff0e9ac87cdeb92eac126de896644494305/container-bin-image/if'
+ln -sf '/home/ccx/versions/container-bin-image.32a120ceff3907a4e35434de76e34ff0e9ac87cdeb92eac126de896644494305/container-bin-image' "$pkgdir/deps/"
cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
find -type d -o -print | awk -F/ '
diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment
@@ -7,7 +7,7 @@
#+s6-linux-utils.1990b55837ff2c28a81500d80292c6d530c8516347eb896007eb5aed2af6c425
#+zsh.f79a20125b2f520d3719411e6f0895cf4f2e0657565c3fef07b3069436b8960f
#+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a
-#+containers.7dde3fddc3ea441b8c1341da2d567cc37824b07ab81630b3c6cf0089bfc2e033
+#+containers.6df80fb4d81ce09a052340b81a3c9c738553d55850d3d2a7711ccd6d0ab36f4a
#+xbps.a8e42fa55614db5c7453b7513e917b19070a71abb801ef22cff7ef004e13241b
#+zstd.8b11bd81c450d61aa6a44ffd019654c590439df68ebd8987db4cdbbcf182d67c
#+apk-tools.e556b101ee41fc88c653ea4a9c405942ce921c65d378def15c77fd19aec3beaf
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -21,7 +21,7 @@
#+pthbs-banginstall.7ddbf08ba8b1298841fad793d4ed7ba4979b9346155195489fc5e492ed5f0fe2
#+aat.0698d0082830b7f8bcf3840f3f8c25382ef2d9f174dd6d5407c5e2132d1f16e4
#+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a
-#+containers.7dde3fddc3ea441b8c1341da2d567cc37824b07ab81630b3c6cf0089bfc2e033
+#+containers.6df80fb4d81ce09a052340b81a3c9c738553d55850d3d2a7711ccd6d0ab36f4a
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
#+logincaps.b6448feda8aa2e43cbf6e305de8ba71a0416851b98b63bd567c435b2c251ea07
#+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7
@@ -38,8 +38,8 @@
#+user-env.4e95a5387aa403e1d16a22254f21fb4cec046c69341a5eae764dd8126fb638a8
#+strace.53097be3dbf67dbf52aa675a59980a7d965fd8cdf965ef3005035e70fc7e4103
#+mlog.469a9c52b637a3f275f115ebdbec0ae8502214064f7b19eaa727f4f124e665d7
-#+system-config.c35ca029ae6c68c9783ee82525ea0ccdab16fbf719dc630db58d0ec72cc9e9ad
-#+system-config-rc.40369271518e9d8d70b414386306a13efc47b0cdf4005fd772516979fb8406a6
+#+system-config.fb03fef54241fd91c72377b1e5ac4d70075a0dadd9480269e453e9dba9c07bec
+#+system-config-rc.d72992953db79f6c21bcde39ed1d9e42e52127fbb834daa541581324eac5e871
#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.fe18c4c200565d7a675a5e53505833b726972871d78f948e036a38a5c33e2c00
+#+system-config-init.46356551f2d24110932b1f8c21707ac8daaa72ee03077fd8e3dff7fb0806b654
#+system-config-zsh.250277c1fe17ccb13b5efbacd35ecb3b8342e30910cdd709f89475773bb7f309
\ No newline at end of file
diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config
@@ -52,7 +52,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.307daac2211da174dfb38e95b553242bd93bc951c60196d97df8421525b6f12c' \
+ 'pthbs_path_containers=/home/ccx/versions/env.743b80e635250fed7c140f3e48349ed0e110edcb699957fa71fb573988c82ad0' \
'pthbs_path_mdevd=/home/ccx/versions/env.5049027ea8b6b4d373e16aadd3cdc63a940582ff297656e395f2131eef181671' \
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
@@ -5,9 +5,9 @@
#+s6-portable-utils.1b8fd31be72bfe84afb28c3dfff03b1fc45121d11fc85f79c90f085fe61bc132
#+s6-linux-init.cd3e307b62e7dde98e1572eed297bd544e888d2589d4c1e7fd79271c4078ddf2
#+execline.1505a32c24aa5dbf362550f39283c9ff1936e717e5a82d220f8212cd9e604d8f
-#+system-config-rc.40369271518e9d8d70b414386306a13efc47b0cdf4005fd772516979fb8406a6
+#+system-config-rc.d72992953db79f6c21bcde39ed1d9e42e52127fbb834daa541581324eac5e871
-s6rcdb=/home/ccx/versions/system-config-rc.40369271518e9d8d70b414386306a13efc47b0cdf4005fd772516979fb8406a6/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.d72992953db79f6c21bcde39ed1d9e42e52127fbb834daa541581324eac5e871/config/s6-rc-db
prefix=/home/ccx/versions/$pthbs_package
pkgdir="$pthbs_destdir/$prefix"
diff --git a/variants/ccx-x86_64/system-config-rc b/variants/ccx-x86_64/system-config-rc
@@ -3,7 +3,7 @@
#+busybox-diffutils.c2ebcfcad050ad71b8e30322a463b5c009f254c7a42e95c627d32665e17134dc
#+s6-rc.fecfa43aebb0615904e0e120b9ce8c0596c9b6c577611cbadc8fbaca75196ed9
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
-#+system-config.c35ca029ae6c68c9783ee82525ea0ccdab16fbf719dc630db58d0ec72cc9e9ad
+#+system-config.fb03fef54241fd91c72377b1e5ac4d70075a0dadd9480269e453e9dba9c07bec
def_prefix() {
prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/home/ccx/versions/system-config.c35ca029ae6c68c9783ee82525ea0ccdab16fbf719dc630db58d0ec72cc9e9ad/config/s6-rc-source
+src=/home/ccx/versions/system-config.fb03fef54241fd91c72377b1e5ac4d70075a0dadd9480269e453e9dba9c07bec/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
@@ -21,7 +21,7 @@
#+pthbs-banginstall.7ddbf08ba8b1298841fad793d4ed7ba4979b9346155195489fc5e492ed5f0fe2
#+aat.0698d0082830b7f8bcf3840f3f8c25382ef2d9f174dd6d5407c5e2132d1f16e4
#+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a
-#+containers.7dde3fddc3ea441b8c1341da2d567cc37824b07ab81630b3c6cf0089bfc2e033
+#+containers.6df80fb4d81ce09a052340b81a3c9c738553d55850d3d2a7711ccd6d0ab36f4a
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
#+logincaps.b6448feda8aa2e43cbf6e305de8ba71a0416851b98b63bd567c435b2c251ea07
#+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7
diff --git a/variants/root-x86_64/container-bin-image b/variants/root-x86_64/container-bin-image
@@ -7,6 +7,7 @@
#+ccx-utils.ccaa449ada3142ef075f3c80a6e475520219814490557f308ded4685231a70ac
#+applyuidgid-caps.2d571b717bda734b4464e7d3b36bb2c9eaa265fffd595bc090cbb137258121b8
#+easyseccomp.a69f369af91163a534bf0d1bf51c74cd98c971d7eb5f61c2ee29afb6ba7a9344
+#+mlog.36b11a702be9d20b12d90f93bddd2209d325ba42d2c3d9e9ba38d73b3415e344
#@sha256:b9236c0fd504ffbc56f65d0522d2acadcd2683380eaa6f1873e8201eaa7388a5:default-policy.easyseccomp
img="$pthbs_destdir/versions/$pthbs_package/container-bin-image"
diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers
@@ -6,7 +6,7 @@
#+alpine-keys.4ecd9fac6efcc329a98af1b0b1318771a77eb83ac10832c6e769ebf11c14cae1
#+apk-tools.c38f943bab7fe83e4c5e2c1029b587565e70bcc76cf96e55232e29a13d42b5fa
#+xbps.f860fd980433f32edb85953f72c3d3f50872ad6f9cfb4e7a0cfa5b9529a3ae6d
-#+container-bin-image.73015ddb9b2445d20f56f4d7cfaa5d283773d425569c51a407495cb0493c54f1
+#+container-bin-image.1a6e91dcec28f66754d01a12de2bda8caf886dc7e8c8920483ab26e0ae528ec4
#@git:b7cc3cd6bc8713c16e71ef855456909c7f4af26c:containers
: ${JOBS:=1}
@@ -58,9 +58,9 @@ for f in '/versions/xbps.f860fd980433f32edb85953f72c3d3f50872ad6f9cfb4e7a0cfa5b9
ln -sf "$f" "$pkgdir/deps/keys/void/"
done
-test -d '/versions/container-bin-image.73015ddb9b2445d20f56f4d7cfaa5d283773d425569c51a407495cb0493c54f1/container-bin-image'
-test -f '/versions/container-bin-image.73015ddb9b2445d20f56f4d7cfaa5d283773d425569c51a407495cb0493c54f1/container-bin-image/if'
-ln -sf '/versions/container-bin-image.73015ddb9b2445d20f56f4d7cfaa5d283773d425569c51a407495cb0493c54f1/container-bin-image' "$pkgdir/deps/"
+test -d '/versions/container-bin-image.1a6e91dcec28f66754d01a12de2bda8caf886dc7e8c8920483ab26e0ae528ec4/container-bin-image'
+test -f '/versions/container-bin-image.1a6e91dcec28f66754d01a12de2bda8caf886dc7e8c8920483ab26e0ae528ec4/container-bin-image/if'
+ln -sf '/versions/container-bin-image.1a6e91dcec28f66754d01a12de2bda8caf886dc7e8c8920483ab26e0ae528ec4/container-bin-image' "$pkgdir/deps/"
cd "$pthbs_destdir/versions/$pthbs_package"
find -type d -o -print | awk -F/ '
diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment
@@ -7,7 +7,7 @@
#+s6-linux-utils.f7e0654375f11beedafd731ad1dd66c0de8d03452bb8e38bb647cc51cc3adb2e
#+zsh.4ac9e4166454e8d60c15837b7ca4938abe99db029b3fffa11b1cfd54d40ae09b
#+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf
-#+containers.f49d873d5ac1ca183ee4067ef541ea284aa6686ab9dc538c0a4e826859ce2700
+#+containers.dfbe46e6ed4a386fcb46b5ecf33fe87a7bfc088ad4a2e11cf9d9631552c7d09e
#+xbps.f860fd980433f32edb85953f72c3d3f50872ad6f9cfb4e7a0cfa5b9529a3ae6d
#+zstd.a83f72c5953bd6b7afc171528a503710b3144bf9197961833fd27926b0a18137
#+apk-tools.c38f943bab7fe83e4c5e2c1029b587565e70bcc76cf96e55232e29a13d42b5fa
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -21,7 +21,7 @@
#+pthbs-banginstall.30ed98ef3fedfb6b25b3f58c27e845f123a22a756b37a5cd75764315bba23571
#+aat.9432aa485263e75ca3e43d6511c561a9cd328c417ebe26b890ed4a8061fee06f
#+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf
-#+containers.f49d873d5ac1ca183ee4067ef541ea284aa6686ab9dc538c0a4e826859ce2700
+#+containers.dfbe46e6ed4a386fcb46b5ecf33fe87a7bfc088ad4a2e11cf9d9631552c7d09e
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+logincaps.99361726e6ba3043eeeb1aaca8caa7c86b771726c8f55c08810bd745a19ba474
#+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5
@@ -38,8 +38,8 @@
#+user-env.8ad55eebe32b11f005f7b5c6dc204fdccc0a53cd7294f87c1e959ea47793dbca
#+strace.ce1707d2cf1dfcd965827af80a18c6b97ca20b563b8967be8297322e8adf9296
#+mlog.36b11a702be9d20b12d90f93bddd2209d325ba42d2c3d9e9ba38d73b3415e344
-#+system-config.e0684eb45f07a2e32ea426688539eaac0e89414443ef97326b7aed096589204f
-#+system-config-rc.fccd23adcfd1aab4d3f51160d09cc442bf744e9a3b8b89d38cae73cd1f22a1f5
+#+system-config.9d0b298021beae677cd15e283a5bcd36b70385cb8a7a25800f53fef85097f105
+#+system-config-rc.1eb07cd0528e6e16337b0cf6f959a40186a1475af45d8c0ac6dc46ed5c63becc
#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.064f9610f9faf83a0b715736a34c14441c29cff70f54676fa53ecccdc69dc9c8
+#+system-config-init.52470a0b2cedbc3e9afad30c508ee2a8bbba56a403693872c2c72f830cbc54dc
#+system-config-zsh.01286ec545c7035b2e08ded96e40b73f912f33fd7eec44993a1e93e12577dc0f
\ No newline at end of file
diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config
@@ -52,7 +52,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.d428adfd355fed0778e43b3596e3a7b3213cdec195a6f1cc835853c00a2f2efe' \
+ 'pthbs_path_containers=/versions/env.59d94f8975db676ad254d63447a005b2831c33215b8a0781d6ab6bae16a90968' \
'pthbs_path_mdevd=/versions/env.699c310193b7957c8ec17e16d6846443f99c198e3e2ce6425066f4523de2cf1e' \
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
@@ -5,9 +5,9 @@
#+s6-portable-utils.f6171ad521d6be72875f1d5c1b28f966662ba93cfe5790e1ef010f9e76211bc3
#+s6-linux-init.8fbed3537ce9accc1a31e36f4648d1a0df0f1d155fcfa8fb5b1079786cf1442c
#+execline.c89bee1b1207461afa2d2ab9250f0940a2a6bbca3e45bdd60037049a75f4adf9
-#+system-config-rc.fccd23adcfd1aab4d3f51160d09cc442bf744e9a3b8b89d38cae73cd1f22a1f5
+#+system-config-rc.1eb07cd0528e6e16337b0cf6f959a40186a1475af45d8c0ac6dc46ed5c63becc
-s6rcdb=/versions/system-config-rc.fccd23adcfd1aab4d3f51160d09cc442bf744e9a3b8b89d38cae73cd1f22a1f5/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.1eb07cd0528e6e16337b0cf6f959a40186a1475af45d8c0ac6dc46ed5c63becc/config/s6-rc-db
prefix=/versions/$pthbs_package
pkgdir="$pthbs_destdir/$prefix"
diff --git a/variants/root-x86_64/system-config-rc b/variants/root-x86_64/system-config-rc
@@ -3,7 +3,7 @@
#+busybox-diffutils.4a0933977737282afcd82b39d435b50946a700fe13472d24e4580a41fa852123
#+s6-rc.c131bb99b2054bcd9705c5a5652822938265a8587a54d2894667b8b620815c7f
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
-#+system-config.e0684eb45f07a2e32ea426688539eaac0e89414443ef97326b7aed096589204f
+#+system-config.9d0b298021beae677cd15e283a5bcd36b70385cb8a7a25800f53fef85097f105
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.e0684eb45f07a2e32ea426688539eaac0e89414443ef97326b7aed096589204f/config/s6-rc-source
+src=/versions/system-config.9d0b298021beae677cd15e283a5bcd36b70385cb8a7a25800f53fef85097f105/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
@@ -21,7 +21,7 @@
#+pthbs-banginstall.30ed98ef3fedfb6b25b3f58c27e845f123a22a756b37a5cd75764315bba23571
#+aat.9432aa485263e75ca3e43d6511c561a9cd328c417ebe26b890ed4a8061fee06f
#+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf
-#+containers.f49d873d5ac1ca183ee4067ef541ea284aa6686ab9dc538c0a4e826859ce2700
+#+containers.dfbe46e6ed4a386fcb46b5ecf33fe87a7bfc088ad4a2e11cf9d9631552c7d09e
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+logincaps.99361726e6ba3043eeeb1aaca8caa7c86b771726c8f55c08810bd745a19ba474
#+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5
