commit 9a5bb93e84e113a29a675c1e6e52634f57f08c04
parent 318352f803f896fa94c3b9502d7666a09311980c
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Wed, 8 Oct 2025 15:31:49 +0000
kernel module install location
Diffstat:
10 files changed, 33 insertions(+), 34 deletions(-)
diff --git a/commitlist.sha1 b/commitlist.sha1
@@ -361,7 +361,6 @@ c6aef8098d37a1773439117a5674bfc8662ef62b sources/confz
41d6ee2d6aa33b323eee611013dd4aab6a09fc89 sources/containers
5d2b98a3c54b6f142b80773e4a18dea3749bfea6 sources/containers
6f1870365d2a7e410b48f3fe633d6f1b658738ba sources/containers
-7fc4c4dccbdc6d4c83a8f5e0f56dc3ebf678e238 sources/containers
9d7df00c7658524d1a576f78cb0571b89b5ed801 sources/containers
e8dfe8dcb4396ac0f12f0d0017f9836fa113e3a6 sources/containers
94422be00da71ff44c8ad1fe3455587c62ca29d3 sources/easyseccomp
diff --git a/templates/linux b/templates/linux
@@ -57,10 +57,10 @@ $2 == "kernel" && $3 == "lib" && $4 == "modules" { link(mod_path($0)); next }
kernel_name="{{ assertion(patch_version|default(tarball_version + ".0", True)) }}"
x["./boot/vmlinuz"]=1
x["./boot/System.map"]=1
- x["./kernel/modules/" kernel_name "/modules.alias"]=1
- x["./kernel/modules/" kernel_name "/modules.builtin"]=1
- x["./kernel/modules/" kernel_name "/modules.dep"]=1
- x["./kernel/modules/" kernel_name "/modules.order"]=1
- x["./kernel/modules/" kernel_name "/modules.symbols"]=1
+ x["./kernel/lib/modules/" kernel_name "/modules.alias"]=1
+ x["./kernel/lib/modules/" kernel_name "/modules.builtin"]=1
+ x["./kernel/lib/modules/" kernel_name "/modules.dep"]=1
+ x["./kernel/lib/modules/" kernel_name "/modules.order"]=1
+ x["./kernel/lib/modules/" kernel_name "/modules.symbols"]=1
{% endblock %}
diff --git a/variants/ccx-x86_64/kernel.environment b/variants/ccx-x86_64/kernel.environment
@@ -1,2 +1,2 @@
#!/usr/bin/env pthbs-build
-#+linux.43b8c0b3665bef8285798f0e08f214a8249c51a6977d3a5201ec33c1f80b1ff9-
\ No newline at end of file
+#+linux.3653fbebe3137ee4e1a0192c7c7a137ddb410240820c603aa38292bcf1afcadd+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/linux b/variants/ccx-x86_64/linux
@@ -45,11 +45,11 @@ BEGIN {
kernel_name="6.1.34"
x["./boot/vmlinuz"]=1
x["./boot/System.map"]=1
- x["./kernel/modules/" kernel_name "/modules.alias"]=1
- x["./kernel/modules/" kernel_name "/modules.builtin"]=1
- x["./kernel/modules/" kernel_name "/modules.dep"]=1
- x["./kernel/modules/" kernel_name "/modules.order"]=1
- x["./kernel/modules/" kernel_name "/modules.symbols"]=1
+ x["./kernel/lib/modules/" kernel_name "/modules.alias"]=1
+ x["./kernel/lib/modules/" kernel_name "/modules.builtin"]=1
+ x["./kernel/lib/modules/" kernel_name "/modules.dep"]=1
+ x["./kernel/lib/modules/" kernel_name "/modules.order"]=1
+ x["./kernel/lib/modules/" kernel_name "/modules.symbols"]=1
}
function r1(s) {
diff --git a/variants/ccx-x86_64/linux-qemu-guest b/variants/ccx-x86_64/linux-qemu-guest
@@ -43,11 +43,11 @@ BEGIN {
kernel_name="6.15.0"
x["./boot/vmlinuz"]=1
x["./boot/System.map"]=1
- x["./kernel/modules/" kernel_name "/modules.alias"]=1
- x["./kernel/modules/" kernel_name "/modules.builtin"]=1
- x["./kernel/modules/" kernel_name "/modules.dep"]=1
- x["./kernel/modules/" kernel_name "/modules.order"]=1
- x["./kernel/modules/" kernel_name "/modules.symbols"]=1
+ x["./kernel/lib/modules/" kernel_name "/modules.alias"]=1
+ x["./kernel/lib/modules/" kernel_name "/modules.builtin"]=1
+ x["./kernel/lib/modules/" kernel_name "/modules.dep"]=1
+ x["./kernel/lib/modules/" kernel_name "/modules.order"]=1
+ x["./kernel/lib/modules/" kernel_name "/modules.symbols"]=1
}
function r1(s) {
diff --git a/variants/ccx-x86_64/vm.environment b/variants/ccx-x86_64/vm.environment
@@ -1,2 +1,2 @@
#!/usr/bin/env pthbs-build
-#+linux-qemu-guest.e9ba50049dfb9815b5440b1b6e16c7d2faad07ea6febbc375efe728b4848fc5e-
\ No newline at end of file
+#+linux-qemu-guest.f1e8c822b8e7d4989e8f9228ae7b48185c70c4a92a63af456ac0fddd14b5c149+
\ No newline at end of file
diff --git a/variants/root-x86_64/kernel.environment b/variants/root-x86_64/kernel.environment
@@ -1,2 +1,2 @@
#!/usr/bin/env pthbs-build
-#+linux.3ae327bbed9393a080af7893869d7497de1b6068fbdd4209f424c09d443f7fad-
\ No newline at end of file
+#+linux.a1916e6a49114f3c7f5ff4dd87fe7c0cd50fa606d1eaecaee2305507104e9a17+
\ No newline at end of file
diff --git a/variants/root-x86_64/linux b/variants/root-x86_64/linux
@@ -45,11 +45,11 @@ BEGIN {
kernel_name="6.1.34"
x["./boot/vmlinuz"]=1
x["./boot/System.map"]=1
- x["./kernel/modules/" kernel_name "/modules.alias"]=1
- x["./kernel/modules/" kernel_name "/modules.builtin"]=1
- x["./kernel/modules/" kernel_name "/modules.dep"]=1
- x["./kernel/modules/" kernel_name "/modules.order"]=1
- x["./kernel/modules/" kernel_name "/modules.symbols"]=1
+ x["./kernel/lib/modules/" kernel_name "/modules.alias"]=1
+ x["./kernel/lib/modules/" kernel_name "/modules.builtin"]=1
+ x["./kernel/lib/modules/" kernel_name "/modules.dep"]=1
+ x["./kernel/lib/modules/" kernel_name "/modules.order"]=1
+ x["./kernel/lib/modules/" kernel_name "/modules.symbols"]=1
}
function r1(s) {
diff --git a/variants/root-x86_64/linux-qemu-guest b/variants/root-x86_64/linux-qemu-guest
@@ -43,11 +43,11 @@ BEGIN {
kernel_name="6.15.0"
x["./boot/vmlinuz"]=1
x["./boot/System.map"]=1
- x["./kernel/modules/" kernel_name "/modules.alias"]=1
- x["./kernel/modules/" kernel_name "/modules.builtin"]=1
- x["./kernel/modules/" kernel_name "/modules.dep"]=1
- x["./kernel/modules/" kernel_name "/modules.order"]=1
- x["./kernel/modules/" kernel_name "/modules.symbols"]=1
+ x["./kernel/lib/modules/" kernel_name "/modules.alias"]=1
+ x["./kernel/lib/modules/" kernel_name "/modules.builtin"]=1
+ x["./kernel/lib/modules/" kernel_name "/modules.dep"]=1
+ x["./kernel/lib/modules/" kernel_name "/modules.order"]=1
+ x["./kernel/lib/modules/" kernel_name "/modules.symbols"]=1
}
function r1(s) {
diff --git a/variants/root-x86_64/vm.environment b/variants/root-x86_64/vm.environment
@@ -1,2 +1,2 @@
#!/usr/bin/env pthbs-build
-#+linux-qemu-guest.6e982860fa174d64168205dedb10e24377ac92c41814788d3f91935c6714d11f-
\ No newline at end of file
+#+linux-qemu-guest.4e28d117609798dc7cbe9bfbff41f1a83daeca3b1c856b00246566b510862f63+
\ No newline at end of file