commit 7bc1a6e9284f0904ec2ae0b0e645bd947b90ce30
parent dd3cdd89a64b3973e04511d020a9e73228e6c64c
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Sat, 3 May 2025 17:40:10 +0000
Link libseccomp statically
Diffstat:
16 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/templates/pkg/gperf b/templates/pkg/gperf
@@ -11,4 +11,3 @@ check_static command/gperf
{% block genlinks_begin %}
x["./command/gperf"]=1
{% endblock %}
-
diff --git a/templates/pkg/libseccomp b/templates/pkg/libseccomp
@@ -6,6 +6,7 @@
{% endblock %}
{% block at_script %}
+export LDFLAGS="--static"
autotools_static libseccomp-2.6.0
check_static command/scmp_sys_resolver
diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment
@@ -15,4 +15,4 @@
#+getent.497826562f0e3021d114ff3f47654fa0b574041039df71dbc4e509d38fa55447
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
#+ccx-utils.ab28a8d701f60db69818ef22c546d02eca1ba3900bcdeaf5676bcc13d4b7f114
-#+easyseccomp.98bc806e9ed08610a237d0811ccf7c130d1985166172bec70e9f5ebdda26322b-
\ No newline at end of file
+#+easyseccomp.b14c0dbad32145accc4373970ff90ec465908ee05917a54f27c273431145109a+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -36,8 +36,8 @@
#+applyuidgid-caps.9856a13db04a0f0192c4208744de2c649db2ae721dc0d0dd37eb90346236a514
#+ccx-utils.ab28a8d701f60db69818ef22c546d02eca1ba3900bcdeaf5676bcc13d4b7f114
#+user-env.4e95a5387aa403e1d16a22254f21fb4cec046c69341a5eae764dd8126fb638a8
-#+system-config.9a428c2ad2655c27966f7731d48d2496056e771ec3723e377c20e3986fd95520
-#+system-config-rc.5a052d88e9abeb87ee753b31be54650868561222a8fa7072e1c12db574a33878
+#+system-config.9f9172cf30df8db4afbaac3ec08a8e429081a916aa21ffc5d329877b8e8fe988
+#+system-config-rc.2f75ec53199b2ad406b4252e05ddbed041195ff242f7fbc7fbbd6080e1742882
#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.c8f1cd1e70043e1c7cd90d04dc8a6431a0e62941d01f87888d25e19fdf583770
+#+system-config-init.6fdf4ce770d361386a39ed3b440634907fb846632e8a33272a9ac424ef3511bb
#+system-config-zsh.250277c1fe17ccb13b5efbacd35ecb3b8342e30910cdd709f89475773bb7f309
\ No newline at end of file
diff --git a/variants/ccx-x86_64/easyseccomp b/variants/ccx-x86_64/easyseccomp
@@ -6,7 +6,7 @@
#+m4.46e121f61e0af52abf876bf2688ecfe70eeb04185028d6adde0085e865fdfe75
#+flex.322ebabc6eba6cdfd84b1b90f25790b8d917035872c2e6bb2f4c8e2f05eabcfd
#+bison.1a189980b7909de4d49b57a4821f58147c2cc150fcd4227cb88b63342551a10f
-#+libseccomp.dc19a3c149552608acad74d74f61108b8d3149bd467a297a4605a3f196493b99
+#+libseccomp.8b32056ea0458b22266d8fc1b3cce05c82d08282c40a1e56d00d15fa57cdc156
#@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
#@sha256:2804690ae936210ea5d2bfacb94d501c38ad11ffd6f48e04c0611d11fef95321:easyseccomp-configure.tar
diff --git a/variants/ccx-x86_64/libseccomp b/variants/ccx-x86_64/libseccomp
@@ -60,6 +60,7 @@ check_static() {
}
+export LDFLAGS="--static"
autotools_static libseccomp-2.6.0
check_static command/scmp_sys_resolver
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.398b92376d3212e4059f94f318a216f465de6c48d4321d596e97a22ed3b3638c' \
+ 'pthbs_path_containers=/home/ccx/versions/env.41222247409da7b738d2e38e63f9c930c9906fbd4f28c1d0d113721fcbf5d598' \
'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.5a052d88e9abeb87ee753b31be54650868561222a8fa7072e1c12db574a33878
+#+system-config-rc.2f75ec53199b2ad406b4252e05ddbed041195ff242f7fbc7fbbd6080e1742882
-s6rcdb=/home/ccx/versions/system-config-rc.5a052d88e9abeb87ee753b31be54650868561222a8fa7072e1c12db574a33878/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.2f75ec53199b2ad406b4252e05ddbed041195ff242f7fbc7fbbd6080e1742882/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.9a428c2ad2655c27966f7731d48d2496056e771ec3723e377c20e3986fd95520
+#+system-config.9f9172cf30df8db4afbaac3ec08a8e429081a916aa21ffc5d329877b8e8fe988
def_prefix() {
prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/home/ccx/versions/system-config.9a428c2ad2655c27966f7731d48d2496056e771ec3723e377c20e3986fd95520/config/s6-rc-source
+src=/home/ccx/versions/system-config.9f9172cf30df8db4afbaac3ec08a8e429081a916aa21ffc5d329877b8e8fe988/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/containers.environment b/variants/root-x86_64/containers.environment
@@ -15,4 +15,4 @@
#+getent.a4f1c1679ad9e6d4cd167e921ee8af0f7fce4a2b7886f96223b8c7fe1ba5ba97
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+ccx-utils.ccaa449ada3142ef075f3c80a6e475520219814490557f308ded4685231a70ac
-#+easyseccomp.8e1ffebd1f84dd5e81d8a96967573db16a0d6a007f80cfa080918bfe40930d51-
\ No newline at end of file
+#+easyseccomp.4b93e44d5bf878c7c0effe138de53b886b7105a0aa01bad80e31ec06013f9ac5+
\ No newline at end of file
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -36,8 +36,8 @@
#+applyuidgid-caps.2d571b717bda734b4464e7d3b36bb2c9eaa265fffd595bc090cbb137258121b8
#+ccx-utils.ccaa449ada3142ef075f3c80a6e475520219814490557f308ded4685231a70ac
#+user-env.8ad55eebe32b11f005f7b5c6dc204fdccc0a53cd7294f87c1e959ea47793dbca
-#+system-config.e59778883a2cc515c73f0df9b3615c0d0cadc762be22e6a79da59db06f32b864
-#+system-config-rc.b8a38d88293c4678365ee2a7acff7d83e770f7941a926f9ba85d0749b3f49ab2
+#+system-config.a90cc7058a0bb025e3952db2818b4f8b2ab31a2c7e7b9ccd4bc296752cce7f51
+#+system-config-rc.00f00536889a523f2eec5857080978904009641b64d5fad28515c14466e709f3
#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.ae75f1339a0c477fe79f613f378820ef15aacc0eeb13567e2972460f8236dbd4
+#+system-config-init.ff64556b31e5337db32fda783b669e11d27494944852fb658cea19228699f55f
#+system-config-zsh.01286ec545c7035b2e08ded96e40b73f912f33fd7eec44993a1e93e12577dc0f
\ No newline at end of file
diff --git a/variants/root-x86_64/easyseccomp b/variants/root-x86_64/easyseccomp
@@ -6,7 +6,7 @@
#+m4.3cffaef6909a65493ddc9aba4c53f77dc594ff5ab8b58c57acaa34c654b09ff3
#+flex.42bdab01fb2083e92a4417d5fb289c468b9a1a5b8092904b965455b74559262f
#+bison.d9992ea20119a82e24982f67479e65e94ec0fdc686f024f0ed04e87c83a00ef0
-#+libseccomp.042810e90dddd911a9c64825b298efe4f3b642aef2edb24d545f935483fc8244
+#+libseccomp.cf3861629089b6a01e1499bd0296161802ff4978c7adde69cff19c5c5a568902
#@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
#@sha256:2804690ae936210ea5d2bfacb94d501c38ad11ffd6f48e04c0611d11fef95321:easyseccomp-configure.tar
diff --git a/variants/root-x86_64/libseccomp b/variants/root-x86_64/libseccomp
@@ -60,6 +60,7 @@ check_static() {
}
+export LDFLAGS="--static"
autotools_static libseccomp-2.6.0
check_static command/scmp_sys_resolver
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.93a11ae90d642e8779aa792cdf7e0b697d2b02e6791f61cbf9dfdfa39a2d9f72' \
+ 'pthbs_path_containers=/versions/env.84f15a32fa2d0f3216649bbe6d1819bf5e2b06b658b551eb394ed50d04d3bcb8' \
'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.b8a38d88293c4678365ee2a7acff7d83e770f7941a926f9ba85d0749b3f49ab2
+#+system-config-rc.00f00536889a523f2eec5857080978904009641b64d5fad28515c14466e709f3
-s6rcdb=/versions/system-config-rc.b8a38d88293c4678365ee2a7acff7d83e770f7941a926f9ba85d0749b3f49ab2/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.00f00536889a523f2eec5857080978904009641b64d5fad28515c14466e709f3/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.e59778883a2cc515c73f0df9b3615c0d0cadc762be22e6a79da59db06f32b864
+#+system-config.a90cc7058a0bb025e3952db2818b4f8b2ab31a2c7e7b9ccd4bc296752cce7f51
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.e59778883a2cc515c73f0df9b3615c0d0cadc762be22e6a79da59db06f32b864/config/s6-rc-source
+src=/versions/system-config.a90cc7058a0bb025e3952db2818b4f8b2ab31a2c7e7b9ccd4bc296752cce7f51/config/s6-rc-source
s6-rc-compile ./s6-rc-db "$src"
mkdir -p "$dest/config"
mv -v s6-rc-db "$dest/config/"
