diff options
author | Simon Rettberg | 2023-08-10 18:46:49 +0200 |
---|---|---|
committer | Simon Rettberg | 2023-08-10 18:46:49 +0200 |
commit | a70019e50da125b3007072653a9f84023bd2ac87 (patch) | |
tree | 7c109a9a43aa38b35cce81b0bbf0a60d4d663395 /core/modules | |
parent | Try to fix empty nvidia addon issue (diff) | |
download | mltk-a70019e50da125b3007072653a9f84023bd2ac87.tar.gz mltk-a70019e50da125b3007072653a9f84023bd2ac87.tar.xz mltk-a70019e50da125b3007072653a9f84023bd2ac87.zip |
Try to get versioned targets and modules under control
Diffstat (limited to 'core/modules')
-rwxr-xr-x | core/modules/nvidia-libs@/data/addon-init (renamed from core/modules/nvidia-libs/data/addon-init) | 0 | ||||
-rw-r--r-- | core/modules/nvidia-libs@/module.build (renamed from core/modules/nvidia-libs/module.build) | 10 | ||||
-rw-r--r-- | core/modules/nvidia-libs@/module.conf (renamed from core/modules/nvidia-libs/module.conf) | 0 | ||||
-rw-r--r-- | core/modules/nvidia-libs@/module.conf.debian (renamed from core/modules/nvidia-libs/module.conf.debian) | 0 | ||||
-rw-r--r-- | core/modules/nvidia-libs@/module.conf.ubuntu (renamed from core/modules/nvidia-libs/module.conf.ubuntu) | 0 |
5 files changed, 5 insertions, 5 deletions
diff --git a/core/modules/nvidia-libs/data/addon-init b/core/modules/nvidia-libs@/data/addon-init index ae0734c2..ae0734c2 100755 --- a/core/modules/nvidia-libs/data/addon-init +++ b/core/modules/nvidia-libs@/data/addon-init diff --git a/core/modules/nvidia-libs/module.build b/core/modules/nvidia-libs@/module.build index 3d56fc20..d738d22f 100644 --- a/core/modules/nvidia-libs/module.build +++ b/core/modules/nvidia-libs@/module.build @@ -1,12 +1,12 @@ #!/bin/bash pre_exec() { - [ -z "$VERSION" ] && perror "Not run from an @ target" + [ -z "$MODULE_VERSION" ] && perror "Not run from an @ target" local SRC SZ - SRC="${ROOT_DIR}/tmp/work/nvidia-common/build/$VERSION" - [ -d "$SRC" ] || perror "nvidia-common did not build $VERSION" + SRC="${ROOT_DIR}/tmp/work/nvidia-common/build/$MODULE_VERSION" + [ -d "$SRC" ] || perror "nvidia-common did not build $MODULE_VERSION" SZ=$( du -sk "$SRC" | awk '{print $1}' ) - (( SZ < 200000 )) && perror "nvidia-common for $VERSION is less than 200MB, fishy" + (( SZ < 200000 )) && perror "nvidia-common for $MODULE_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" } @@ -15,7 +15,7 @@ post_copy() { # generate addon-required for this version cat <<-EOF > "${TARGET_BUILD_DIR}/addon-required" #!/bin/ash - [ "\$( cat /sys/module/nvidia/version )" = "$VERSION" ] + [ "\$( cat /sys/module/nvidia/version )" = "$MODULE_VERSION" ] EOF chmod +x "${TARGET_BUILD_DIR}/addon-required" } diff --git a/core/modules/nvidia-libs/module.conf b/core/modules/nvidia-libs@/module.conf index e62db897..e62db897 100644 --- a/core/modules/nvidia-libs/module.conf +++ b/core/modules/nvidia-libs@/module.conf diff --git a/core/modules/nvidia-libs/module.conf.debian b/core/modules/nvidia-libs@/module.conf.debian index c3a686d7..c3a686d7 100644 --- a/core/modules/nvidia-libs/module.conf.debian +++ b/core/modules/nvidia-libs@/module.conf.debian diff --git a/core/modules/nvidia-libs/module.conf.ubuntu b/core/modules/nvidia-libs@/module.conf.ubuntu index 5135d91e..5135d91e 100644 --- a/core/modules/nvidia-libs/module.conf.ubuntu +++ b/core/modules/nvidia-libs@/module.conf.ubuntu |