commit dfa627bf843822edda896c082b18a400589db4e8
parent 0c13754cc4be97c2961b6d2bd881624b11e1b084
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Wed, 10 Dec 2025 19:16:41 +0000
libcgroup
Diffstat:
11 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/templates/pkg/libcgroup b/templates/pkg/libcgroup
@@ -16,9 +16,11 @@ autotools_config_static \
--disable-pam \
--disable-daemon \
--disable-python \
+ --disable-systemd \
--disable-initscript-install \
--disable-tests \
--disable-code-coverage
+
{% endblock configure %}
{% block check -%}
check_static command/cgconfigparser
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -87,9 +87,9 @@
#+squashfs-tools.d674abf818e01e9a46d0a6e995c2fa8f4e6086671e2b4d8345e8f592e0558128
#+mandoc.e037587ebdf49fabbb28d83caa5b22be308fa7406c22f4f7545106426c458bdc
#+tinyssh.0ac46feb5c124a8975937476f186cccae55fefec0cb8865ff2bac544a2af31af
-#+system-config.37fc26a40a8209346b24fcca4d1e43f5dbb62d6f84634bbcd94b67d9639f130c
-#+system-config-rc.0922559eaa62c702509597022dbadaa6a718001d986394dc11e28ce54357016b
+#+system-config.4bd988c5bcd336415bc850050a515938c1645cf94742b3ef0bc1a6bb25b6d9b0
+#+system-config-rc.a0097e942e56a4fed590931384c3cf27df9205c253c5577a70d87631dcb43624
#+system-config-scripts.0c081aa66e7b2b7ccfb20f9c75e5dfff8f8d6804d0b4624934a8059354c14d9e
-#+system-config-init.370b5cad4c253b15027c8ec0423a6a907779e2ad218de0becdef20f1a8fa8439
+#+system-config-init.74aa667b521ddd8fa00604ae56bdeda7b32edda2461d1164961fcc28b925e9fb
#+system-config-zsh.4fbaba9e3faaa13ba5a2d93a2b3dc4a5a94ebb5ed5bb7facfc94308076a14253
#+busybox.4fe6cdfe11b32717d11efe7564d0b495aba0f2d3fecad9b803ee0505e2a11c9e
\ No newline at end of file
diff --git a/variants/ccx-x86_64/libcgroup b/variants/ccx-x86_64/libcgroup
@@ -97,10 +97,12 @@ autotools_config_static \
--disable-pam \
--disable-daemon \
--disable-python \
+ --disable-systemd \
--disable-initscript-install \
--disable-tests \
--disable-code-coverage
+
make -j${JOBS:-1} -l$((1+${JOBS:-1}))
make DESTDIR="$pthbs_destdir" install
diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config
@@ -57,7 +57,7 @@
#+s6-rc.b3ba6e214c85c2f5cb10d42dd9d344798a776c86a200911d7eec95bcc955ef48
#+s6.0d5d4703e07c3e5a0d4567706c69119aad5a0e9a37c28bf6b05dd12a27dc1eb1
#+zsh.e0e344116c0b1b13af597b28046c86056c421b5b63cb4872ce325735cfd51e5a
-#+libcgroup.61d1f04007de27aabce0c10b9fe33ed92214ca28b9686354ec104a9153b8824b
+#+libcgroup.2e9791b8acfdda601a45ea42b0833b8b351c3012affb3dd3dbfd29d0e7145e9b
#+system-config-scripts.0c081aa66e7b2b7ccfb20f9c75e5dfff8f8d6804d0b4624934a8059354c14d9e
#+logincaps.dff305698371563065d0ae0795204a975129931ea7a3c066701f7fc21dfbda4c
#+busybox.4fe6cdfe11b32717d11efe7564d0b495aba0f2d3fecad9b803ee0505e2a11c9e
diff --git a/variants/ccx-x86_64/system-config-init b/variants/ccx-x86_64/system-config-init
@@ -50,7 +50,7 @@
#+s6-portable-utils.7f4db6a16ab09d3822d709aec42170cb1d2c7c752d88f13e3792e747cbd09a28
#+s6-linux-init.39d00512c8a37829a751fbbe1a7cfc37003dc9e3924d0ca13722eb2835830c2b
#+execline.49940e3d6f0e84ccbcddfce3dd2db760ad451a312896a69902b3f8e95a600e92
-#+system-config-rc.0922559eaa62c702509597022dbadaa6a718001d986394dc11e28ce54357016b
+#+system-config-rc.a0097e942e56a4fed590931384c3cf27df9205c253c5577a70d87631dcb43624
# - build script start -
@@ -75,7 +75,7 @@ dest=${pthbs_destdir%/}${prefix}
cd '.'
-s6rcdb=/home/ccx/versions/system-config-rc.0922559eaa62c702509597022dbadaa6a718001d986394dc11e28ce54357016b/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.a0097e942e56a4fed590931384c3cf27df9205c253c5577a70d87631dcb43624/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
@@ -30,7 +30,7 @@
#+busybox-diffutils.59467ff733b5e802f382c98960aae2c6ecfc7b82fa42db3df679593dc1ec8036
#+s6-rc.b3ba6e214c85c2f5cb10d42dd9d344798a776c86a200911d7eec95bcc955ef48
#+fileset.e5a151f626de3d82ae8cbffbe8df007f016ae78c7a795565377da03798048476
-#+system-config.37fc26a40a8209346b24fcca4d1e43f5dbb62d6f84634bbcd94b67d9639f130c
+#+system-config.4bd988c5bcd336415bc850050a515938c1645cf94742b3ef0bc1a6bb25b6d9b0
# - build script start -
@@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix}
cd '.'
-src=/home/ccx/versions/system-config.37fc26a40a8209346b24fcca4d1e43f5dbb62d6f84634bbcd94b67d9639f130c/config/s6-rc-source
+src=/home/ccx/versions/system-config.4bd988c5bcd336415bc850050a515938c1645cf94742b3ef0bc1a6bb25b6d9b0/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
@@ -87,9 +87,9 @@
#+squashfs-tools.d17a5fe5700099cda5f27c79c24f4a75314d9c2160d9e5a31b1b4baf5b6c3365
#+mandoc.6f6a20cc42e1e71817249856c921d8e3686a869c979a34fcbd19de2ab00130ac
#+tinyssh.7b2b9a4c3ff2d42a7b138c3830eb3c0a275aa391fb0812ccaecca383d2e6caa8
-#+system-config.6cbd6c46c89419fa09237e3d25d7bbf45883974c52fd9e902bc24db007379e91
-#+system-config-rc.f6cb2b1d040b51ba0b369b12ca93aeb01288096031d50fa64a83fee4851d3e47
+#+system-config.d30b3e463fe92c0694badde425fefc480a4e04addaa7c375054e48dfb5b20a9d
+#+system-config-rc.51faab41e54cca6bec2d7682f7742e7a6454f73f2979224e08a7805edd83118a
#+system-config-scripts.ac2a449afef9d2c804ccca9869bdb1eaf89223a1b687c8e154f4a46216566b11
-#+system-config-init.6158782c319294b2cbe372798eeb941b95fbec9ffa0964d0c9cf81fdd5b9c2ae
+#+system-config-init.207cf0acdd5032c84f473c82480fe69b5cf2cc3d9485e7e9b487820123fa1239
#+system-config-zsh.cbbd0ea2d203a601fb2497946adaba74910fd150b071dacffb1d82dd8c4fb33f
#+busybox-modutils.5f321825e26ecc84ba02a1cd21c040ccb3cb8324b94d5b9492012eb5163a5aa7
\ No newline at end of file
diff --git a/variants/root-x86_64/libcgroup b/variants/root-x86_64/libcgroup
@@ -97,10 +97,12 @@ autotools_config_static \
--disable-pam \
--disable-daemon \
--disable-python \
+ --disable-systemd \
--disable-initscript-install \
--disable-tests \
--disable-code-coverage
+
make -j${JOBS:-1} -l$((1+${JOBS:-1}))
make DESTDIR="$pthbs_destdir" install
diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config
@@ -57,7 +57,7 @@
#+s6-rc.bc50208569d8e23862ac3fcf169ea24354b3a9693c961a7139ed0fbaeb05ce86
#+s6.04fb8499c2babe913f53ef934076b087746db184ae4955c04457a325900e11eb
#+zsh.1a1dc53d5f416fc9aa70a2cc12a22c15fa307ee165d95b232431af9311f6e91a
-#+libcgroup.b856da48ae8ff494e215b0972d2c04ba1985eb51ac4efabb9034cf0693de4bc9
+#+libcgroup.646aeafcff809ba481494b56a498a45e29d36b36df5693acdf5f14c917e927bd
#+system-config-scripts.ac2a449afef9d2c804ccca9869bdb1eaf89223a1b687c8e154f4a46216566b11
#+logincaps.3aafc7b5cc23f3d491ec65b0d2517277ee00d568d50e1c4aa9a5484e7b858992
#+busybox-modutils.5f321825e26ecc84ba02a1cd21c040ccb3cb8324b94d5b9492012eb5163a5aa7
diff --git a/variants/root-x86_64/system-config-init b/variants/root-x86_64/system-config-init
@@ -50,7 +50,7 @@
#+s6-portable-utils.88a5962bf96a590c8844071c1802840557768dc0a96078b815c1d9aa08ebe27c
#+s6-linux-init.7a9d91b21cceaf06297ddc4522c7be945b051eb94cd21da564920db0003350e4
#+execline.770a7209a0ab50477d1ea726742169464a00deacf6abec0f04c9eb69e3243cd5
-#+system-config-rc.f6cb2b1d040b51ba0b369b12ca93aeb01288096031d50fa64a83fee4851d3e47
+#+system-config-rc.51faab41e54cca6bec2d7682f7742e7a6454f73f2979224e08a7805edd83118a
# - build script start -
@@ -75,7 +75,7 @@ dest=${pthbs_destdir%/}${prefix}
cd '.'
-s6rcdb=/versions/system-config-rc.f6cb2b1d040b51ba0b369b12ca93aeb01288096031d50fa64a83fee4851d3e47/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.51faab41e54cca6bec2d7682f7742e7a6454f73f2979224e08a7805edd83118a/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
@@ -30,7 +30,7 @@
#+busybox-diffutils.7297c795754c245870d8ba99b3907f9ec3932726a5af6b8d15980adcbf6c0059
#+s6-rc.bc50208569d8e23862ac3fcf169ea24354b3a9693c961a7139ed0fbaeb05ce86
#+fileset.f310a9481c4fdb71269bb232f4ae4c004a62c44ee2a053a3b1500d67813a91d3
-#+system-config.6cbd6c46c89419fa09237e3d25d7bbf45883974c52fd9e902bc24db007379e91
+#+system-config.d30b3e463fe92c0694badde425fefc480a4e04addaa7c375054e48dfb5b20a9d
# - build script start -
@@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix}
cd '.'
-src=/versions/system-config.6cbd6c46c89419fa09237e3d25d7bbf45883974c52fd9e902bc24db007379e91/config/s6-rc-source
+src=/versions/system-config.d30b3e463fe92c0694badde425fefc480a4e04addaa7c375054e48dfb5b20a9d/config/s6-rc-source
s6-rc-compile ./s6-rc-db "$src"
mkdir -p "$dest/config"
mv -v s6-rc-db "$dest/config/"