diff options
| author | Simon Rettberg | 2023-08-10 10:26:05 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2023-08-10 10:26:05 +0200 |
| commit | 857ab924ece9f251a1ec9e85f3d4a42aff8af7c9 (patch) | |
| tree | 70f26c52d0727779d064678f69a89cf74010b81b /core | |
| parent | [vmchooser2] Simplify check, avoid bogus warning if non-numeric (diff) | |
| download | mltk-857ab924ece9f251a1ec9e85f3d4a42aff8af7c9.tar.gz mltk-857ab924ece9f251a1ec9e85f3d4a42aff8af7c9.tar.xz mltk-857ab924ece9f251a1ec9e85f3d4a42aff8af7c9.zip | |
[nvidia-*] More sanity checks
Diffstat (limited to 'core')
| -rw-r--r-- | core/modules/nvidia-common/module.build | 3 | ||||
| -rw-r--r-- | core/modules/nvidia-libs/module.build | 4 | ||||
| -rw-r--r-- | core/modules/nvidia-libs/module.conf | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/core/modules/nvidia-common/module.build b/core/modules/nvidia-common/module.build index 0ae2ee64..806b223e 100644 --- a/core/modules/nvidia-common/module.build +++ b/core/modules/nvidia-common/module.build @@ -53,7 +53,8 @@ build() { grep -qE "$KMOD_ERROR" "$KMOD_LOG" \ || /NVIDIA/nvidia-installer --no-nouveau-check --no-backup --no-rpms \ --no-distro-scripts --no-cc-version-check --no-x-check --no-precompiled-interface --silent \ - --skip-module-unload --no-kernel-module-source --no-nvidia-modprobe \ + --skip-module-unload --no-kernel-module-source \ + --no-nvidia-modprobe \ --no-kernel-module exit 0 # Fake it since it will try to load the module and probably fail diff --git a/core/modules/nvidia-libs/module.build b/core/modules/nvidia-libs/module.build index b0599749..5dcbc68b 100644 --- a/core/modules/nvidia-libs/module.build +++ b/core/modules/nvidia-libs/module.build @@ -2,9 +2,11 @@ pre_exec() { [ -z "$VERSION" ] && perror "Not run from an @ target" - local SRC + local SRC SZ SRC="${ROOT_DIR}/tmp/work/nvidia-common/build/$VERSION" [ -d "$SRC" ] || perror "nvidia-common did not build $VERSION" + SZ=$( du -sk "$SRC" ) + (( SZ < 200000 )) && perror "nvidia-common for $VERSION is less than 200MB, fishy" # XXX Now we override the MODULE_BUILD_DIR, where mltk will then grab alle the required files from MODULE_BUILD_DIR="$SRC" } diff --git a/core/modules/nvidia-libs/module.conf b/core/modules/nvidia-libs/module.conf index 7bb4e65b..e62db897 100644 --- a/core/modules/nvidia-libs/module.conf +++ b/core/modules/nvidia-libs/module.conf @@ -8,6 +8,7 @@ REQUIRED_DIRECTORIES=" /etc /usr /var/lib/nvidia + /var/log " REQUIRED_MODULES=" |