Skip to content

Commit

Permalink
fix: kernel module tree files missing
Browse files Browse the repository at this point in the history
siderolabs/talos#6751 was not a complete fix
for siderolabs/talos#6681. This fixed all
driver builds to copy over `modules.builtin` and also make sure they are
installed in `extras` so that proper module dependency tree is generated
by Talos on installing drivers built as extensions.

Signed-off-by: Noel Georgi <git@frezbo.dev>
  • Loading branch information
frezbo committed Jan 30, 2023
1 parent 987d24a commit 15fe6d8
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 10 deletions.
6 changes: 4 additions & 2 deletions drbd/pkg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@ steps:
install:
- |
mkdir -p /rootfs/lib/modules/$(cat /src/include/config/kernel.release)/
touch /rootfs/lib/modules/$(cat /src/include/config/kernel.release)/modules.order /rootfs/lib/modules/$(cat /src/include/config/kernel.release)/modules.builtin
cp /src/modules.order /rootfs/lib/modules/$(cat /src/include/config/kernel.release)/
cp /src/modules.builtin /rootfs/lib/modules/$(cat /src/include/config/kernel.release)/
cp /src/modules.builtin.modinfo /rootfs/lib/modules/$(cat /src/include/config/kernel.release)/
make -j $(nproc) -C /src M=$(pwd)/drbd modules_install DESTDIR=/rootfs INSTALL_MOD_PATH=/rootfs CONFIG_MODULE_SIG_ALL=y
make -j $(nproc) -C /src M=$(pwd)/drbd modules_install DESTDIR=/rootfs INSTALL_MOD_PATH=/rootfs INSTALL_MOD_DIR=extras CONFIG_MODULE_SIG_ALL=y
test:
- |
# https://www.kernel.org/doc/html/v4.15/admin-guide/module-signing.html#signed-modules-and-stripping
Expand Down
8 changes: 4 additions & 4 deletions gasket-driver/pkg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ steps:
install:
- |
mkdir -p /rootfs/lib/modules/$(cat /src/include/config/kernel.release)/
cp /src/modules.order /rootfs/lib/modules/$(cat /src/include/config/kernel.release)/
cp /src/modules.builtin /rootfs/lib/modules/$(cat /src/include/config/kernel.release)/
cp /src/modules.builtin.modinfo /rootfs/lib/modules/$(cat /src/include/config/kernel.release)/
# create these so we don't get warnings when depmod runs
touch /rootfs/lib/modules/$(cat /src/include/config/kernel.release)/modules.order /rootfs/lib/modules/$(cat /src/include/config/kernel.release)/modules.builtin
make -C /src M=$(pwd)/src modules_install INSTALL_MOD_PATH=/rootfs
make -C /src M=$(pwd)/src modules_install INSTALL_MOD_PATH=/rootfs INSTALL_MOD_DIR=extras
test:
- |
# https://www.kernel.org/doc/html/v4.15/admin-guide/module-signing.html#signed-modules-and-stripping
Expand Down
6 changes: 4 additions & 2 deletions nonfree/kmod-nvidia/pkg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,11 @@ steps:
cd NVIDIA-Linux-*/kernel
mkdir -p /rootfs/lib/modules/$(cat /src/include/config/kernel.release)/
touch /rootfs/lib/modules/$(cat /src/include/config/kernel.release)/modules.order /rootfs/lib/modules/$(cat /src/include/config/kernel.release)/modules.builtin
cp /src/modules.order /rootfs/lib/modules/$(cat /src/include/config/kernel.release)/
cp /src/modules.builtin /rootfs/lib/modules/$(cat /src/include/config/kernel.release)/
cp /src/modules.builtin.modinfo /rootfs/lib/modules/$(cat /src/include/config/kernel.release)/
make -j $(nproc) modules_install SYSSRC=/src DEPMOD=/toolchain/bin/depmod INSTALL_MOD_PATH=/rootfs
make -j $(nproc) modules_install SYSSRC=/src DEPMOD=/toolchain/bin/depmod INSTALL_MOD_PATH=/rootfs INSTALL_MOD_DIR=extras
finalize:
- from: /rootfs
to: /
6 changes: 4 additions & 2 deletions nvidia-open-gpu-kernel-modules/pkg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,11 @@ steps:
install:
- |
mkdir -p /rootfs/lib/modules/$(cat /src/include/config/kernel.release)/
touch /rootfs/lib/modules/$(cat /src/include/config/kernel.release)/modules.order /rootfs/lib/modules/$(cat /src/include/config/kernel.release)/modules.builtin
cp /src/modules.order /rootfs/lib/modules/$(cat /src/include/config/kernel.release)/
cp /src/modules.builtin /rootfs/lib/modules/$(cat /src/include/config/kernel.release)/
cp /src/modules.builtin.modinfo /rootfs/lib/modules/$(cat /src/include/config/kernel.release)/
make -j $(nproc) modules_install SYSSRC=/src DEPMOD=/toolchain/bin/depmod INSTALL_MOD_PATH=/rootfs
make -j $(nproc) modules_install SYSSRC=/src DEPMOD=/toolchain/bin/depmod INSTALL_MOD_PATH=/rootfs INSTALL_MOD_DIR=extras
test:
- |
# https://www.kernel.org/doc/html/v4.15/admin-guide/module-signing.html#signed-modules-and-stripping
Expand Down

0 comments on commit 15fe6d8

Please sign in to comment.