Video: custom .ko install + quieter logs, ShellCheck fixes & CI tweak#206
Merged
abbajaj806 merged 3 commits intoqualcomm-linux:mainfrom Oct 31, 2025
Merged
Video: custom .ko install + quieter logs, ShellCheck fixes & CI tweak#206abbajaj806 merged 3 commits intoqualcomm-linux:mainfrom
abbajaj806 merged 3 commits intoqualcomm-linux:mainfrom
Conversation
Introduce --clips-tar (and optional --clips-dest) to consume a pre-provisioned
media bundle locally. Extraction runs early and is honored even when --config
or --dir are used. If --clips-tar is present we skip the online early-fetch and
per-test fetch; the strict clip presence check remains unchanged.
- New flags: --clips-tar [/path/to/*.tar{,.gz,.xz,.zst,.bz2}|*.zip], --clips-dest DIR
- Destination resolution: --clips-dest > cfg dir > --dir > testcase dir
- Passthrough preserved in --stack both re-exec path
- No behavior change when flags are absent (net/TAR_URL flow intact)
- CI-friendly logs: “Extract custom clips tar → <dest>”
Signed-off-by: Srikanth Muppandam <smuppand@qti.qualcomm.com>
Switch test to provide a local media bundle via --clips-tar and rely on run.sh’s default extraction path (no --clips-dest needed). Keep the upstream (base) run free of custom ko args; add --ko-dir/--ko-prefer-custom for the overlay (downstream) run and always pass --downstream-fw (harmless on non-Kodiak). - Remove explicit --clips-dest (runner now defaults near cfg/testcase dir) - Pass --clips-tar and --app only; no Wi-Fi/TAR_URL required - Derive --platform from TARGET if set; otherwise let runner autodetect - Echo constructed args for CI debugging; preserve step order and result upload Signed-off-by: Srikanth Muppandam <smuppand@qti.qualcomm.com>
…s, compressed .ko, altroot) - Improve video_find_module_file() and video_insmod_with_deps() to reliably locate and load downstream modules across diverse layouts. - Accept KO_DIRS entries as files or directories; try fast direct matches before bounded find (depth-limited). - Support hyphen/underscore name variants and compressed modules (.ko.xz, .ko.gz, .ko.zst, .ko.bz2) in all search paths. - Preserve preference order: modinfo -n → KO_DIRS (if KO_PREFER_CUSTOM=1) → KO_TREE/lib/modules/$KVER → /lib/modules/$KVER/updates → system tree → KO_DIRS (fallback when not preferred first). Log with video_log_resolve. - Enhance insmod path: - Parse deps via modinfo -F depends, try modprobe -d "$KO_TREE" then regular modprobe, then direct insmod using resolved paths. - On-the-fly decompress compressed modules to /run/iris_mods/$KVER/ and insmod the decompressed artifact. Log with video_log_load_success. Signed-off-by: Srikanth Muppandam <smuppand@qti.qualcomm.com>
smuppand
changed the title
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Stage custom iris_vpu.ko to /lib/modules/$(uname -r)/updates via video_ensure_moddir_install; run depmod.
Use video_find_module_file/video_insmod_with_deps; honor --ko-dir and --ko-prefer-custom only (no-op otherwise).
Silence helper stdout to avoid merged/duplicated log lines.
utils/lib_video.sh
Harden helpers (video_find_module_file, video_ensure_moddir_install, video_insmod_with_deps).
Fix ShellCheck: replace A && B || continue (SC2015), close if/fi, tidy minor warnings.
CI YAML
ShellCheck config touch-up; ensure depmod/modprobe available in PATH; keep logs as artifacts.